merge

browser/themes/pinstripe/browser/browser.css

@@ -779,105 +779,48 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 /* ::::: nav-bar-inner ::::: */
 
 #urlbar {
+  -moz-appearance: none;
   direction: ltr !important;
+  border: none;
+  background: url("chrome://browser/skin/urlbar/endcap.png") transparent right center no-repeat;
+  margin: 0 3px 1px;
+  -moz-padding-end: 11px;
   font: icon !important;
   width: 7em;
   min-width: 7em;
-  -moz-appearance: none;
-  -moz-background-clip: padding;
-  -moz-border-radius: 100%;
-  border: 1px solid;
-  -moz-border-top-colors: #666;
-  -moz-border-right-colors: #777;
-  -moz-border-bottom-colors: #888;
-  -moz-border-left-colors: #777;
-  -moz-box-shadow: 0 1px 1px rgba(0,0,0,.3) inset,
-                   0 1px 0 rgba(255,255,255,.3);
-  margin-top: 0;
-  margin-bottom: 1px;
-  -moz-padding-end: 6px;
+  height: 28px;
 }
 
 #urlbar[focused="true"] {
-  -moz-border-top-colors: rgba(0,0,0,.3);
-  -moz-border-right-colors: rgba(0,0,0,.2);
-  -moz-border-bottom-colors: rgba(0,0,0,.15);
-  -moz-border-left-colors: rgba(0,0,0,.2);
-  -moz-box-shadow: 0 1px 1px rgba(0,0,0,.3) inset,
-                   0 0 1px -moz-mac-focusring inset,
-                   0 0 4px 1px -moz-mac-focusring,
-                   0 0 2px 1px -moz-mac-focusring;
+  background: url("chrome://browser/skin/urlbar/endcap-focused.png") transparent right center no-repeat;
 }
 
-#identity-box {
-  background: #fff url(navbar-textbox-button.png) bottom repeat-x;
-  -moz-background-clip: padding;
-  color: black;
-  -moz-padding-start: 6px;
-  -moz-padding-end: 16px;
-  -moz-border-radius: 100%;
-  border-top: 1px solid rgba(0,0,0,.35);
-  -moz-border-start: 1px solid rgba(0,0,0,.25);
-  border-bottom: 1px solid rgba(0,0,0,.2);
-  margin-top: -1px;
-  margin-bottom: -1px;
-  -moz-margin-start: -1px;
+#urlbar[focused="true"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite.png");
 }
 
-#identity-box:focus:not(:active):not([open="true"]) #page-proxy-stack {
-  -moz-border-radius: 4px;
-  -moz-box-shadow: 0 0 3px 1px -moz-mac-focusring inset,
-                   0 0 3px 2px -moz-mac-focusring;
+#urlbar .textbox-input-box,
+#urlbar-icons {
+  margin: 0;
+  background: url("chrome://browser/skin/urlbar/textfield-mid.png") transparent left center  repeat-x;
 }
 
-#identity-box[open="true"],
-#identity-box:hover:active {
-  border-style: none;
+#urlbar[focused="true"] .textbox-input-box,
+#urlbar[focused="true"] #urlbar-icons {
+  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused.png");
+}
+
+#urlbar[focused="true"] .textbox-input-box:-moz-system-metric(mac-graphite-theme),
+#urlbar[focused="true"] #urlbar-icons:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused-graphite.png");
+}
+
+#urlbar .textbox-input-box {
   padding-top: 1px;
-  padding-bottom: 1px;
-  -moz-padding-start: 7px;
-  -moz-box-shadow: 0 0 50px rgba(0,0,0,.3) inset,
-                   0 3px 3px rgba(0,0,0,.6) inset,
-                   2px 0 2px rgba(0,0,0,.3) inset,
-                   0 -2px 2px rgba(0,0,0,.1) inset;
 }
 
