diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 34e30e7779a1..51eb4077f029 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -398,7 +398,7 @@
                 hidden="true"/>
     </menupopup>
 
-    <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
+    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
       <hbox>
         <button class="ctrlTab-preview" flex="1"/>
         <button class="ctrlTab-preview" flex="1"/>
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index b7170de3766c..68b427994c23 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1701,17 +1701,19 @@ toolbarbutton.chevron > .toolbarbutton-icon {
 
 /* Ctrl-Tab */
 
-.ctrlTab-preview {
-  -moz-appearance: toolbarbutton;
+#ctrlTab-panel {
+  padding: 10px;
+  -moz-appearance: none;
+  background-color: -moz-dialog;
+  color: -moz-dialogtext;
 }
 
 .tabPreview-canvas {
-  box-shadow: 0 0 5px ThreeDShadow;
+  box-shadow: 0 0 5px 1px ThreeDShadow;
 }
 
-.ctrlTab-preview:focus .tabPreview-canvas,
-.ctrlTab-preview:hover .tabPreview-canvas {
-  box-shadow: none;
+.ctrlTab-preview:not(#ctrlTab-showAll):focus > * > .ctrlTab-preview-inner > .tabPreview-canvas {
+  box-shadow: 0 0 5px 2px Highlight;
 }
 
 .ctrlTab-favicon[src] {
@@ -1721,11 +1723,7 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   padding: 2px;
 }
 
-#ctrlTab-panel {
-  padding: 10px;
-}
-
-.ctrlTab-preview:not(#ctrlTab-showAll) .tabPreview-canvas {
+.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas {
   margin-bottom: 2px;
 }
 
@@ -1736,6 +1734,10 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin-top: 10px;
 }
 
+#ctrlTab-showAll:focus {
+  box-shadow: 0 0 5px 1px Highlight;
+}
+
 /* Status panel */
 
 .statuspanel-label {
diff --git a/browser/themes/osx/KUI-background.png b/browser/themes/osx/KUI-background.png
deleted file mode 100644
index 104a49f7b0e1..000000000000
Binary files a/browser/themes/osx/KUI-background.png and /dev/null differ
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index e1cf6f44f5c5..5c628de31cad 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3111,24 +3111,14 @@ menulist.translate-infobar-element > .menulist-dropmarker {
   font-weight: bold;
 }
 
-/* ::::: Keyboard UI Panel ::::: */
-
-.KUI-panel {
-  -moz-appearance: none;
-  background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x;
-  color: white;
-  border-style: none;
-  border-radius: 20px;
-}
-
-.KUI-panel[level="top"] {
-  background-color: rgba(27%,27%,27%,.65);
-  -moz-window-shadow: none;
-}
-
 /* Ctrl-Tab */
 
 #ctrlTab-panel {
+  -moz-appearance: none;
+  -moz-window-shadow: none;
+  background: rgba(27%,27%,27%,.7);
+  color: white;
+  border-style: none;
   padding: 20px 10px 10px;
   text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%);
 }
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 8b5e2f2f56d1..a70ba5858a68 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -19,7 +19,6 @@ browser.jar:
   skin/classic/browser/Info.png
   skin/classic/browser/keyhole-circle.png
   skin/classic/browser/keyhole-circle@2x.png
-  skin/classic/browser/KUI-background.png
   skin/classic/browser/subtle-pattern.png
   skin/classic/browser/menu-back.png
   skin/classic/browser/menu-forward.png
diff --git a/browser/themes/windows/KUI-background.png b/browser/themes/windows/KUI-background.png
deleted file mode 100644
index 3de09a2f8803..000000000000
Binary files a/browser/themes/windows/KUI-background.png and /dev/null differ
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index c1ce8a4027de..8c72e843449c 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -393,16 +393,6 @@
       -moz-border-top-colors: @glassInactiveBorderColor@ rgba(255,255,255,.6);
     }
   }
-
-  #ctrlTab-panel {
-    background: transparent;
-    -moz-appearance: -moz-win-glass;
-    border-radius: 0;
-    border: none;
-    font: normal 1.2em "Segoe UI";
-    color: black;
-    text-shadow: white -1px -1px .35em, white -1px 1px .35em, white 1px 1px .35em, white 1px -1px .35em;
-  }
 }
 
 @media (-moz-windows-glass) {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 6dd2812f291b..384c0b39cbf6 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2349,23 +2349,13 @@ notification[value="translation"] {
   -moz-image-region: auto;
 }
 
-/* ::::: Keyboard UI Panel ::::: */
-
-.KUI-panel {
-  -moz-appearance: none;
-  background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x;
-  color: white;
-  border-style: none;
-  border-radius: 20px;
-}
-
-.KUI-panel[level="top"] {
-  background-color: rgba(27%,27%,27%,.65);
-}
-
 /* Ctrl-Tab */
 
 #ctrlTab-panel {
+  -moz-appearance: none;
+  background: rgba(27%,27%,27%,.7);
+  color: white;
+  border-style: none;
   padding: 20px 10px 10px;
   font-weight: bold;
   text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%);
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 1f232d9ac104..0538a9c84635 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -21,7 +21,6 @@ browser.jar:
   skin/classic/browser/Info.png
   skin/classic/browser/Info-XP.png
   skin/classic/browser/keyhole-forward-mask.svg
-  skin/classic/browser/KUI-background.png
   skin/classic/browser/livemark-folder.png
   skin/classic/browser/livemark-folder-XP.png
   skin/classic/browser/menu-back.png