diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 362bdb8bcc28..ce765c347276 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -211,20 +211,23 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
 
 /* unified back button with keyhole icons */
 
-toolbar[iconsize="large"][mode="icons"] #back-button {
+toolbar[mode="icons"] #back-button {
   -moz-appearance: none;
-  -moz-image-region: rect(0px 398px 34px 360px);
   padding: 0;
   -moz-padding-start: 2px;
   border: none;
 }
+
+toolbar[iconsize="large"][mode="icons"] #back-button {
+  -moz-image-region: rect(0px 398px 34px 360px);
+}
 toolbar[iconsize="large"][mode="icons"] #back-button:not([disabled="true"]):hover {
   -moz-image-region: rect(34px 398px 68px 360px);
 }
 toolbar[iconsize="large"][mode="icons"] #back-button[disabled="true"] {
   -moz-image-region: rect(68px 398px 102px 360px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-button:not([disabled="true"]):active {
+toolbar[iconsize="large"][mode="icons"] #back-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(102px 398px 136px 360px);
 }
 
@@ -239,25 +242,28 @@ toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"]:not([disab
 toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"][disabled="true"] {
   -moz-image-region: rect(68px 516px 102px 478px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):active {
+toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
   -moz-image-region: rect(102px 516px 136px 478px);
 }
 
 /* unified forward button with keyhole icons */
 
-toolbar[iconsize="large"][mode="icons"] #forward-button {
+toolbar[mode="icons"] #forward-button {
   -moz-appearance: none;
-  -moz-image-region: rect(3px 424px 31px 398px);
   padding: 0;
   border: none;
 }
+
+toolbar[iconsize="large"][mode="icons"] #forward-button {
+  -moz-image-region: rect(3px 424px 31px 398px);
+}
 toolbar[iconsize="large"][mode="icons"] #forward-button:not([disabled="true"]):hover {
   -moz-image-region: rect(37px 424px 65px 398px);
 }
 toolbar[iconsize="large"][mode="icons"] #forward-button[disabled="true"] {
   -moz-image-region: rect(71px 424px 99px 398px);
 }
-toolbar[iconsize="large"][mode="icons"] #forward-button:not([disabled="true"]):active {
+toolbar[iconsize="large"][mode="icons"] #forward-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(105px 424px 133px 398px);
 }
 
@@ -272,39 +278,39 @@ toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"]:not([di
 toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"][disabled="true"] {
   -moz-image-region: rect(71px 478px 99px 452px);
 }
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):active {
+toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
   -moz-image-region: rect(105px 478px 133px 452px);
 }
 
 /* dropmarker for unified back and forward buttons with keyhole icons */
 
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker {
+toolbar[mode="icons"] #back-forward-dropmarker {
   -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-  -moz-image-region: rect(3px 438px 31px 424px);
   padding: 0;
   -moz-padding-end: 2px;
   border: none;
 }
 
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker > image {
+toolbar[mode="icons"] #back-forward-dropmarker > image {
   display: -moz-box;
   margin: 0;
 }
 
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker > dropmarker {
+toolbar[mode="icons"] #back-forward-dropmarker > dropmarker {
   display: none;
 }
 
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(3px 438px 31px 424px);
+}
 toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:not([disabled="true"]):hover {
   -moz-image-region: rect(37px 438px 65px 424px);
 }
-
 toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[disabled="true"] {
   -moz-image-region: rect(71px 438px 99px 424px);
 }
-
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:not([disabled="true"]):active {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:not([disabled="true"]):hover:active {
   -moz-image-region: rect(105px 438px 133px 424px);
 }
 
@@ -313,19 +319,114 @@ toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:not([disabled="
 toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"] {
   -moz-image-region: rect(3px 452px 31px 438px);
 }
-
 toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover {
   -moz-image-region: rect(37px 452px 65px 438px);
 }
-
 toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"][disabled="true"] {
   -moz-image-region: rect(71px 452px 99px 438px);
 }
-
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):active {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover:active {
   -moz-image-region: rect(105px 452px 133px 438px);
 }
 
+/* ::::: unified back and forward buttons, small icons mode ::::: */
+
+toolbar[iconsize="small"][mode="icons"] #back-button > .toolbarbutton-icon,
+toolbar[iconsize="small"][mode="icons"] #forward-button > .toolbarbutton-icon {
+  -moz-padding-end: 0;
+}
+
+/* unified back button with keyhole icons, small icons mode */
+
+toolbar[iconsize="small"][mode="icons"] #back-button {
+  -moz-image-region: rect(0px 264px 24px 240px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 264px 48px 240px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-button[disabled="true"] {
+  -moz-image-region: rect(48px 264px 72px 240px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px 264px 96px 240px);
+}
+
+/* unified back button with keyhole icons, small icons mode, RTL version */
+
+toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px 362px 24px 338px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 362px 48px 338px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"][disabled="true"] {
+  -moz-image-region: rect(48px 362px 72px 338px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px 362px 96px 338px);
+}
+
+/* unified forward button with keyhole icons, small icons mode */
+
+toolbar[iconsize="small"][mode="icons"] #forward-button {
+  -moz-image-region: rect(0px 288px 24px 264px);
+}
+toolbar[iconsize="small"][mode="icons"] #forward-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 288px 48px 264px);
+}
+toolbar[iconsize="small"][mode="icons"] #forward-button[disabled="true"] {
+  -moz-image-region: rect(48px 288px 72px 264px);
+}
+toolbar[iconsize="small"][mode="icons"] #forward-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px 288px 96px 264px);
+}
+
+/* unified forward button with keyhole icons, small icons mode, RTL version */
+
+toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px 338px 24px 314px);
+}
+toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 338px 48px 314px);
+}
+toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"][disabled="true"] {
+  -moz-image-region: rect(48px 338px 72px 314px);
+}
+toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px 338px 96px 314px);
+}
+
+/* dropmarker for unified back and forward buttons with keyhole icons, small icons mode */
+
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker {
+  list-style-image: url("chrome://browser/skin/Toolbar-small.png");
+  -moz-image-region: rect(0px 301px 24px 288px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 301px 48px 288px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[disabled="true"] {
+  -moz-image-region: rect(48px 301px 72px 288px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px 301px 96px 288px);
+}
+
+/* unified dropmarker with keyhole icons, small icons mode, RTL version */
+
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"] {
+  -moz-image-region: rect(0px 314px 24px 301px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 314px 48px 301px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"][disabled="true"] {
+  -moz-image-region: rect(48px 314px 72px 301px);
+}
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px 314px 96px 301px);
+}
+
 /* ::::: 24px primary toolbar buttons ::::: */
 
 /* back button */
@@ -595,7 +696,7 @@ toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"] {
 /* back button */
 
 toolbar[iconsize="small"] #back-button > .toolbarbutton-icon {
-  padding-right: 1px;
+  -moz-padding-end: 1px;
 }
 toolbar[iconsize="small"] #back-button {
   -moz-image-region: rect(0px 16px 16px 0px);
@@ -632,7 +733,7 @@ menupopup[chromedir="rtl"] > .unified-nav-forward[_moz-menuactive] {
 /* forward button */
 
 toolbar[iconsize="small"] #forward-button > .toolbarbutton-icon {
-  padding-right: 1px;
+  -moz-padding-end: 1px;
 }
 toolbar[iconsize="small"] #forward-button {
   -moz-image-region: rect(0px 32px 16px 16px);