-#identity-box.verifiedDomain {
-  background-image: url(navbar-textbox-button-verifiedDomain.png);
-}
-
-#identity-box.verifiedIdentity {
-  background-image: url(navbar-textbox-button-verifiedIdentity.png);
-}
-
-#identity-icon-label {
-  margin: 0 4px;
-}
-
-#identity-box.unknownIdentity > hbox > #identity-icon-label {
-  display: none;
-}
-
-#urlbar > .autocomplete-textbox-container > .textbox-input-box {
-  -moz-border-radius-topleft: 100%;
-  -moz-border-radius-bottomleft: 100%;
-  -moz-margin-end: 0;
-  -moz-margin-start: -16px;
-  background-color: -moz-field;
-  -moz-padding-start: 10px;
-  -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset,
-                   1px 0 0 rgba(0,0,0,.2) inset;
-}
-
-#urlbar[focused="true"] > .autocomplete-textbox-container > .textbox-input-box {
-  -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset,
-                   1px 0 0 rgba(0,0,0,.2) inset,
-                   2px 0 0 -moz-field inset,
-                   1px 0 1px -moz-mac-focusring inset;
-}
-
-#urlbar[focused="true"] > #identity-box {
-  -moz-box-shadow: 0 0 1px -moz-mac-focusring inset;
+.autocomplete-textbox {
+  background-image: inherit !important;
 }
 
 #urlbar-icons {
@@ -885,10 +828,13 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 }
 
 #urlbar-search-splitter {
+  /* This is a bit of a mess, because the location bar and the search bar are bigger
+     than they look. For example, -moz-margin-start: -6px should really be -4px.
+     Bug 482086 and bug 482105 will solve this. */
   min-width: 8px;
   width: 8px;
   background-image: none;
-  -moz-margin-start: -4px;
+  -moz-margin-start: -6px;
 }
 
 #urlbar-search-splitter + #urlbar-container > #urlbar,
@@ -896,6 +842,34 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-margin-start: 0;
 }
 
+#wrapper-urlbar-container #urlbar,
+#urlbar[readonly="true"] {
+  -moz-padding-end: 12px;
+}
+
+#wrapper-urlbar-container[place="palette"] {
+  max-width: 20em;
+}
+
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box > hbox > #identity-icon-label,
+#wrapper-urlbar-container #urlbar > .autocomplete-history-dropmarker {
+  display: none;
+}
+
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box.verifiedIdentity  > hbox > #identity-icon-label,
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box.verifiedDomain > hbox > #identity-icon-label {
+  display: -moz-box;
+}
+
+/* Keep the URL bar LTR */
+
+#PopupAutoCompleteRichResult {
+  direction: ltr !important;
+  margin-top: -2px;
+}
+
+/* ----- PAGE PROXY ICON ----- */
+
 #page-proxy-favicon,
 #urlbar-throbber {
   width: 16px;
@@ -905,14 +879,11 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 }
 
 #page-proxy-stack {
+  -moz-margin-start: 10px;
   width: 24px;
   height: 20px;
   padding: 2px 4px;
-}
-
-#identity-box.verifiedIdentity > hbox > #page-proxy-stack,
-#identity-box.verifiedDomain > hbox > #page-proxy-stack {
-  background: url(urlbar-favicon-glow.png) center center no-repeat;
+  opacity: 1.0;
 }
 
 #page-proxy-favicon:not([src]) {
@@ -927,19 +898,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   list-style-image: url("chrome://browser/skin/places/searching_16.png");
 }
 
-#wrapper-urlbar-container[place="palette"] {
-  max-width: 20em;
-}
-
-#wrapper-urlbar-container #identity-icon-label,
-#wrapper-urlbar-container .autocomplete-history-dropmarker {
-  display: none;
-}
-
-#PopupAutoCompleteRichResult {
-  direction: ltr !important;
-  margin-top: 2px;
-}
 
 statusbarpanel#statusbar-display {
   -moz-padding-start: 0;
@@ -1869,6 +1827,179 @@ tabpanels.plain {
   -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight !important;
 }
 
