--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -1388,29 +1388,30 @@ toolbar[mode="text"] toolbarbutton.chevr
 
 .ctrlTab-preview:focus .tabPreview-canvas,
 .ctrlTab-preview:hover .tabPreview-canvas,
 .allTabs-preview:focus .tabPreview-canvas,
 .allTabs-preview:hover .tabPreview-canvas {
   -moz-box-shadow: none;
 }
 
+.ctrlTab-favicon[src],
+.allTabs-favicon[src] {
+  background-color: white;
+  width: 20px;
+  height: 20px;
+  padding: 2px;
+}
+
 /* Ctrl-Tab */
 
 #ctrlTab-panel {
   padding: 10px;
 }
 
-.ctrlTab-favicon[src] {
-  background-color: white;
-  width: 20px;
-  height: 20px;
-  padding: 2px;
-}
-
 .ctrlTab-preview:not(#ctrlTab-showAll) .tabPreview-canvas {
   margin-bottom: 2px;
 }
 
 #ctrlTab-showAll {
   -moz-appearance: button;
   color: ButtonText;
   padding: 0 3px;
@@ -1427,16 +1428,11 @@ toolbar[mode="text"] toolbarbutton.chevr
   padding: 5px;
 }
 
 #allTabs-filter {
   -moz-margin-start: 36px;
   -moz-margin-end: 0;
 }
 
-.allTabs-favicon {
-  margin-top: 1px;
-  -moz-margin-start: 1px;
-}
-
 .allTabs-preview-label {
   -moz-transform: translate(0, 2px);
 }

--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -2022,26 +2022,43 @@ toolbarbutton.chevron > .toolbarbutton-m
   -moz-margin-start: 24px;
   -moz-margin-end: 0;
 }
 
 #allTabs-tab-close-button > .toolbarbutton-icon {
   margin: 0;
 }
 
-.allTabs-favicon {
-  margin-top: 1px;
-  -moz-margin-start: 1px;
+.allTabs-favicon[src] {
+  background-color: -moz-dialog;
+  width: 20px;
+  height: 20px;
+  padding-bottom: 4px;
+  -moz-padding-start: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.allTabs-favicon[src]:-moz-locale-dir(rtl) {
+  -moz-border-radius-bottomleft: 0;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.allTabs-preview:not(:focus) > * > .allTabs-favicon-container > .allTabs-favicon[src] {
+  width: 22px;
+  height: 22px;
+  padding-top: 2px;
+  -moz-padding-end: 2px;
+  margin-top: -2px;
+  -moz-margin-end: -2px;
 }
 
 .allTabs-preview-inner > .tabPreview-canvas {
   background-color: rgb(60%,60%,60%);
   -moz-box-shadow: 0 0 2px ThreeDShadow;
 }
 
 .allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas {
   opacity: .8;
 }
 
 .allTabs-preview:focus > * > .allTabs-preview-inner {
   -moz-box-shadow: @focusRingShadow@;
 }
-

--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1596,19 +1596,32 @@ toolbarbutton.bookmark-item[dragover="tr
   -moz-margin-start: 24px;
   -moz-margin-end: 0;
 }
 
 #allTabs-tab-close-button > .toolbarbutton-icon {
   margin: 0;
 }
 
-.allTabs-favicon {
-  margin-top: 1px;
-  -moz-margin-start: 1px;
+.allTabs-favicon[src] {
+  background-color: -moz-dialog;
+  width: 22px;
+  height: 22px;
+  padding-top: 1px;
+  padding-bottom: 5px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 5px;
+  margin-top: -2px;
+  -moz-margin-start: -2px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.allTabs-favicon[src]:-moz-locale-dir(rtl) {
+  -moz-border-radius-bottomright: 0;
+  -moz-border-radius-bottomleft: 4px;
 }
 
 .allTabs-preview-inner > .tabPreview-canvas {
   background-color: rgb(60%,60%,60%);
   -moz-box-shadow: 0 0 2px ThreeDShadow;
 }
 
 .allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas {