diff --git a/css/equalizer-window.css b/css/equalizer-window.css
index f8d151e8..dce03db4 100644
--- a/css/equalizer-window.css
+++ b/css/equalizer-window.css
@@ -2,8 +2,6 @@
 #winamp2-js #equalizer-window {
   height: 116px;
   width: 275px;
-    /* Work around rendering bug with clip-path */
-    -webkit-transform: translateZ(0);
 }
 
 #winamp2-js #equalizer-window.shade {
diff --git a/css/main-window.css b/css/main-window.css
index ed3f2d89..60fbfc19 100755
--- a/css/main-window.css
+++ b/css/main-window.css
@@ -9,8 +9,6 @@
   image-rendering: -webkit-optimize-contrast; /* Safari */
   image-rendering: pixelated; /* Only in Chrome > 40 */
   -ms-interpolation-mode: nearest-neighbor; /* IE (non-standard property) */
-  /* Work around rendering bug with clip-path */
-  -webkit-transform: translateZ(0);
 }
 
 #winamp2-js #loading {
@@ -79,7 +77,7 @@
   width: 275px;
 }
 
-#winamp2-js #option-context,
+#option-context,
 #winamp2-js #minimize,
 #winamp2-js #shade,
 #winamp2-js #close {
diff --git a/css/winamp.css b/css/winamp.css
index 0cfdf8ce..7d2c77d1 100644
--- a/css/winamp.css
+++ b/css/winamp.css
@@ -84,9 +84,13 @@ canvas {
   -ms-interpolation-mode: nearest-neighbor; /* IE (non-standard property) */
 }
 
+#winamp2-js .window {
+  /* Work around rendering bug with clip-path */
+  -webkit-transform: translateZ(0);
+}
 #winamp2-js .window.doubled {
-  -moz-transform: scale(2);
+  -moz-transform: translateZ(0) scale(2);
   -moz-transform-origin: top left;
-  -webkit-transform: scale(2);
+  -webkit-transform: translateZ(0) scale(2);
   -webkit-transform-origin: top left;
 }