+/* ::::: Identity Indicator Styling ::::: */
+/* Location bar visuals*/
+
+#identity-box {
+  background: url("chrome://browser/skin/urlbar/startcap.png") left center no-repeat;
+  min-width: 45px;
+}
+
+#urlbar[focused="true"] > #identity-box {
+  background-image: url("chrome://browser/skin/urlbar/startcap-focused.png");
+}
+
+#urlbar[focused="true"] > #identity-box:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite.png");
+}
+
+#identity-box:focus > hbox > #page-proxy-deck {
+  outline: 2px solid #4F8EC9;
+  -moz-outline-radius: 2px;
+}
+
+#identity-box:hover:active,
+#identity-box[open="true"] {
+  background-image: url("chrome://browser/skin/urlbar/startcap-active.png");
+}
+
+#identity-icon-label {
+  margin: 0;
+  color: black;
+  padding: 4px 6px 3px;
+  -moz-padding-end: 14px;
+}
+
+#identity-box.unknownIdentity > hbox > #identity-icon-label {
+  display: none;
+}
+
+
+/* Verified domain */
+/* - Normal state */
+#identity-box.verifiedDomain {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start.png");
+  -moz-padding-start: 13px;
+}
+
+#identity-box.verifiedDomain > hbox {
+  padding: 0;
+  background: url("chrome://browser/skin/urlbar/startcap-secure-mid.png") repeat-x center center;
+  -moz-box-pack: center;
+}
+
+#identity-box.verifiedDomain > hbox > #identity-icon-label {
+  background: url("chrome://browser/skin/urlbar/startcap-secure-end.png") no-repeat center right;
+}
+
+/* - Active state */
+#identity-box.verifiedDomain[open="true"],
+#identity-box.verifiedDomain:hover:active {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-active.png");
+}
+
+#identity-box.verifiedDomain[open="true"] > hbox,
+#identity-box.verifiedDomain:hover:active > hbox {
+  padding: 0;
+  background: url("chrome://browser/skin/urlbar/startcap-secure-mid-active.png") repeat-x center center;
+  -moz-box-pack: center;
+}
+
+#identity-box.verifiedDomain[open="true"] > hbox > #identity-icon-label,
+#identity-box.verifiedDomain:hover:active > hbox > #identity-icon-label {
+  background: url("chrome://browser/skin/urlbar/startcap-secure-end-active.png") no-repeat center right;
+}
+
+/* - Focus state */
+#urlbar[focused="true"] > #identity-box.verifiedDomain {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-focused.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-mid-focused.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox > #identity-icon-label {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-end-focused.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedDomain:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-focused-graphite.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-mid-focused-graphite.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox > #identity-icon-label:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-end-focused-graphite.png");
+}
+
+#identity-box.verifiedDomain > hbox > #identity-icon-label[value=""] {
+  -moz-padding-start: 3px !important;
+  -moz-padding-end: 8px !important;
+}
+
+
+/* Verified Identity */
+/* - Normal state */
+#identity-box.verifiedIdentity {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start.png");
+  -moz-padding-start: 13px;
+}
+
+#identity-box.verifiedIdentity > hbox {
+  padding: 0;
+  background: url("chrome://browser/skin/urlbar/startcap-verified-mid.png") repeat-x center center;
+  -moz-box-pack: center;
+}
+
+#identity-box.verifiedIdentity > hbox > #identity-icon-label {
+  background: url("chrome://browser/skin/urlbar/startcap-verified-end.png") no-repeat center right;
+}
+
+/* - Active state */
+#identity-box.verifiedIdentity[open="true"],
+#identity-box.verifiedIdentity:hover:active {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-active.png");
+}
+
+#identity-box.verifiedIdentity[open="true"] > hbox,
+#identity-box.verifiedIdentity:hover:active > hbox {
+  background: url("chrome://browser/skin/urlbar/startcap-verified-mid-active.png") repeat-x center center;
+}
+
+#identity-box.verifiedIdentity[open="true"] > hbox > #identity-icon-label,
+#identity-box.verifiedIdentity:hover:active > hbox > #identity-icon-label {
+  background: url("chrome://browser/skin/urlbar/startcap-verified-end-active.png") no-repeat center right;
+}
+
+/* - Focus state */
+#urlbar[focused="true"] > #identity-box.verifiedIdentity {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-focused.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-mid-focused.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox > #identity-icon-label {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-end-focused.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedIdentity:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-focused-graphite.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-mid-focused-graphite.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox > #identity-icon-label:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-end-focused-graphite.png");
+}
+
+/* Favicon Glow */
+#identity-box.verifiedIdentity > hbox > #page-proxy-stack,
+#identity-box.verifiedDomain > hbox > #page-proxy-stack {
+  -moz-margin-start: -3px;
+  width: 24px;
+  height: 20px;
+  padding: 2px 4px;
+  background: url("chrome://browser/skin/urlbar/urlbar-favicon-glow.png") center center no-repeat;
+}
+
+
 /* Popup Icons */
 #identity-popup-icon {
   height: 64px;
