diff --git a/ui/js/component/video/internal/loading-screen.jsx b/ui/js/component/video/internal/loading-screen.jsx
index 591bc0f9f..2698e824e 100644
--- a/ui/js/component/video/internal/loading-screen.jsx
+++ b/ui/js/component/video/internal/loading-screen.jsx
@@ -1,11 +1,11 @@
 import React from "react";
 
 const LoadingScreen = ({ status }) =>
-  <div className="video--loading-screen">
-    <div className="video--loading-screen-content">
-      <div className="video--loading-spinner" />
+  <div className="video__loading-screen">
+    <div>
+      <div className="video__loading-spinner" />
 
-      <div className="video--loading-status">
+      <div className="video__loading-status">
         {status}
       </div>
     </div>
diff --git a/ui/js/component/video/internal/play-button.jsx b/ui/js/component/video/internal/play-button.jsx
index 5eb98726f..69834a599 100644
--- a/ui/js/component/video/internal/play-button.jsx
+++ b/ui/js/component/video/internal/play-button.jsx
@@ -22,7 +22,6 @@ class VideoPlayButton extends React.Component {
     const {
       button,
       label,
-      className,
       metadata,
       metadata: { title },
       uri,
diff --git a/ui/js/component/video/view.jsx b/ui/js/component/video/view.jsx
index ec2468dd9..b9b4ec8e9 100644
--- a/ui/js/component/video/view.jsx
+++ b/ui/js/component/video/view.jsx
@@ -68,7 +68,6 @@ class Video extends React.Component {
                 poster={poster}
                 downloadPath={fileInfo.download_path}
                 mediaType={mediaType}
-                poster={poster}
               />)}
         {!isPlaying &&
           <div
diff --git a/ui/scss/component/_video.scss b/ui/scss/component/_video.scss
index b440c0f29..e956afe80 100644
--- a/ui/scss/component/_video.scss
+++ b/ui/scss/component/_video.scss
@@ -35,14 +35,14 @@ video {
 }
 
 
-.video--loading-screen {
+.video__loading-screen {
   height: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 
-.video--loading-spinner {
+.video__loading-spinner {
   position: relative;
   width: 11em;
   height: 11em;
@@ -89,7 +89,7 @@ video {
   }
 }
 
-.video--loading-status {
+.video__loading-status {
   padding-top: 20px;
   color: white;
 }
@@ -104,6 +104,7 @@ video {
   position: relative;
   .video__play-button { @include absolute-center(); }
 }
+
 .video__play-button {
   position: absolute;
   width: 100%;