diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css
index b5038a4e..34393fa9 100644
--- a/source/Ox.UI/css/Ox.UI.css
+++ b/source/Ox.UI/css/Ox.UI.css
@@ -1008,7 +1008,8 @@ Lists
     overflow: hidden;
 }
 
-.OxIconList .OxItem > .OxIcon > img {
+.OxIconList .OxItem > .OxIcon > img,
+.OxIconList .OxItem > .OxIcon > .OxVideoPlayer {
     position: absolute;
     left: 0;
     right: 0;
@@ -1018,6 +1019,7 @@ Lists
     cursor: pointer;
     border-radius: 4px;
 }
+
 .OxIconList .OxItem > .OxReflection {
     overflow: hidden;
 }
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index d77e079c..39c85fd6 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -170,6 +170,7 @@ Ox.VideoEditor = function(options, self) {
                     ['play', 'playInToOut', 'volume', 'size', 'space', 'position'] :
                     ['goto', 'set', 'space', 'position'],
                 duration: self.options.duration,
+                enableMouse: true,
                 externalControls: true,
                 find: self.options.find,
                 height: self.sizes.player[i].height,
diff --git a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
index 5b70fb65..f96ce840 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
@@ -69,6 +69,7 @@ Ox.VideoPanelPlayer = function(options, self) {
             controlsBottom: ['play', 'volume', 'timeline', 'position', 'resolution'],
             enableFind: true,
             enableKeyboard: true,
+            enableMouse: true,
             height: getPlayerHeight(),
             muted: self.options.muted,
             paused: true,
diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
index 7795ab7a..c4ecd922 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
@@ -20,6 +20,7 @@ Ox.VideoPlayer <f> Generic Video Player
         enableFind <b|false> If true, enable find
         enableFullscreen <b|false> If true, enable fullscreen
         enableKeyboard <b|false> If true, enable keyboard controls
+        enableMouse <b|false> If true, click toggles paused
         externalControls <b|false> If true, controls are outside the video
         find <s|''> Query string
         focus <s|'click'> focus on 'click', 'load' or 'mouseover'
@@ -257,7 +258,7 @@ Ox.VideoPlayer = function(options, self) {
 
     if (self.options.type == 'play') {
 
-        self.$videoContainer.bind({
+        self.options.enableMouse && self.$videoContainer.bind({
             click: function(e) {
                 if (!$(e.target).is('.OxLogo')) {
                     togglePaused();
@@ -291,7 +292,7 @@ Ox.VideoPlayer = function(options, self) {
 
     } else {
 
-        self.$videoContainer.bind({
+        self.options.enableMouse && self.$videoContainer.bind({
             click: function(e) {
                 if (!$(e.target).is('.OxLogo')) {
                     goToPoint();
diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css
index 0529be7f..05689b77 100644
--- a/source/Ox.UI/themes/modern/css/modern.css
+++ b/source/Ox.UI/themes/modern/css/modern.css
@@ -233,17 +233,19 @@ Lists
 ================================================================================
 */
 
-.OxThemeModern .OxIconList .OxItem img.OxLoading {
+.OxThemeModern .OxIconList .OxItem > img.OxLoading {
     border-color: rgb(48, 48, 48);
     background: -moz-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0));
     background: -webkit-linear-gradient(top, rgb(32, 32, 32), rgb(0, 0, 0));
 }
-.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon img {
+.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > img,
+.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer {
     border-color: rgb(96, 96, 96);
     -moz-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
     -webkit-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
 }
-.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon img {
+.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img,
+.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon .OxVideoPlayer {
     border-color: rgb(128, 128, 128);
     -moz-box-shadow: 0 0 4px rgba(128, 128, 128, 1);
     -webkit-box-shadow: 0 0 4px rgba(128, 128, 128, 1);