@@ -1938,7 +2069,7 @@ tabpanels.plain {
   -moz-window-shadow: none;
   background-color: transparent;
   margin-top: -4px;
-  margin-left: -15px;
+  margin-left: -13px;
   min-width: 280px;
   -moz-border-image: url(chrome://browser/skin/hud-panel.png) 26 18 22 50 / 26px 18px 22px 50px repeat; 
 }

browser/themes/pinstripe/browser/jar.mn

@@ -32,9 +32,6 @@ classic.jar:
   skin/classic/browser/KUI-background.png
   skin/classic/browser/menu-back.png
   skin/classic/browser/menu-forward.png
-  skin/classic/browser/navbar-textbox-button.png
-  skin/classic/browser/navbar-textbox-button-verifiedDomain.png
-  skin/classic/browser/navbar-textbox-button-verifiedIdentity.png
   skin/classic/browser/page-livemarks.png
   skin/classic/browser/livemark-item.png
   skin/classic/browser/pageInfo.css
@@ -53,7 +50,6 @@ classic.jar:
   skin/classic/browser/Secure-background.gif
   skin/classic/browser/Toolbar.png
   skin/classic/browser/Toolbar-rtl.png
-  skin/classic/browser/urlbar-favicon-glow.png
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
@@ -128,16 +124,50 @@ classic.jar:
   skin/classic/browser/urlbar/endcap.png                                 (urlbar/endcap.png)
   skin/classic/browser/urlbar/endcap-rtl.png                             (urlbar/endcap-rtl.png)
   skin/classic/browser/urlbar/endcap-focused.png                         (urlbar/endcap-focused.png)
+  skin/classic/browser/urlbar/endcap-focused-graphite.png                (urlbar/endcap-focused-graphite.png)
+  skin/classic/browser/urlbar/endcap-focused-graphite-rtl.png            (urlbar/endcap-focused-graphite-rtl.png)
   skin/classic/browser/urlbar/endcap-focused-rtl.png                     (urlbar/endcap-focused-rtl.png)
   skin/classic/browser/urlbar/startcap.png                               (urlbar/startcap.png)
   skin/classic/browser/urlbar/startcap-rtl.png                           (urlbar/startcap-rtl.png)
   skin/classic/browser/urlbar/startcap-focused.png                       (urlbar/startcap-focused.png)
+  skin/classic/browser/urlbar/startcap-focused-graphite.png              (urlbar/startcap-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-focused-graphite-rtl.png          (urlbar/startcap-focused-graphite-rtl.png)
   skin/classic/browser/urlbar/startcap-focused-rtl.png                   (urlbar/startcap-focused-rtl.png)
+  skin/classic/browser/urlbar/startcap-secure-start.png                  (urlbar/startcap-secure-start.png)
+  skin/classic/browser/urlbar/startcap-secure-mid.png                    (urlbar/startcap-secure-mid.png)
+  skin/classic/browser/urlbar/startcap-secure-end.png                    (urlbar/startcap-secure-end.png)
+  skin/classic/browser/urlbar/startcap-secure-start-active.png           (urlbar/startcap-secure-start-active.png)
+  skin/classic/browser/urlbar/startcap-secure-mid-active.png             (urlbar/startcap-secure-mid-active.png)
+  skin/classic/browser/urlbar/startcap-secure-end-active.png             (urlbar/startcap-secure-end-active.png)
+  skin/classic/browser/urlbar/startcap-secure-start-focused.png          (urlbar/startcap-secure-start-focused.png)
+  skin/classic/browser/urlbar/startcap-secure-start-focused-graphite.png (urlbar/startcap-secure-start-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-secure-mid-focused.png            (urlbar/startcap-secure-mid-focused.png)
+  skin/classic/browser/urlbar/startcap-secure-mid-focused-graphite.png   (urlbar/startcap-secure-mid-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-secure-end-focused.png            (urlbar/startcap-secure-end-focused.png)
+  skin/classic/browser/urlbar/startcap-secure-end-focused-graphite.png   (urlbar/startcap-secure-end-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-verified-start.png                (urlbar/startcap-verified-start.png)
+  skin/classic/browser/urlbar/startcap-verified-mid.png                  (urlbar/startcap-verified-mid.png)
+  skin/classic/browser/urlbar/startcap-verified-end.png                  (urlbar/startcap-verified-end.png)
+  skin/classic/browser/urlbar/startcap-verified-start-active.png         (urlbar/startcap-verified-start-active.png)
+  skin/classic/browser/urlbar/startcap-verified-mid-active.png           (urlbar/startcap-verified-mid-active.png)
+  skin/classic/browser/urlbar/startcap-verified-end-active.png           (urlbar/startcap-verified-end-active.png)
+  skin/classic/browser/urlbar/startcap-verified-start-focused.png        (urlbar/startcap-verified-start-focused.png)
+  skin/classic/browser/urlbar/startcap-verified-start-focused-graphite.png (urlbar/startcap-verified-start-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-verified-mid-focused.png          (urlbar/startcap-verified-mid-focused.png)
+  skin/classic/browser/urlbar/startcap-verified-mid-focused-graphite.png (urlbar/startcap-verified-mid-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-verified-end-focused.png          (urlbar/startcap-verified-end-focused.png)
+  skin/classic/browser/urlbar/startcap-verified-end-focused-graphite.png (urlbar/startcap-verified-end-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-secure.png                        (urlbar/startcap-secure.png)
   skin/classic/browser/urlbar/startcap-active.png                        (urlbar/startcap-active.png)
   skin/classic/browser/urlbar/startcap-active-rtl.png                    (urlbar/startcap-active-rtl.png)
   skin/classic/browser/urlbar/startcap-active-focused.png                (urlbar/startcap-active-focused.png)
+  skin/classic/browser/urlbar/startcap-active-focused-graphite.png       (urlbar/startcap-active-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-active-focused-graphite-rtl.png   (urlbar/startcap-active-focused-graphite-rtl.png)
   skin/classic/browser/urlbar/startcap-active-focused-rtl.png            (urlbar/startcap-active-focused-rtl.png)
+  skin/classic/browser/urlbar/startcap-secure-active.png                 (urlbar/startcap-secure-active.png)
+  skin/classic/browser/urlbar/urlbar-favicon-glow.png                    (urlbar/urlbar-favicon-glow.png)
   skin/classic/browser/urlbar/textfield-mid.png                          (urlbar/textfield-mid.png)
   skin/classic/browser/urlbar/textfield-mid-focused.png                  (urlbar/textfield-mid-focused.png)
+  skin/classic/browser/urlbar/textfield-mid-focused-graphite.png         (urlbar/textfield-mid-focused-graphite.png)
   icon.png
   preview.png

browser/themes/pinstripe/browser/searchbar.css

@@ -22,6 +22,10 @@
   background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused.png");
 }
 
+.searchbar-textbox[focused="true"] > .autocomplete-textbox-container > .textbox-input-box:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused-graphite.png");
+}
+
 .searchbar-engine-image {
   width: 16px;
   height: 16px;
@@ -53,6 +57,14 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-focused-rtl.png");
 }
 
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite.png");
+}
+
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite-rtl.png");
+}
+
 .searchbar-engine-button:hover:active,
 .searchbar-engine-button[open="true"] {
   background-image: url("chrome://browser/skin/urlbar/startcap-active.png") !important;
@@ -73,6 +85,16 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-rtl.png") !important;
 }
 
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:active:-moz-system-metric(mac-graphite-theme),
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite.png") !important;
+}
+
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active:-moz-system-metric(mac-graphite-theme),
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite-rtl.png") !important;
+}
+
 .searchbar-engine-button > .button-box {
   -moz-appearance: none;
   padding: 0;
@@ -108,6 +130,14 @@
   background: url("chrome://browser/skin/urlbar/endcap-focused-rtl.png") no-repeat left top;
 }
 
+.searchbar-textbox[focused="true"] > .search-go-container:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite.png");
+}
+
+.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite-rtl.png");
+}
+
 .search-go-button {
   padding: 1px;
   list-style-image: url("chrome://browser/skin/Search.png");