diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index feb69d2455b3..86410036a6dd 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -374,7 +374,7 @@ var BrowserUI = {
       var engine = engines[e];
       button.id = engine.name;
       button.setAttribute("label", engine.name);
-      button.className = "searchengine";
+      button.className = "searchengine show-text button-dark";
       if (engine.iconURI)
         button.setAttribute("image", engine.iconURI.spec);
       container.appendChild(button);
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index 7d31d61a0250..9b012fed3482 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -220,12 +220,12 @@
     <!-- end: Browser View -->
 
     <!-- begin: left bar -->
-    <vbox id="tabs-container" style="-moz-stack-sizing: ignore; width: 132px; height: 420px;"
+    <vbox id="tabs-container" class="panel-dark" style="-moz-stack-sizing: ignore; width: 132px; height: 420px;"
           left="-132" top="60"
           constraint="ignore-y,vp-relative">
       <richlistbox id="tabs" onselect="BrowserUI.selectTab(this.selectedItem);" onmouseup="BrowserUI.hideTabs();" onclosetab="BrowserUI.closeTab(this);"/>
       <hbox id="tabs-controls">
-        <toolbarbutton id="newtab-button" command="cmd_newTab"/>
+        <toolbarbutton id="newtab-button" class="button-dark" command="cmd_newTab"/>
       </hbox>
     </vbox>
     <!-- barrier to the right of the left sidebar -->
@@ -236,21 +236,20 @@
     <!-- begin: right bar -->
     <!-- barrier to the left of the right bar -->
     <spacer style="-moz-stack-sizing: ignore; width: 1px; height: 1px;" barriertype="vertical" size="30" left="800" constraint="vp-relative"/>
-    <vbox id="browser-controls" style="-moz-stack-sizing: ignore;"
+    <vbox id="browser-controls" class="panel-dark" style="-moz-stack-sizing: ignore;"
           left="800" top="60"
           width="80" height="420"
           constraint="ignore-y,vp-relative">
-      <toolbarbutton id="tool-star" class="browser-control-button" command="cmd_star"/>
-      <toolbarbutton id="tool-back" class="browser-control-button" command="cmd_back"/>
-      <toolbarbutton id="tool-forward" class="browser-control-button" command="cmd_forward"/>
+      <toolbarbutton id="tool-star" class="browser-control-button button-dark" command="cmd_star"/>
+      <toolbarbutton id="tool-back" class="browser-control-button button-dark" command="cmd_back"/>
+      <toolbarbutton id="tool-forward" class="browser-control-button button-dark" command="cmd_forward"/>
       <toolbarspring/>
-      <toolbarbutton id="tool-actions" class="browser-control-button" command="cmd_actions" hidden="true"/>
-      <toolbarbutton id="tool-panel-open" class="page-button" command="cmd_panel"/>
+      <toolbarbutton id="tool-panel-open" class="page-button button-dark" command="cmd_panel"/>
     </vbox>
     <!-- end: right bar -->
 
     <!-- begin: Main Toolbar -->
-    <toolbar id="toolbar-main" style="-moz-stack-sizing: ignore; width: 800px; height: 60px" top="-60" left="0" constraint="ignore-x,vp-relative">
+    <toolbar id="toolbar-main" class="panel-dark" style="-moz-stack-sizing: ignore; width: 800px; height: 60px" top="-60" left="0" constraint="ignore-x,vp-relative">
       <hbox id="urlbar-container" flex="1">
         <box id="identity-box"
              onclick="getIdentityHandler().handleIdentityButtonEvent(event);"
@@ -273,13 +272,13 @@
                    ontextentered="BrowserUI.goToURI();"
                    clickSelectsAll="true"/>
         </hbox>
-        <hbox id="urlbar-icons">
+        <hbox id="urlbar-icons" mode="view">
           <toolbarbutton id="tool-reload" class="urlbar-cap-button" command="cmd_reload"/>
           <toolbarbutton id="tool-stop" class="urlbar-cap-button" command="cmd_stop"/>
           <toolbarbutton id="tool-go" class="urlbar-cap-button" command="cmd_go"/>
         </hbox>
       </hbox>
-      <toolbarbutton id="tool-bookmarks" class="urlbar-button" command="cmd_bookmarks"/>
+      <toolbarbutton id="tool-bookmarks" class="urlbar-button button-dark" command="cmd_bookmarks"/>
     </toolbar>
     <!-- end: Main Toolbar -->
 
@@ -290,13 +289,13 @@
     </hbox>
 
     <!-- barrier to the left of the right bar -->
-    <hbox id="panel-container" hidden="true" style="-moz-stack-sizing: ignore;" top="0" left="0">
+    <hbox id="panel-container" hidden="true" class="panel-dark" style="-moz-stack-sizing: ignore;" top="0" left="0">
       <vbox id="panel-controls" oncommand="BrowserUI.switchPane(event.target.getAttribute('linkedpanel'));">
         <toolbarspring/>
-        <toolbarbutton id="tool-addons" type="radio" group="1" class="panel-button" linkedpanel="addons-container"/>
-        <toolbarbutton id="tool-downloads" type="radio" group="1" class="panel-button" linkedpanel="downloads-container"/>
-        <toolbarbutton id="tool-preferences" type="radio" group="1" checked="1" class="panel-button" linkedpanel="prefs-container"/>
-        <toolbarbutton id="tool-panel-close" class="page-button" command="cmd_panel"/>
+        <toolbarbutton id="tool-addons" type="radio" group="1" class="panel-button button-dark" linkedpanel="addons-container"/>
+        <toolbarbutton id="tool-downloads" type="radio" group="1" class="panel-button button-dark" linkedpanel="downloads-container"/>
+        <toolbarbutton id="tool-preferences" type="radio" group="1" checked="true" class="panel-button button-dark" linkedpanel="prefs-container"/>
+        <toolbarbutton id="tool-panel-close" type="check" checked="true" class="page-button button-dark" command="cmd_panel"/>
       </vbox>
       <deck id="panel-items" selectedIndex="2" flex="1">
         <vbox id="addons-container" flex="1">
@@ -346,7 +345,7 @@
 
         <vbox id="prefs-container" flex="1">
           <hbox pack="center" id="buttons"/>
-          <scrollbox orient="vertical" id="pref-list" seltype="single" flex="1">
+          <richlistbox id="pref-list" seltype="single" flex="1">
             <vbox class="prefsection">
               <label value="&content.title;" crop="end" flex="1"/>
             </vbox>
@@ -376,12 +375,12 @@
               &clear.private.data.description;
               <button label="&clear.private.data.button;" command="cmd_sanitize"/>
             </richpref>
-          </scrollbox>
+          </richlistbox>
         </vbox>
       </deck>
     </hbox>
 
-    <vbox id="popup_autocomplete" style="-moz-stack-sizing: ignore;" top="60" left="0" constraint="ignore-x,vp-relative">
+    <vbox id="popup_autocomplete" class="panel-dark" hidden="true" style="-moz-stack-sizing: ignore;" top="60" left="0" constraint="ignore-x,vp-relative">
       <arrowscrollbox id="autocomplete_navbuttons"
                       align="center"
                       flex="1"
@@ -391,18 +390,18 @@
       </arrowscrollbox>
     </vbox>
 
-    <vbox id="bookmark-container" hidden="true" style="-moz-stack-sizing: ignore;" top="60" left="0">
+    <vbox id="bookmark-container" class="panel-dark" hidden="true" style="-moz-stack-sizing: ignore;" top="60" left="0">
       <hbox id="bookmark-form" align="start">
         <image id="bookmark-image" src="chrome://browser/skin/images/starred48.png"/>
       </hbox>
     </vbox>
 
-    <vbox id="bookmarklist-container" hidden="true" style="-moz-stack-sizing: ignore;" top="0" left="0">
+    <vbox id="bookmarklist-container" class="panel-dark" hidden="true" style="-moz-stack-sizing: ignore;" top="0" left="0">
       <hbox id="bookmarklist-header" style="height: 60px">
         <description flex="1">&bookmarksHeader.label;</description>
-        <toolbarbutton id="tool-bookmarks-manage" class="text-button" label="&bookmarksManage.label;"
+        <toolbarbutton id="tool-bookmarks-manage" class="urlbar-button show-text button-dark" type="check" autocheck="true" label="&bookmarksManage.label;"
                        oncommand="BookmarkList.toggleManage();"/>
-        <toolbarbutton id="tool-bookmarks-close" class="urlbar-button"
+        <toolbarbutton id="tool-bookmarks-close" class="urlbar-button button-dark" type="check" checked="true"
                        oncommand="BookmarkList.close();"/>
       </hbox>
       <placelist id="bookmark-items" type="bookmarks" flex="1"
@@ -410,10 +409,10 @@
                  onopen="BookmarkList.openBookmark();"/>
     </vbox>
 
-    <vbox id="folder-container" hidden="true" style="-moz-stack-sizing: ignore;" top="0" left="0">
+    <vbox id="folder-container" class="panel-dark" hidden="true" style="-moz-stack-sizing: ignore;" top="0" left="0">
       <hbox id="folder-header" style="height: 60px">
         <description flex="1">&foldersHeader.label;</description>
-        <toolbarbutton id="tool-folders-close" class="urlbar-button"
+        <toolbarbutton id="tool-folders-close" class="urlbar-button button-dark" type="check" checked="true"
                        oncommand="FolderPicker.close()"/>
       </hbox>
       <placetree id="folder-items" type="bookmarks" mode="folders" flex="1" onselect="FolderPicker.moveItem();"/>
diff --git a/mobile/themes/hildon/browser.css b/mobile/themes/hildon/browser.css
index cbc81ef3f5e8..a380c013515f 100644
--- a/mobile/themes/hildon/browser.css
+++ b/mobile/themes/hildon/browser.css
@@ -44,7 +44,6 @@
 #toolbar-main {
   -moz-appearance: none;
   -moz-box-align: center;
-  background: url("chrome://browser/skin/images/toolbar_background.png") repeat-x;
   padding: 0px 10px;
   border: none;
 }
@@ -52,16 +51,21 @@
 toolbarbutton {
   -moz-appearance: none !important;
   -moz-box-orient: vertical;
-  min-width: 0px;
+  min-width: 48px;
+  min-height: 48px;
   /* override default toolbarbutton padding/margin */
   margin: 0;
   padding: 5px;
 }
 
-toolbarbutton:not(.searchengine) .toolbarbutton-text {
+toolbarbutton:not(.show-text) .toolbarbutton-text {
   display: none !important;
 }
 
+toolbarbutton:not(.show-text) .toolbarbutton-icon {
+  -moz-margin-end: 0px;
+}
+
 toolbarbutton:hover,
 toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
@@ -70,53 +74,32 @@ toolbarbutton[open="true"] {
 
 /* main toolbar buttons */
 toolbarbutton.urlbar-button {
-  list-style-image: url("chrome://browser/skin/images/toolbar.png");
-  /* -1px to align backgrounds with endcap */
-  padding: 0px;
-  margin-top: -1px;
-  /* space out the buttons a little bit horizontally */
-  -moz-padding-start: 10px !important;
+  /* space out the buttons a bit horizontally */
+  margin-left: 8px
 }
 
 #tool-bookmarks {
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#tool-bookmarks:hover:active {
-  -moz-image-region: rect(48px 48px 96px 0px);
+  list-style-image: url("chrome://browser/skin/images/bookmarks-24.png");
 }
 
 /* URL bar cap buttons */
 toolbarbutton.urlbar-cap-button {
-  list-style-image: url("chrome://browser/skin/images/toolbar.png");
-  /* position the button near the right edge of the endcap */
-  padding: 0;
-  padding-top: 5px;
-  -moz-padding-start: 24px;
+  margin: 2px;
+  padding: 0px;
+  min-width: 0px;
+  min-height: 0px;
 }
 
 #tool-go {
-  -moz-image-region: rect(0px 72px 24px 48px);
-}
-
-#urlbar-icons:hover:active > #tool-go {
-  -moz-image-region: rect(24px 72px 48px 48px);
+  list-style-image: url("chrome://browser/skin/images/go-16.png");
 }
 
 #tool-reload {
-  -moz-image-region: rect(0px 96px 24px 72px);
-}
-
-#urlbar-icons:hover:active > #tool-reload {
-  -moz-image-region: rect(24px 96px 48px 72px);
+  list-style-image: url("chrome://browser/skin/images/reload-16.png");
 }
 
 #tool-stop {
-  -moz-image-region: rect(0px 120px 24px 96px);
-}
-
-#urlbar-icons:hover:active > #tool-stop {
-  -moz-image-region: rect(24px 120px 48px 96px);
+  list-style-image: url("chrome://browser/skin/images/stop-16.png");
 }
 
 #urlbar-icons[mode="loading"] > #tool-go,
@@ -141,14 +124,49 @@ toolbarbutton.urlbar-cap-button {
   min-height: 60px;
 }
 
+/* creates the left endcap */
 #identity-box {
-  min-height: 49px;
-  min-width: 65px;
-  background: url("images/addressbar_endcap_l_off.png") top right no-repeat;
+  color: #fff;
+  padding: 6px 4px;
+  -moz-border-radius-topleft: 0.5em;
+  -moz-border-radius-bottomleft: 0.5em;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors:#3b3b3b #6d6d6d #535353 #494949;
+  -moz-border-right-colors:#2d2d2d #484848 #484848 #414141;
+  -moz-border-left-colors:#2d2d2d #484848 #484848 #414141;
+  -moz-border-bottom-colors:#111111 #484848 #484848 #414141;
+  background: #414141;
 }
 
 #identity-box:hover:active {
-  background: url("images/addressbar_endcap_l_on.png") top right no-repeat;
+  -moz-border-top-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-right-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-left-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-bottom-colors:#515151 #111111 #272727 #2a2a2a;
+  background-color: #2d2d2d;
+}
+
+/* add special color and extra width */
+#identity-box.verifiedIdentity {
+  min-width: 50px;
+  -moz-border-top-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
+  -moz-border-right-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
+  -moz-border-left-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
+  -moz-border-bottom-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
+  background-color: #77c494;
+}
+
+/* add special color and extra width */
+#identity-box.verifiedDomain {
+  min-width: 50px;
+  -moz-border-top-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
+  -moz-border-right-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
+  -moz-border-left-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
+  -moz-border-bottom-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
+  background-color: #6ca0c9;
 }
 
 /* favicon images are 16x16 */
@@ -157,7 +175,7 @@ toolbarbutton.urlbar-cap-button {
   max-height: 24px;
   min-width: 24px;
   min-height: 24px;
-  margin: 12px 2px 2px 12px;
+  margin: 2px;
 }
 
 #urlbar-throbber[loading] {
@@ -170,207 +188,133 @@ toolbarbutton.urlbar-cap-button {
 }
 
 #urlbar-editarea {
-  min-height: 49px;
   -moz-box-align: center;
-  background: url("images/addressbar_middle.png") repeat-x;
-}
-
-#urlbar-caption {
-  margin: 2px 8px 2px 8px;
+  padding: 4px 4px;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors:#414141 #aaa #dedede #efefef;
+  -moz-border-right-colors:#2d2d2d #dedede #efefef #fafafa;
+  -moz-border-left-colors:#2d2d2d #dedede #efefef #fafafa;
+  -moz-border-bottom-colors:#2d2d2d #fff #fff #fff;
+  background-color: #fff;
 }
 
 #urlbar-edit {
   -moz-appearance: none !important;
   padding: 0px !important;
   border: none !important;
-  background-color: transparent;
+  background-color: #fff;
 }
 
-/* urlbar toolbuttons images are 36x36 */
+/* make sure this endcap matches the other endcap */
 #urlbar-icons {
-  min-height: 49px;
-  min-width: 65px;
-  -moz-box-align: start;
-  padding-top: 6px;
-  background: url("images/addressbar_endcap_r_off.png") no-repeat;
+  color: #fff;
+  padding: 9px 4px;
+  -moz-border-radius-topright: 0.5em;
+  -moz-border-radius-bottomright: 0.5em;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors:#3b3b3b #6d6d6d #535353 #494949;
+  -moz-border-right-colors:#2d2d2d #484848 #484848 #414141;
+  -moz-border-left-colors:#2d2d2d #484848 #484848 #414141;
+  -moz-border-bottom-colors:#111111 #484848 #484848 #414141;
+  background: #414141;
 }
 
 #urlbar-icons:hover:active {
-  background: url("images/addressbar_endcap_r_on.png") no-repeat;
+  -moz-border-top-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-right-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-left-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-bottom-colors:#515151 #111111 #272727 #2a2a2a;
+  background-color: #2d2d2d;
 }
 
 /* right toolbar (browser controls) ---------------------------------------- */
 #browser-controls {
-  background: url("images/right_sidebar_middle.png") repeat-y;
-  /* first 10 pixels in right_sidebar_middle are a gradient */
-  /* end padding must match #toolbar-main */
-  padding: 0 10px;
-  /* ...and right-align so that the buttons line up with
-     the bookmark button in the main toolbar */
   -moz-box-align: end;
-}
-
-toolbarbutton.browser-control-button {
-  list-style-image: url("chrome://browser/skin/images/right_buttons.png");
+  padding: 0px 10px;
 }
 
 toolbarbutton.browser-control-button,
 toolbarbutton.panel-button,
 toolbarbutton.page-button {
   /* space out the buttons a bit vertically */
-  padding: 0;
-  padding-top: 8px;
+  margin-bottom: 8px;
 }
 
 #tool-star {
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#tool-star:hover:active {
-  -moz-image-region: rect(0px 96px 48px 48px);
+  list-style-image: url("chrome://browser/skin/images/bookmarkpage-24.png");
 }
 
 #tool-star[starred="true"] {
-  -moz-image-region: rect(0px 192px 48px 144px);
+  list-style-image: url("chrome://browser/skin/images/bookmarkpage-on-24.png");
 }
 
 #tool-back {
-  -moz-image-region: rect(48px 64px 112px 0px);
-  /* this button is 16px wider than the others, so offset by 8px */
-  -moz-margin-end: -8px;
-}
-
-#tool-back:hover:active {
-  -moz-image-region: rect(48px 128px 112px 64px);
+  list-style-image: url("chrome://browser/skin/images/back-24.png");
 }
 
 #tool-back[disabled="true"] {
-  -moz-image-region: rect(48px 192px 112px 128px) !important;
+  list-style-image: url("chrome://browser/skin/images/back-disabled-24.png");
 }
 
 #tool-forward {
-  -moz-image-region: rect(112px 48px 160px 0px);
-  /* cuddle up underneath the back button */
-  padding-top: 0px;
-}
-
-#tool-forward:hover:active {
-  -moz-image-region: rect(112px 96px 160px 48px);
+  list-style-image: url("chrome://browser/skin/images/forward-24.png");
 }
 
 #tool-forward[disabled="true"] {
-  -moz-image-region: rect(112px 144px 160px 96px) !important;
-}
-
-#tool-actions {
-  -moz-image-region: rect(160px 48px 208px 0px);
-}
-
-#tool-actions:hover:active {
-  -moz-image-region: rect(160px 96px 208px 48px);
-}
-
-toolbarbutton.page-button {
-  list-style-image: url("chrome://browser/skin/images/page_buttons.png");
+  list-style-image: url("chrome://browser/skin/images/forward-disabled-24.png");
 }
 
+/* button is moved off the right edge */
 #tool-panel-open {
-  -moz-image-region: rect(0px 62px 48px 0px);
+  list-style-image: url("chrome://browser/skin/images/settings-24.png");
   margin-right: -14px;
+  /* XXX not sure why we need the padding here, but not in #tool-panel-close */
+  padding-right: 24px;
 }
 
-#tool-panel-open:active {
-  -moz-image-region: rect(0px 124px 48px 62px);
-}
-
+/* button is moved off the left edge */
 #tool-panel-close {
-  -moz-image-region: rect(48px 124px 96px 62px);
+  list-style-image: url("chrome://browser/skin/images/back-24.png");
   margin-left: -14px;
 }
 
-#tool-panel-close:active {
-  -moz-image-region: rect(48px 62px 96px 0px);
-}
-
 /* "extras" panel UI   ----------------------------------------------------- */
 #panel-controls {
   /* match #browser-controls end padding */
   padding: 0px 10px;
 }
 
-#panel-container {
-  background: url("images/panel_background.png") repeat-x;
-}
-
-toolbarbutton.panel-button {
-  list-style-image: url("chrome://browser/skin/images/panel_buttons.png");
-  /* override checked style */
-  background: none !important;
-  border-color: transparent !important;
-}
-
 #tool-addons {
-  -moz-image-region: rect(48px 48px 96px 0px);
-}
-
-#tool-addons:hover:active, #tool-addons[checked] {
-  -moz-image-region: rect(48px 96px 96px 48px);
+  list-style-image: url("chrome://browser/skin/images/addons-24.png");
 }
 
 #tool-downloads {
-  -moz-image-region: rect(96px 48px 144px 0px);
-}
-
-#tool-downloads:hover:active, #tool-downloads[checked] {
-  -moz-image-region: rect(96px 96px 144px 48px);
+  list-style-image: url("chrome://browser/skin/images/downloads-24.png");
 }
 
 #tool-preferences {
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#tool-preferences:hover:active, #tool-preferences[checked] {
-  -moz-image-region: rect(0px 96px 48px 48px);
+  list-style-image: url("chrome://browser/skin/images/preferences-24.png");
 }
 
 /* URL List and autocomplete navigation popup ------------------------------ */
-#tool-bookmarks-close {
-  -moz-image-region: rect(48px 48px 96px 0px);
-}
-
-#tool-bookmarks-close:hover:active {
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#tool-bookmarks-manage {
-  color: rgb(255,255,255);
-  border: 3px groove gray !important;
-  height: 46px;
-  padding-top: 2px;
-  -moz-border-radius: 6px;
-}
-
-#tool-bookmarks-manage .toolbarbutton-text {
-  display: block !important;
-}
-
+#tool-bookmarks-close,
 #tool-folders-close {
-  -moz-image-region: rect(48px 48px 96px 0px);
-}
-
-#tool-folders-close:hover:active {
-  -moz-image-region: rect(0px 48px 48px 0px);
+  list-style-image: url("chrome://browser/skin/images/bookmarks-24.png");
 }
 
 #bookmarklist-container {
-  background-color: rgb(123,125,123);
   padding: 0px;
 }
 
 #bookmarklist-header, #folder-header {
   color: rgb(255,255,255);
   -moz-box-align: center;
-  background: url("chrome://browser/skin/images/toolbar_background.png") repeat-x;
   padding: 0px 10px;
 }
 
@@ -444,7 +388,7 @@ placelabel {
 
 /* use a smaller font size for the manage buttons */
 placeitem .button-text {
-  font-size: 12pt !important;
+  font-size: 9pt !important;
 }
 
 .close-button {
@@ -455,47 +399,31 @@ placeitem .button-text {
   list-style-image: url("chrome://browser/skin/images/folder_close.png");
 }
 
-#popup_autocomplete {
-  background: url(images/navigation_background.png) repeat-x;
-  -moz-appearance: none;
-}
-
-.autocomplete-box {
-  padding: 5px;
-}
-
 .tool-search {
   list-style-image: url("chrome://browser/skin/images/navigation_magnifier.gif");
 }
 
 .searchengine {
   -moz-box-orient: horizontal;
-  color: white;
-}
-.searchengine > .toolbarbutton-text {
-  font-size: 12pt !important;
 }
 
 #autocomplete_navbuttons {
-  -moz-border-image: url(images/navigation_search_caps.png) 0 23 0 23;
-  border-width: 0 23px;
-  margin-top: 10px;
+  margin: 10px;
   min-height: 50px;
 }
 
 .autocomplete-items {
-  overflow: hidden;
-  -moz-border-image: url(images/navigation_url_caps.png) 25 24 25 24 stretch stretch;
-  border-width: 26px 25px;
+  background-color: #fff;
 }
 
 .autocomplete-item,
 .autocomplete-item-selected {
   padding: 5px 2px;
-  color: white;
+  border-bottom: 1px solid rgb(207,207,207);
 }
 
 .autocomplete-item-selected {
+  color: white;
   background-color: grey;
 }
 
@@ -513,7 +441,7 @@ placeitem .button-text {
 
 /* Left sidebar (tabs)  ---------------------------------------------------- */
 #tabs-container {
-  background: url("images/left_sidebar_middle.png") rgb(87,87,87) top right repeat-y;
+  padding-left: 10px;
   min-width: 132px;
 }
 
@@ -548,23 +476,7 @@ vbox:first-child richlistitem[type="documenttab"]:only-child .documenttab-close
 }
 
 #newtab-button {
-  list-style-image: url("images/left_buttons.png");
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#newtab-button:hover:active {
-  list-style-image: url("images/left_buttons.png");
-  -moz-image-region: rect(0px 96px 48px 48px);
-}
-
-#retrievetab-button {
-  list-style-image: url("images/left_buttons.png");
-  -moz-image-region: rect(48px 48px 96px 0px);
-}
-
-#retrievetab-button:hover:active {
-  list-style-image: url("images/left_buttons.png");
-  -moz-image-region: rect(48px 96px 96px 48px);
+  list-style-image: url("images/newtab-24.png");
 }
 
 /* findbar   --------------------------------------------------------------- */
@@ -572,22 +484,13 @@ findbar {
   background: rgba(128, 128, 128, 0.75);
 }
 
-#findpanel {
-  padding: 0 !important;
-  -moz-appearance: none;
-  background: transparent;
-}
-
 /* bookmark editor   ------------------------------------------------------- */
 #bookmark-container {
-  background-color: rgb(123,125,123);
   padding: 8px;
 }
 
 #bookmark-form {
-  background-color: rgb(207,207,207);
-  border: 2px solid #fff !important;
-  -moz-border-radius: 10px;
+  background-color: #fff;
   padding: 8px;
 }
 
@@ -595,8 +498,8 @@ findbar {
 /* Identity popup   -------------------------------------------------------- */
 /* Popup Icons */
 #identity-popup-icon {
-  height: 64px;
-  width: 64px;
+  height: 32px;
+  width: 32px;
   padding: 0;
   list-style-image: url("chrome://browser/skin/images/identity.png");
   -moz-image-region: rect(0px, 64px, 64px, 0px);
@@ -620,36 +523,32 @@ findbar {
   display: none;
 }
 
-#identity-popup-content-box > description,
-#identity-popup-encryption-label {
+#identity-popup-content-box > description {
+  font-size: 9pt !important;
   white-space: pre-wrap;
   -moz-padding-start: 15px;
   margin: 2px 0 4px;
 }
 
 #identity-popup-content-box > label {
+  font-size: 9pt !important;
   white-space: pre-wrap;
   -moz-padding-start: 15px;
   margin: 0;
 }
 
-#identity-popup-content-host ,
-#identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
-  font-size: 1.2em;
-}
-
 #identity-popup-content-host {
   margin-top: 3px;
   margin-bottom: 5px;
   font-weight: bold;
-  max-width: 500px;
+  max-width: 240px;
 }
 
 #identity-popup-content-owner {
   margin-top: 4px;
   margin-bottom: 0 !important;
   font-weight: bold;
-  max-width: 500px;
+  max-width: 240px;
 }
 
 .verifiedDomain > #identity-popup-content-owner {
@@ -690,42 +589,39 @@ findbar {
 }
 
 /* Preferences window   ---------------------------------------------------- */
-#prefs-container {
-  background-color: rgb(123,125,123);
-}
-
+/* XXX should be a richlistitem */
 richpref {
   background-color: white;
   color: black;
 }
 
+/* XXX should be a richlistitem.section-header */
 .prefsection {
-  font-size: 1.5em ! important;
-  color: white;
-  background-color: grey;
-  padding: .2em 0 .2em 0;
+  font-weight: bold;
+  color: #000;
+  background-color: lightgray;
+  padding: 5px;
 }
 
+/* XXX should be a richlistitem */
 .prefbox {
-  padding: .3em .3em .3em .5em;
-  border: thin solid lightgrey;
+  padding: 5px;
+  border-bottom: 1px solid rgb(207,207,207);
+  -moz-box-align: center;
 }
 
+/* XXX should be a richlistitem description.title */
 .preftitle {
-  font-size: 1.25em ! important;
+  font-size: 9pt !important;
 }
 
+/* XXX should be a richlistitem description.normal */
 .prefdesc {
-  font-size: 1em ! important;
+  font-size: 8pt !important;
   color: grey;
   background-color: white;
 }
 
-/* BUG: This rule doesn't actually work; I don't know why. */
-richpref > button {
-  font-size: 1em ! important;
-}
-
 /* Shortcut editor   ------------------------------------------------------- */
 #shortcuts {
   border: 0;
diff --git a/mobile/themes/hildon/images/addons-24.png b/mobile/themes/hildon/images/addons-24.png
new file mode 100644
index 000000000000..62ff3ff98f19
Binary files /dev/null and b/mobile/themes/hildon/images/addons-24.png differ
diff --git a/mobile/themes/hildon/images/addressbar_endcap_l_off.png b/mobile/themes/hildon/images/addressbar_endcap_l_off.png
deleted file mode 100644
index 84205fa8b69e..000000000000
Binary files a/mobile/themes/hildon/images/addressbar_endcap_l_off.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/addressbar_endcap_l_on.png b/mobile/themes/hildon/images/addressbar_endcap_l_on.png
deleted file mode 100644
index 681bc1646668..000000000000
Binary files a/mobile/themes/hildon/images/addressbar_endcap_l_on.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/addressbar_endcap_r_off.png b/mobile/themes/hildon/images/addressbar_endcap_r_off.png
deleted file mode 100644
index f15a9015cb20..000000000000
Binary files a/mobile/themes/hildon/images/addressbar_endcap_r_off.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/addressbar_endcap_r_on.png b/mobile/themes/hildon/images/addressbar_endcap_r_on.png
deleted file mode 100644
index 11babd6f2e29..000000000000
Binary files a/mobile/themes/hildon/images/addressbar_endcap_r_on.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/addressbar_middle.png b/mobile/themes/hildon/images/addressbar_middle.png
deleted file mode 100644
index df5d78f4b5ae..000000000000
Binary files a/mobile/themes/hildon/images/addressbar_middle.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/back-24.png b/mobile/themes/hildon/images/back-24.png
new file mode 100644
index 000000000000..324818faadec
Binary files /dev/null and b/mobile/themes/hildon/images/back-24.png differ
diff --git a/mobile/themes/hildon/images/back-disabled-24.png b/mobile/themes/hildon/images/back-disabled-24.png
new file mode 100644
index 000000000000..31ef8574aa78
Binary files /dev/null and b/mobile/themes/hildon/images/back-disabled-24.png differ
diff --git a/mobile/themes/hildon/images/bookmarkpage-24.png b/mobile/themes/hildon/images/bookmarkpage-24.png
new file mode 100644
index 000000000000..adf97997b536
Binary files /dev/null and b/mobile/themes/hildon/images/bookmarkpage-24.png differ
diff --git a/mobile/themes/hildon/images/bookmarkpage-on-24.png b/mobile/themes/hildon/images/bookmarkpage-on-24.png
new file mode 100644
index 000000000000..3b732267c347
Binary files /dev/null and b/mobile/themes/hildon/images/bookmarkpage-on-24.png differ
diff --git a/mobile/themes/hildon/images/bookmarks-24.png b/mobile/themes/hildon/images/bookmarks-24.png
new file mode 100644
index 000000000000..08f647ac546d
Binary files /dev/null and b/mobile/themes/hildon/images/bookmarks-24.png differ
diff --git a/mobile/themes/hildon/images/bookmarks-on-24.png b/mobile/themes/hildon/images/bookmarks-on-24.png
new file mode 100644
index 000000000000..2a851eef3ae8
Binary files /dev/null and b/mobile/themes/hildon/images/bookmarks-on-24.png differ
diff --git a/mobile/themes/hildon/images/downloads-24.png b/mobile/themes/hildon/images/downloads-24.png
new file mode 100644
index 000000000000..6546ecd76c57
Binary files /dev/null and b/mobile/themes/hildon/images/downloads-24.png differ
diff --git a/mobile/themes/hildon/images/forward-24.png b/mobile/themes/hildon/images/forward-24.png
new file mode 100644
index 000000000000..9a8a0be219b3
Binary files /dev/null and b/mobile/themes/hildon/images/forward-24.png differ
diff --git a/mobile/themes/hildon/images/forward-disabled-24.png b/mobile/themes/hildon/images/forward-disabled-24.png
new file mode 100644
index 000000000000..d9a8d8e692a4
Binary files /dev/null and b/mobile/themes/hildon/images/forward-disabled-24.png differ
diff --git a/mobile/themes/hildon/images/go-16.png b/mobile/themes/hildon/images/go-16.png
new file mode 100644
index 000000000000..52b2f8cdc0f5
Binary files /dev/null and b/mobile/themes/hildon/images/go-16.png differ
diff --git a/mobile/themes/hildon/images/left_buttons.png b/mobile/themes/hildon/images/left_buttons.png
deleted file mode 100644
index 2edd2545281b..000000000000
Binary files a/mobile/themes/hildon/images/left_buttons.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/left_sidebar_middle.png b/mobile/themes/hildon/images/left_sidebar_middle.png
deleted file mode 100644
index 30b6b0c1e3d0..000000000000
Binary files a/mobile/themes/hildon/images/left_sidebar_middle.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/navigation_background.png b/mobile/themes/hildon/images/navigation_background.png
deleted file mode 100644
index 624fa6c813e9..000000000000
Binary files a/mobile/themes/hildon/images/navigation_background.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/navigation_search_caps.png b/mobile/themes/hildon/images/navigation_search_caps.png
deleted file mode 100644
index 1738b26182f3..000000000000
Binary files a/mobile/themes/hildon/images/navigation_search_caps.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/navigation_url_caps.png b/mobile/themes/hildon/images/navigation_url_caps.png
deleted file mode 100644
index 116648bcc1a9..000000000000
Binary files a/mobile/themes/hildon/images/navigation_url_caps.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/newtab-24.png b/mobile/themes/hildon/images/newtab-24.png
new file mode 100644
index 000000000000..ffb90cf9aa04
Binary files /dev/null and b/mobile/themes/hildon/images/newtab-24.png differ
diff --git a/mobile/themes/hildon/images/page-starred.png b/mobile/themes/hildon/images/page-starred.png
deleted file mode 100644
index 96750448283f..000000000000
Binary files a/mobile/themes/hildon/images/page-starred.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/page_buttons.png b/mobile/themes/hildon/images/page_buttons.png
deleted file mode 100644
index e6f01f751b97..000000000000
Binary files a/mobile/themes/hildon/images/page_buttons.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/panel_background.png b/mobile/themes/hildon/images/panel_background.png
deleted file mode 100644
index 167fa9bbef06..000000000000
Binary files a/mobile/themes/hildon/images/panel_background.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/panel_buttons.png b/mobile/themes/hildon/images/panel_buttons.png
deleted file mode 100644
index ffaf0b8aef70..000000000000
Binary files a/mobile/themes/hildon/images/panel_buttons.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/preferences-24.png b/mobile/themes/hildon/images/preferences-24.png
new file mode 100644
index 000000000000..4092c25de32a
Binary files /dev/null and b/mobile/themes/hildon/images/preferences-24.png differ
diff --git a/mobile/themes/hildon/images/reload-16.png b/mobile/themes/hildon/images/reload-16.png
new file mode 100644
index 000000000000..8d04966c2448
Binary files /dev/null and b/mobile/themes/hildon/images/reload-16.png differ
diff --git a/mobile/themes/hildon/images/right_buttons.png b/mobile/themes/hildon/images/right_buttons.png
deleted file mode 100644
index 61f99f2184d9..000000000000
Binary files a/mobile/themes/hildon/images/right_buttons.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/right_sidebar_middle.png b/mobile/themes/hildon/images/right_sidebar_middle.png
deleted file mode 100644
index e98332a1fa7f..000000000000
Binary files a/mobile/themes/hildon/images/right_sidebar_middle.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/settings-24.png b/mobile/themes/hildon/images/settings-24.png
new file mode 100644
index 000000000000..f909ecc15531
Binary files /dev/null and b/mobile/themes/hildon/images/settings-24.png differ
diff --git a/mobile/themes/hildon/images/stop-16.png b/mobile/themes/hildon/images/stop-16.png
new file mode 100644
index 000000000000..81d0d1a2fc01
Binary files /dev/null and b/mobile/themes/hildon/images/stop-16.png differ
diff --git a/mobile/themes/hildon/images/toolbar.png b/mobile/themes/hildon/images/toolbar.png
deleted file mode 100644
index 8ec894fc3aef..000000000000
Binary files a/mobile/themes/hildon/images/toolbar.png and /dev/null differ
diff --git a/mobile/themes/hildon/images/toolbar_background.png b/mobile/themes/hildon/images/toolbar_background.png
deleted file mode 100644
index bc0c8473d324..000000000000
Binary files a/mobile/themes/hildon/images/toolbar_background.png and /dev/null differ
diff --git a/mobile/themes/hildon/jar.mn b/mobile/themes/hildon/jar.mn
index 280fa859a8e1..c1cbe236d048 100644
--- a/mobile/themes/hildon/jar.mn
+++ b/mobile/themes/hildon/jar.mn
@@ -15,26 +15,23 @@ classic.jar:
   images/default-favicon.png           (images/default-favicon.png)
   images/identity.png                  (images/identity.png)
   images/starred48.png                 (images/starred48.png)
-  images/page-starred.png              (images/page-starred.png)
   images/tag.png                       (images/tag.png)
   images/throbber.png                  (images/throbber.png)
-  images/toolbar.png                   (images/toolbar.png)
-  images/toolbar_background.png        (images/toolbar_background.png)
-  images/addressbar_endcap_r_off.png   (images/addressbar_endcap_r_off.png)
-  images/addressbar_endcap_l_off.png   (images/addressbar_endcap_l_off.png)
-  images/addressbar_endcap_r_on.png    (images/addressbar_endcap_r_on.png)
-  images/addressbar_endcap_l_on.png    (images/addressbar_endcap_l_on.png)
-  images/addressbar_middle.png         (images/addressbar_middle.png)
-  images/left_sidebar_middle.png       (images/left_sidebar_middle.png)
-  images/left_buttons.png              (images/left_buttons.png)
-  images/right_sidebar_middle.png      (images/right_sidebar_middle.png)
-  images/right_buttons.png             (images/right_buttons.png)
-  images/panel_buttons.png             (images/panel_buttons.png)
-  images/panel_background.png          (images/panel_background.png)
-  images/navigation_url_caps.png       (images/navigation_url_caps.png)
-  images/navigation_background.png     (images/navigation_background.png)
-  images/navigation_search_caps.png    (images/navigation_search_caps.png)
   images/navigation_magnifier.gif      (images/navigation_magnifier.gif)
-  images/page_buttons.png              (images/page_buttons.png)
   images/folder.png                    (images/folder.png)
   images/folder_close.png              (images/folder_close.png)
+  images/addons-24.png                 (images/addons-24.png)
+  images/downloads-24.png              (images/downloads-24.png)
+  images/preferences-24.png            (images/preferences-24.png)
+  images/settings-24.png               (images/settings-24.png)
+  images/back-24.png                   (images/back-24.png)
+  images/back-disabled-24.png          (images/back-disabled-24.png)
+  images/forward-24.png                (images/forward-24.png)
+  images/forward-disabled-24.png       (images/forward-disabled-24.png)
+  images/bookmarkpage-24.png           (images/bookmarkpage-24.png)
+  images/bookmarkpage-on-24.png        (images/bookmarkpage-on-24.png)
+  images/bookmarks-24.png              (images/bookmarks-24.png)
+  images/stop-16.png                   (images/stop-16.png)
+  images/reload-16.png                 (images/reload-16.png)
+  images/go-16.png                     (images/go-16.png)
+  images/newtab-24.png                 (images/newtab-24.png)
diff --git a/mobile/themes/hildon/platform.css b/mobile/themes/hildon/platform.css
index f7f91f9cbfb3..8a069d756593 100644
--- a/mobile/themes/hildon/platform.css
+++ b/mobile/themes/hildon/platform.css
@@ -59,18 +59,169 @@ richlistitem {
   font-size: 16.75pt !important;
 }
 
+/* panels ------------------------------------------------------------------ */
+.panel-dark {
+  background-color: #414141;
+}
+
+/* dialog popups ----------------------------------------------------------- */
+.dialog-dark {
+  color: #fff;
+  background-color: #414141;
+  -moz-border-radius: 0px 0px 8px 8px;
+  padding: 8px;
+  -moz-box-shadow: black 0px 4px 4px;
+}
+
+/* buttons ----------------------------------------------------------------- */
+.button-text,
+.toolbarbutton-text {
+  font-weight: bold !important;
+  font-size: 9pt !important;
+}
+
+button {
+  color: #414141;
+  padding: 0px 4px;
+  -moz-border-radius: 0.5em;
+  border-top: 4px solid #aaa;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #ccc;
+  -moz-border-top-colors: #888 #fff #fcfcfc #f8f8f8;
+  -moz-border-right-colors: #888 #c3c3c3 #dddddd #e9e9e9;
+  -moz-border-left-colors: #888 #c3c3c3 #dddddd #e9e9e9;
+  -moz-border-bottom-colors: #888 #c3c3c3 #dddddd #e9e9e9;
+  background-color: #efefef;
+}
+
+button[disabled="true"] {
+  -moz-appearance: none;
+  color: #ccc;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors: #ccc #fff #fff #fff;
+  -moz-border-right-colors: #ccc #dedede #efefef #fafafa;
+  -moz-border-left-colors: #ccc #dedede #efefef #fafafa;
+  -moz-border-bottom-colors: #ccc #dedede #efefef #fafafa;
+  background-color: #fff;
+}
+
+/* XXX needs to be updated */
+button:active {
+  padding: 0px 4px;
+  border-top: 8px solid #ccc;
+  border-left: 8px solid #ccc;
+  border-right: 8px solid #ccc;
+  border-bottom: 8px solid #aaa;
+  -moz-border-top-colors: #aaa #bbb #ccc #ddd;
+  -moz-border-right-colors: #aaa #bbb #ccc #ddd;
+  -moz-border-left-colors: #aaa #bbb #ccc #ddd;
+  -moz-border-bottom-colors: #aaa #bbb #ccc #ddd;
+  background-color: #ddd;
+}
+
+/* dark buttons ------------------------------------------------------------ */
+.button-dark {
+  color: #fff;
+  padding: 4px 8px;
+  -moz-border-radius: 0.5em;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors: #3b3b3b #6d6d6d #535353 #494949;
+  -moz-border-right-colors: #2d2d2d #484848 #484848 #414141;
+  -moz-border-left-colors: #2d2d2d #484848 #484848 #414141;
+  -moz-border-bottom-colors: #111111 #484848 #484848 #414141;
+  background-color: #414141;
+}
+
+.button-dark:active {
+  padding: 0px 4px;
+  border-top: 8px solid #ccc;
+  border-left: 8px solid #ccc;
+  border-right: 8px solid #ccc;
+  border-bottom: 8px solid #aaa;
+  -moz-border-top-colors:#323232 #111111 #111111 #1f1f1f #272727 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-right-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-left-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-bottom-colors:#515151 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  background-color: #2d2d2d;
+}
+
+.button-dark[disabled="true"],
+.button-dark[disabled="true"]:active {
+  color: #ccc;
+  padding: 4px 8px;
+  background-color: #414141;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors: #3b3b3b #6d6d6d #535353 #494949;
+  -moz-border-right-colors: #3b3b3b #484848 #484848 #414141;
+  -moz-border-left-colors: #3b3b3b #484848 #484848 #414141;
+  -moz-border-bottom-colors: #2d2d2d #484848 #484848 #414141;
+}
+
+.button-dark[checked="true"] {
+  /* checked overrides */
+  background: none !important;
+  border-color: transparent !important;
+  padding: 0px 4px !important;
+  background-color: #2d2d2d !important;
+
+  border-top: 8px solid #ccc;
+  border-left: 8px solid #ccc;
+  border-right: 8px solid #ccc;
+  border-bottom: 8px solid #aaa;
+  -moz-border-top-colors:#323232 #111111 #111111 #1f1f1f #272727 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-right-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-left-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-bottom-colors:#515151 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+}
+
 /* re-theme radio buttons */
 radiogroup {
   -moz-box-orient: horizontal;
 }
 
+.radio-label {
+  font-weight: bold !important;
+  font-size: 9pt !important;
+}
+
 radio {
-  border: 1px solid #000;
-  border-left: none;
+  color: #414141;
+  padding: 0px 12px 0px 8px;
   margin: 0px;
-  padding: 6px;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors: #aaa #fff #fff #fff;
+  -moz-border-right-colors: #aaa #dedede #efefef #fafafa;
+  -moz-border-left-colors: #aaa #dedede #efefef #fafafa;
+  -moz-border-bottom-colors: #aaa #dedede #efefef #fafafa;
   -moz-box-align: center;
   -moz-appearance: none;
+  background-color: #fff;
+}
+
+radio[selected] {
+  padding: 0px 8px 0px 12px;
+  border-top: 4px solid #aaa;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #ccc;
+  -moz-border-top-colors:#aaa #bbb #ccc #ddd;
+  -moz-border-left-colors:#aaa #bbb #ccc #ddd;
+  -moz-border-bottom-colors:#aaa #bbb #ccc #ddd;
+  -moz-border-right-colors:#aaa #bbb #ccc #ddd;
+  background-color: #ddd;
 }
 
 radio .radio-check-box1, .radio-check {
@@ -78,17 +229,11 @@ radio .radio-check-box1, .radio-check {
 }
 
 radio:first-child {
-  border-left: 1px solid #000;
-  -moz-border-radius-topleft: 8px;
-  -moz-border-radius-bottomleft: 8px;
+  -moz-border-radius-topleft: 0.5em;
+  -moz-border-radius-bottomleft: 0.5em;
 }
 
 radio:last-child {
-  -moz-border-radius-topright: 8px;
-  -moz-border-radius-bottomright: 8px;
-}
-
-radio[selected] {
-  color: #000;
-  background: gray;
+  -moz-border-radius-topright: 0.5em;
+  -moz-border-radius-bottomright: 0.5em;
 }
diff --git a/mobile/themes/wince/browser.css b/mobile/themes/wince/browser.css
index 7b0454b4e6af..a380c013515f 100644
--- a/mobile/themes/wince/browser.css
+++ b/mobile/themes/wince/browser.css
@@ -44,7 +44,6 @@
 #toolbar-main {
   -moz-appearance: none;
   -moz-box-align: center;
-  background: url("chrome://browser/skin/images/toolbar_background.png") repeat-x;
   padding: 0px 10px;
   border: none;
 }
@@ -52,16 +51,21 @@
 toolbarbutton {
   -moz-appearance: none !important;
   -moz-box-orient: vertical;
-  min-width: 0px;
+  min-width: 48px;
+  min-height: 48px;
   /* override default toolbarbutton padding/margin */
   margin: 0;
   padding: 5px;
 }
 
-toolbarbutton:not(.searchengine) .toolbarbutton-text {
+toolbarbutton:not(.show-text) .toolbarbutton-text {
   display: none !important;
 }
 
+toolbarbutton:not(.show-text) .toolbarbutton-icon {
+  -moz-margin-end: 0px;
+}
+
 toolbarbutton:hover,
 toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
@@ -70,53 +74,32 @@ toolbarbutton[open="true"] {
 
 /* main toolbar buttons */
 toolbarbutton.urlbar-button {
-  list-style-image: url("chrome://browser/skin/images/toolbar.png");
-  /* -1px to align backgrounds with endcap */
-  padding: 0px;
-  margin-top: -1px;
-  /* space out the buttons a little bit horizontally */
-  -moz-padding-start: 10px !important;
+  /* space out the buttons a bit horizontally */
+  margin-left: 8px
 }
 
 #tool-bookmarks {
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#tool-bookmarks:hover:active {
-  -moz-image-region: rect(48px 48px 96px 0px);
+  list-style-image: url("chrome://browser/skin/images/bookmarks-24.png");
 }
 
 /* URL bar cap buttons */
 toolbarbutton.urlbar-cap-button {
-  list-style-image: url("chrome://browser/skin/images/toolbar.png");
-  /* position the button near the right edge of the endcap */
-  padding: 0;
-  padding-top: 5px;
-  -moz-padding-start: 24px;
+  margin: 2px;
+  padding: 0px;
+  min-width: 0px;
+  min-height: 0px;
 }
 
 #tool-go {
-  -moz-image-region: rect(0px 72px 24px 48px);
-}
-
-#urlbar-icons:hover:active > #tool-go {
-  -moz-image-region: rect(24px 72px 48px 48px);
+  list-style-image: url("chrome://browser/skin/images/go-16.png");
 }
 
 #tool-reload {
-  -moz-image-region: rect(0px 96px 24px 72px);
-}
-
-#urlbar-icons:hover:active > #tool-reload {
-  -moz-image-region: rect(24px 96px 48px 72px);
+  list-style-image: url("chrome://browser/skin/images/reload-16.png");
 }
 
 #tool-stop {
-  -moz-image-region: rect(0px 120px 24px 96px);
-}
-
-#urlbar-icons:hover:active > #tool-stop {
-  -moz-image-region: rect(24px 120px 48px 96px);
+  list-style-image: url("chrome://browser/skin/images/stop-16.png");
 }
 
 #urlbar-icons[mode="loading"] > #tool-go,
@@ -141,14 +124,49 @@ toolbarbutton.urlbar-cap-button {
   min-height: 60px;
 }
 
+/* creates the left endcap */
 #identity-box {
-  min-height: 49px;
-  min-width: 65px;
-  background: url("images/addressbar_endcap_l_off.png") top right no-repeat;
+  color: #fff;
+  padding: 6px 4px;
+  -moz-border-radius-topleft: 0.5em;
+  -moz-border-radius-bottomleft: 0.5em;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors:#3b3b3b #6d6d6d #535353 #494949;
+  -moz-border-right-colors:#2d2d2d #484848 #484848 #414141;
+  -moz-border-left-colors:#2d2d2d #484848 #484848 #414141;
+  -moz-border-bottom-colors:#111111 #484848 #484848 #414141;
+  background: #414141;
 }
 
 #identity-box:hover:active {
-  background: url("images/addressbar_endcap_l_on.png") top right no-repeat;
+  -moz-border-top-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-right-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-left-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-bottom-colors:#515151 #111111 #272727 #2a2a2a;
+  background-color: #2d2d2d;
+}
+
+/* add special color and extra width */
+#identity-box.verifiedIdentity {
+  min-width: 50px;
+  -moz-border-top-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
+  -moz-border-right-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
+  -moz-border-left-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
+  -moz-border-bottom-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
+  background-color: #77c494;
+}
+
+/* add special color and extra width */
+#identity-box.verifiedDomain {
+  min-width: 50px;
+  -moz-border-top-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
+  -moz-border-right-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
+  -moz-border-left-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
+  -moz-border-bottom-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
+  background-color: #6ca0c9;
 }
 
 /* favicon images are 16x16 */
@@ -157,7 +175,7 @@ toolbarbutton.urlbar-cap-button {
   max-height: 24px;
   min-width: 24px;
   min-height: 24px;
-  margin: 12px 2px 2px 12px;
+  margin: 2px;
 }
 
 #urlbar-throbber[loading] {
@@ -170,207 +188,133 @@ toolbarbutton.urlbar-cap-button {
 }
 
 #urlbar-editarea {
-  min-height: 49px;
   -moz-box-align: center;
-  background: url("images/addressbar_middle.png") repeat-x;
-}
-
-#urlbar-caption {
-  margin: 2px 8px 2px 8px;
+  padding: 4px 4px;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors:#414141 #aaa #dedede #efefef;
+  -moz-border-right-colors:#2d2d2d #dedede #efefef #fafafa;
+  -moz-border-left-colors:#2d2d2d #dedede #efefef #fafafa;
+  -moz-border-bottom-colors:#2d2d2d #fff #fff #fff;
+  background-color: #fff;
 }
 
 #urlbar-edit {
   -moz-appearance: none !important;
   padding: 0px !important;
   border: none !important;
-  background-color: transparent;
+  background-color: #fff;
 }
 
-/* urlbar toolbuttons images are 36x36 */
+/* make sure this endcap matches the other endcap */
 #urlbar-icons {
-  min-height: 49px;
-  min-width: 65px;
-  -moz-box-align: start;
-  padding-top: 6px;
-  background: url("images/addressbar_endcap_r_off.png") no-repeat;
+  color: #fff;
+  padding: 9px 4px;
+  -moz-border-radius-topright: 0.5em;
+  -moz-border-radius-bottomright: 0.5em;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors:#3b3b3b #6d6d6d #535353 #494949;
+  -moz-border-right-colors:#2d2d2d #484848 #484848 #414141;
+  -moz-border-left-colors:#2d2d2d #484848 #484848 #414141;
+  -moz-border-bottom-colors:#111111 #484848 #484848 #414141;
+  background: #414141;
 }
 
 #urlbar-icons:hover:active {
-  background: url("images/addressbar_endcap_r_on.png") no-repeat;
+  -moz-border-top-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-right-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-left-colors:#323232 #111111 #272727 #2a2a2a;
+  -moz-border-bottom-colors:#515151 #111111 #272727 #2a2a2a;
+  background-color: #2d2d2d;
 }
 
 /* right toolbar (browser controls) ---------------------------------------- */
 #browser-controls {
-  background: url("images/right_sidebar_middle.png") repeat-y;
-  /* first 10 pixels in right_sidebar_middle are a gradient */
-  /* end padding must match #toolbar-main */
-  padding: 0 10px;
-  /* ...and right-align so that the buttons line up with
-     the bookmark button in the main toolbar */
   -moz-box-align: end;
-}
-
-toolbarbutton.browser-control-button {
-  list-style-image: url("chrome://browser/skin/images/right_buttons.png");
+  padding: 0px 10px;
 }
 
 toolbarbutton.browser-control-button,
 toolbarbutton.panel-button,
 toolbarbutton.page-button {
   /* space out the buttons a bit vertically */
-  padding: 0;
-  padding-top: 8px;
+  margin-bottom: 8px;
 }
 
 #tool-star {
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#tool-star:hover:active {
-  -moz-image-region: rect(0px 96px 48px 48px);
+  list-style-image: url("chrome://browser/skin/images/bookmarkpage-24.png");
 }
 
 #tool-star[starred="true"] {
-  -moz-image-region: rect(0px 192px 48px 144px);
+  list-style-image: url("chrome://browser/skin/images/bookmarkpage-on-24.png");
 }
 
 #tool-back {
-  -moz-image-region: rect(48px 64px 112px 0px);
-  /* this button is 16px wider than the others, so offset by 8px */
-  -moz-margin-end: -8px;
-}
-
-#tool-back:hover:active {
-  -moz-image-region: rect(48px 128px 112px 64px);
+  list-style-image: url("chrome://browser/skin/images/back-24.png");
 }
 
 #tool-back[disabled="true"] {
-  -moz-image-region: rect(48px 192px 112px 128px) !important;
+  list-style-image: url("chrome://browser/skin/images/back-disabled-24.png");
 }
 
 #tool-forward {
-  -moz-image-region: rect(112px 48px 160px 0px);
-  /* cuddle up underneath the back button */
-  padding-top: 0px;
-}
-
-#tool-forward:hover:active {
-  -moz-image-region: rect(112px 96px 160px 48px);
+  list-style-image: url("chrome://browser/skin/images/forward-24.png");
 }
 
 #tool-forward[disabled="true"] {
-  -moz-image-region: rect(112px 144px 160px 96px) !important;
-}
-
-#tool-actions {
-  -moz-image-region: rect(160px 48px 208px 0px);
-}
-
-#tool-actions:hover:active {
-  -moz-image-region: rect(160px 96px 208px 48px);
-}
-
-toolbarbutton.page-button {
-  list-style-image: url("chrome://browser/skin/images/page_buttons.png");
+  list-style-image: url("chrome://browser/skin/images/forward-disabled-24.png");
 }
 
+/* button is moved off the right edge */
 #tool-panel-open {
-  -moz-image-region: rect(0px 62px 48px 0px);
+  list-style-image: url("chrome://browser/skin/images/settings-24.png");
   margin-right: -14px;
+  /* XXX not sure why we need the padding here, but not in #tool-panel-close */
+  padding-right: 24px;
 }
 
-#tool-panel-open:active {
-  -moz-image-region: rect(0px 124px 48px 62px);
-}
-
+/* button is moved off the left edge */
 #tool-panel-close {
-  -moz-image-region: rect(48px 124px 96px 62px);
+  list-style-image: url("chrome://browser/skin/images/back-24.png");
   margin-left: -14px;
 }
 
-#tool-panel-close:active {
-  -moz-image-region: rect(48px 62px 96px 0px);
-}
-
 /* "extras" panel UI   ----------------------------------------------------- */
 #panel-controls {
   /* match #browser-controls end padding */
   padding: 0px 10px;
 }
 
-#panel-container {
-  background: url("images/panel_background.png") repeat-x;
-}
-
-toolbarbutton.panel-button {
-  list-style-image: url("chrome://browser/skin/images/panel_buttons.png");
-  /* override checked style */
-  background: none !important;
-  border-color: transparent !important;
-}
-
 #tool-addons {
-  -moz-image-region: rect(48px 48px 96px 0px);
-}
-
-#tool-addons:hover:active, #tool-addons[checked] {
-  -moz-image-region: rect(48px 96px 96px 48px);
+  list-style-image: url("chrome://browser/skin/images/addons-24.png");
 }
 
 #tool-downloads {
-  -moz-image-region: rect(96px 48px 144px 0px);
-}
-
-#tool-downloads:hover:active, #tool-downloads[checked] {
-  -moz-image-region: rect(96px 96px 144px 48px);
+  list-style-image: url("chrome://browser/skin/images/downloads-24.png");
 }
 
 #tool-preferences {
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#tool-preferences:hover:active, #tool-preferences[checked] {
-  -moz-image-region: rect(0px 96px 48px 48px);
+  list-style-image: url("chrome://browser/skin/images/preferences-24.png");
 }
 
 /* URL List and autocomplete navigation popup ------------------------------ */
-#tool-bookmarks-close {
-  -moz-image-region: rect(48px 48px 96px 0px);
-}
-
-#tool-bookmarks-close:hover:active {
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#tool-bookmarks-manage {
-  color: rgb(255,255,255);
-  border: 3px groove gray !important;
-  height: 46px;
-  padding-top: 2px;
-  -moz-border-radius: 6px;
-}
-
-#tool-bookmarks-manage .toolbarbutton-text {
-  display: block !important;
-}
-
+#tool-bookmarks-close,
 #tool-folders-close {
-  -moz-image-region: rect(48px 48px 96px 0px);
-}
-
-#tool-folders-close:hover:active {
-  -moz-image-region: rect(0px 48px 48px 0px);
+  list-style-image: url("chrome://browser/skin/images/bookmarks-24.png");
 }
 
 #bookmarklist-container {
-  background-color: rgb(123,125,123);
   padding: 0px;
 }
 
 #bookmarklist-header, #folder-header {
   color: rgb(255,255,255);
   -moz-box-align: center;
-  background: url("chrome://browser/skin/images/toolbar_background.png") repeat-x;
   padding: 0px 10px;
 }
 
@@ -444,7 +388,7 @@ placelabel {
 
 /* use a smaller font size for the manage buttons */
 placeitem .button-text {
-  font-size: 12pt !important;
+  font-size: 9pt !important;
 }
 
 .close-button {
@@ -455,47 +399,31 @@ placeitem .button-text {
   list-style-image: url("chrome://browser/skin/images/folder_close.png");
 }
 
-#popup_autocomplete {
-  background: url(images/navigation_background.png) repeat-x;
-  -moz-appearance: none;
-}
-
-.autocomplete-box {
-  padding: 5px;
-}
-
 .tool-search {
   list-style-image: url("chrome://browser/skin/images/navigation_magnifier.gif");
 }
 
 .searchengine {
   -moz-box-orient: horizontal;
-  color: white;
-}
-.searchengine > .toolbarbutton-text {
-  font-size: 12pt !important;
 }
 
 #autocomplete_navbuttons {
-  -moz-border-image: url(images/navigation_search_caps.png) 0 23 0 23;
-  border-width: 0 23px;
-  margin-top: 10px;
+  margin: 10px;
   min-height: 50px;
 }
 
 .autocomplete-items {
-  overflow: hidden;
-  -moz-border-image: url(images/navigation_url_caps.png) 25 24 25 24 stretch stretch;
-  border-width: 26px 25px;
+  background-color: #fff;
 }
 
 .autocomplete-item,
 .autocomplete-item-selected {
   padding: 5px 2px;
-  color: white;
+  border-bottom: 1px solid rgb(207,207,207);
 }
 
 .autocomplete-item-selected {
+  color: white;
   background-color: grey;
 }
 
@@ -513,7 +441,7 @@ placeitem .button-text {
 
 /* Left sidebar (tabs)  ---------------------------------------------------- */
 #tabs-container {
-  background: url("images/left_sidebar_middle.png") rgb(87,87,87) top right repeat-y;
+  padding-left: 10px;
   min-width: 132px;
 }
 
@@ -548,23 +476,7 @@ vbox:first-child richlistitem[type="documenttab"]:only-child .documenttab-close
 }
 
 #newtab-button {
-  list-style-image: url("images/left_buttons.png");
-  -moz-image-region: rect(0px 48px 48px 0px);
-}
-
-#newtab-button:hover:active {
-  list-style-image: url("images/left_buttons.png");
-  -moz-image-region: rect(0px 96px 48px 48px);
-}
-
-#retrievetab-button {
-  list-style-image: url("images/left_buttons.png");
-  -moz-image-region: rect(48px 48px 96px 0px);
-}
-
-#retrievetab-button:hover:active {
-  list-style-image: url("images/left_buttons.png");
-  -moz-image-region: rect(48px 96px 96px 48px);
+  list-style-image: url("images/newtab-24.png");
 }
 
 /* findbar   --------------------------------------------------------------- */
@@ -572,30 +484,22 @@ findbar {
   background: rgba(128, 128, 128, 0.75);
 }
 
-#findpanel {
-  padding: 0 !important;
-  -moz-appearance: none;
-  background: transparent;
-}
-
 /* bookmark editor   ------------------------------------------------------- */
 #bookmark-container {
-  background-color: rgb(123,125,123);
   padding: 8px;
 }
 
 #bookmark-form {
-  background-color: rgb(207,207,207);
-  border: 2px solid #fff !important;
-  -moz-border-radius: 10px;
+  background-color: #fff;
   padding: 8px;
 }
 
+
 /* Identity popup   -------------------------------------------------------- */
 /* Popup Icons */
 #identity-popup-icon {
-  height: 64px;
-  width: 64px;
+  height: 32px;
+  width: 32px;
   padding: 0;
   list-style-image: url("chrome://browser/skin/images/identity.png");
   -moz-image-region: rect(0px, 64px, 64px, 0px);
@@ -619,36 +523,32 @@ findbar {
   display: none;
 }
 
-#identity-popup-content-box > description,
-#identity-popup-encryption-label {
+#identity-popup-content-box > description {
+  font-size: 9pt !important;
   white-space: pre-wrap;
   -moz-padding-start: 15px;
   margin: 2px 0 4px;
 }
 
 #identity-popup-content-box > label {
+  font-size: 9pt !important;
   white-space: pre-wrap;
   -moz-padding-start: 15px;
   margin: 0;
 }
 
-#identity-popup-content-host ,
-#identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
-  font-size: 1.2em;
-}
-
 #identity-popup-content-host {
   margin-top: 3px;
   margin-bottom: 5px;
   font-weight: bold;
-  max-width: 500px;
+  max-width: 240px;
 }
 
 #identity-popup-content-owner {
   margin-top: 4px;
   margin-bottom: 0 !important;
   font-weight: bold;
-  max-width: 500px;
+  max-width: 240px;
 }
 
 .verifiedDomain > #identity-popup-content-owner {
@@ -689,42 +589,39 @@ findbar {
 }
 
 /* Preferences window   ---------------------------------------------------- */
-#prefs-container {
-  background-color: rgb(123,125,123);
-}
-
+/* XXX should be a richlistitem */
 richpref {
   background-color: white;
   color: black;
 }
 
+/* XXX should be a richlistitem.section-header */
 .prefsection {
-  font-size: 1.5em ! important;
-  color: white;
-  background-color: grey;
-  padding: .2em 0 .2em 0;
+  font-weight: bold;
+  color: #000;
+  background-color: lightgray;
+  padding: 5px;
 }
 
+/* XXX should be a richlistitem */
 .prefbox {
-  padding: .3em .3em .3em .5em;
-  border: thin solid lightgrey;
+  padding: 5px;
+  border-bottom: 1px solid rgb(207,207,207);
+  -moz-box-align: center;
 }
 
+/* XXX should be a richlistitem description.title */
 .preftitle {
-  font-size: 1.25em ! important;
+  font-size: 9pt !important;
 }
 
+/* XXX should be a richlistitem description.normal */
 .prefdesc {
-  font-size: 1em ! important;
+  font-size: 8pt !important;
   color: grey;
   background-color: white;
 }
 
-/* BUG: This rule doesn't actually work; I don't know why. */
-richpref > button {
-  font-size: 1em ! important;
-}
-
 /* Shortcut editor   ------------------------------------------------------- */
 #shortcuts {
   border: 0;
diff --git a/mobile/themes/wince/images/addons-24.png b/mobile/themes/wince/images/addons-24.png
new file mode 100644
index 000000000000..62ff3ff98f19
Binary files /dev/null and b/mobile/themes/wince/images/addons-24.png differ
diff --git a/mobile/themes/wince/images/addressbar_endcap_l_off.png b/mobile/themes/wince/images/addressbar_endcap_l_off.png
deleted file mode 100644
index 84205fa8b69e..000000000000
Binary files a/mobile/themes/wince/images/addressbar_endcap_l_off.png and /dev/null differ
diff --git a/mobile/themes/wince/images/addressbar_endcap_l_on.png b/mobile/themes/wince/images/addressbar_endcap_l_on.png
deleted file mode 100644
index 681bc1646668..000000000000
Binary files a/mobile/themes/wince/images/addressbar_endcap_l_on.png and /dev/null differ
diff --git a/mobile/themes/wince/images/addressbar_endcap_r_off.png b/mobile/themes/wince/images/addressbar_endcap_r_off.png
deleted file mode 100644
index f15a9015cb20..000000000000
Binary files a/mobile/themes/wince/images/addressbar_endcap_r_off.png and /dev/null differ
diff --git a/mobile/themes/wince/images/addressbar_endcap_r_on.png b/mobile/themes/wince/images/addressbar_endcap_r_on.png
deleted file mode 100644
index 11babd6f2e29..000000000000
Binary files a/mobile/themes/wince/images/addressbar_endcap_r_on.png and /dev/null differ
diff --git a/mobile/themes/wince/images/addressbar_middle.png b/mobile/themes/wince/images/addressbar_middle.png
deleted file mode 100644
index df5d78f4b5ae..000000000000
Binary files a/mobile/themes/wince/images/addressbar_middle.png and /dev/null differ
diff --git a/mobile/themes/wince/images/back-24.png b/mobile/themes/wince/images/back-24.png
new file mode 100644
index 000000000000..324818faadec
Binary files /dev/null and b/mobile/themes/wince/images/back-24.png differ
diff --git a/mobile/themes/wince/images/back-disabled-24.png b/mobile/themes/wince/images/back-disabled-24.png
new file mode 100644
index 000000000000..31ef8574aa78
Binary files /dev/null and b/mobile/themes/wince/images/back-disabled-24.png differ
diff --git a/mobile/themes/wince/images/bookmarkpage-24.png b/mobile/themes/wince/images/bookmarkpage-24.png
new file mode 100644
index 000000000000..adf97997b536
Binary files /dev/null and b/mobile/themes/wince/images/bookmarkpage-24.png differ
diff --git a/mobile/themes/wince/images/bookmarkpage-on-24.png b/mobile/themes/wince/images/bookmarkpage-on-24.png
new file mode 100644
index 000000000000..3b732267c347
Binary files /dev/null and b/mobile/themes/wince/images/bookmarkpage-on-24.png differ
diff --git a/mobile/themes/wince/images/bookmarks-24.png b/mobile/themes/wince/images/bookmarks-24.png
new file mode 100644
index 000000000000..08f647ac546d
Binary files /dev/null and b/mobile/themes/wince/images/bookmarks-24.png differ
diff --git a/mobile/themes/wince/images/bookmarks-on-24.png b/mobile/themes/wince/images/bookmarks-on-24.png
new file mode 100644
index 000000000000..2a851eef3ae8
Binary files /dev/null and b/mobile/themes/wince/images/bookmarks-on-24.png differ
diff --git a/mobile/themes/wince/images/downloads-24.png b/mobile/themes/wince/images/downloads-24.png
new file mode 100644
index 000000000000..6546ecd76c57
Binary files /dev/null and b/mobile/themes/wince/images/downloads-24.png differ
diff --git a/mobile/themes/wince/images/forward-24.png b/mobile/themes/wince/images/forward-24.png
new file mode 100644
index 000000000000..9a8a0be219b3
Binary files /dev/null and b/mobile/themes/wince/images/forward-24.png differ
diff --git a/mobile/themes/wince/images/forward-disabled-24.png b/mobile/themes/wince/images/forward-disabled-24.png
new file mode 100644
index 000000000000..d9a8d8e692a4
Binary files /dev/null and b/mobile/themes/wince/images/forward-disabled-24.png differ
diff --git a/mobile/themes/wince/images/go-16.png b/mobile/themes/wince/images/go-16.png
new file mode 100644
index 000000000000..52b2f8cdc0f5
Binary files /dev/null and b/mobile/themes/wince/images/go-16.png differ
diff --git a/mobile/themes/wince/images/left_buttons.png b/mobile/themes/wince/images/left_buttons.png
deleted file mode 100644
index 2edd2545281b..000000000000
Binary files a/mobile/themes/wince/images/left_buttons.png and /dev/null differ
diff --git a/mobile/themes/wince/images/left_sidebar_middle.png b/mobile/themes/wince/images/left_sidebar_middle.png
deleted file mode 100644
index 30b6b0c1e3d0..000000000000
Binary files a/mobile/themes/wince/images/left_sidebar_middle.png and /dev/null differ
diff --git a/mobile/themes/wince/images/navigation_background.png b/mobile/themes/wince/images/navigation_background.png
deleted file mode 100644
index 624fa6c813e9..000000000000
Binary files a/mobile/themes/wince/images/navigation_background.png and /dev/null differ
diff --git a/mobile/themes/wince/images/navigation_search_caps.png b/mobile/themes/wince/images/navigation_search_caps.png
deleted file mode 100644
index 1738b26182f3..000000000000
Binary files a/mobile/themes/wince/images/navigation_search_caps.png and /dev/null differ
diff --git a/mobile/themes/wince/images/navigation_url_caps.png b/mobile/themes/wince/images/navigation_url_caps.png
deleted file mode 100644
index 116648bcc1a9..000000000000
Binary files a/mobile/themes/wince/images/navigation_url_caps.png and /dev/null differ
diff --git a/mobile/themes/wince/images/newtab-24.png b/mobile/themes/wince/images/newtab-24.png
new file mode 100644
index 000000000000..ffb90cf9aa04
Binary files /dev/null and b/mobile/themes/wince/images/newtab-24.png differ
diff --git a/mobile/themes/wince/images/page-starred.png b/mobile/themes/wince/images/page-starred.png
deleted file mode 100644
index 96750448283f..000000000000
Binary files a/mobile/themes/wince/images/page-starred.png and /dev/null differ
diff --git a/mobile/themes/wince/images/page_buttons.png b/mobile/themes/wince/images/page_buttons.png
deleted file mode 100644
index e6f01f751b97..000000000000
Binary files a/mobile/themes/wince/images/page_buttons.png and /dev/null differ
diff --git a/mobile/themes/wince/images/panel_background.png b/mobile/themes/wince/images/panel_background.png
deleted file mode 100644
index 167fa9bbef06..000000000000
Binary files a/mobile/themes/wince/images/panel_background.png and /dev/null differ
diff --git a/mobile/themes/wince/images/panel_buttons.png b/mobile/themes/wince/images/panel_buttons.png
deleted file mode 100644
index ffaf0b8aef70..000000000000
Binary files a/mobile/themes/wince/images/panel_buttons.png and /dev/null differ
diff --git a/mobile/themes/wince/images/preferences-24.png b/mobile/themes/wince/images/preferences-24.png
new file mode 100644
index 000000000000..4092c25de32a
Binary files /dev/null and b/mobile/themes/wince/images/preferences-24.png differ
diff --git a/mobile/themes/wince/images/reload-16.png b/mobile/themes/wince/images/reload-16.png
new file mode 100644
index 000000000000..8d04966c2448
Binary files /dev/null and b/mobile/themes/wince/images/reload-16.png differ
diff --git a/mobile/themes/wince/images/right_buttons.png b/mobile/themes/wince/images/right_buttons.png
deleted file mode 100644
index 61f99f2184d9..000000000000
Binary files a/mobile/themes/wince/images/right_buttons.png and /dev/null differ
diff --git a/mobile/themes/wince/images/right_sidebar_middle.png b/mobile/themes/wince/images/right_sidebar_middle.png
deleted file mode 100644
index e98332a1fa7f..000000000000
Binary files a/mobile/themes/wince/images/right_sidebar_middle.png and /dev/null differ
diff --git a/mobile/themes/wince/images/settings-24.png b/mobile/themes/wince/images/settings-24.png
new file mode 100644
index 000000000000..f909ecc15531
Binary files /dev/null and b/mobile/themes/wince/images/settings-24.png differ
diff --git a/mobile/themes/wince/images/stop-16.png b/mobile/themes/wince/images/stop-16.png
new file mode 100644
index 000000000000..81d0d1a2fc01
Binary files /dev/null and b/mobile/themes/wince/images/stop-16.png differ
diff --git a/mobile/themes/wince/images/toolbar.png b/mobile/themes/wince/images/toolbar.png
deleted file mode 100644
index 8ec894fc3aef..000000000000
Binary files a/mobile/themes/wince/images/toolbar.png and /dev/null differ
diff --git a/mobile/themes/wince/images/toolbar_background.png b/mobile/themes/wince/images/toolbar_background.png
deleted file mode 100644
index bc0c8473d324..000000000000
Binary files a/mobile/themes/wince/images/toolbar_background.png and /dev/null differ
diff --git a/mobile/themes/wince/jar.mn b/mobile/themes/wince/jar.mn
index 280fa859a8e1..c1cbe236d048 100644
--- a/mobile/themes/wince/jar.mn
+++ b/mobile/themes/wince/jar.mn
@@ -15,26 +15,23 @@ classic.jar:
   images/default-favicon.png           (images/default-favicon.png)
   images/identity.png                  (images/identity.png)
   images/starred48.png                 (images/starred48.png)
-  images/page-starred.png              (images/page-starred.png)
   images/tag.png                       (images/tag.png)
   images/throbber.png                  (images/throbber.png)
-  images/toolbar.png                   (images/toolbar.png)
-  images/toolbar_background.png        (images/toolbar_background.png)
-  images/addressbar_endcap_r_off.png   (images/addressbar_endcap_r_off.png)
-  images/addressbar_endcap_l_off.png   (images/addressbar_endcap_l_off.png)
-  images/addressbar_endcap_r_on.png    (images/addressbar_endcap_r_on.png)
-  images/addressbar_endcap_l_on.png    (images/addressbar_endcap_l_on.png)
-  images/addressbar_middle.png         (images/addressbar_middle.png)
-  images/left_sidebar_middle.png       (images/left_sidebar_middle.png)
-  images/left_buttons.png              (images/left_buttons.png)
-  images/right_sidebar_middle.png      (images/right_sidebar_middle.png)
-  images/right_buttons.png             (images/right_buttons.png)
-  images/panel_buttons.png             (images/panel_buttons.png)
-  images/panel_background.png          (images/panel_background.png)
-  images/navigation_url_caps.png       (images/navigation_url_caps.png)
-  images/navigation_background.png     (images/navigation_background.png)
-  images/navigation_search_caps.png    (images/navigation_search_caps.png)
   images/navigation_magnifier.gif      (images/navigation_magnifier.gif)
-  images/page_buttons.png              (images/page_buttons.png)
   images/folder.png                    (images/folder.png)
   images/folder_close.png              (images/folder_close.png)
+  images/addons-24.png                 (images/addons-24.png)
+  images/downloads-24.png              (images/downloads-24.png)
+  images/preferences-24.png            (images/preferences-24.png)
+  images/settings-24.png               (images/settings-24.png)
+  images/back-24.png                   (images/back-24.png)
+  images/back-disabled-24.png          (images/back-disabled-24.png)
+  images/forward-24.png                (images/forward-24.png)
+  images/forward-disabled-24.png       (images/forward-disabled-24.png)
+  images/bookmarkpage-24.png           (images/bookmarkpage-24.png)
+  images/bookmarkpage-on-24.png        (images/bookmarkpage-on-24.png)
+  images/bookmarks-24.png              (images/bookmarks-24.png)
+  images/stop-16.png                   (images/stop-16.png)
+  images/reload-16.png                 (images/reload-16.png)
+  images/go-16.png                     (images/go-16.png)
+  images/newtab-24.png                 (images/newtab-24.png)
diff --git a/mobile/themes/wince/platform.css b/mobile/themes/wince/platform.css
index 6671f36b4deb..39b7ac9762ef 100644
--- a/mobile/themes/wince/platform.css
+++ b/mobile/themes/wince/platform.css
@@ -38,18 +38,169 @@
 /* global skin ------------------------------------------------------------- */
 @import url(chrome://global/skin/);
 
+/* panels ------------------------------------------------------------------ */
+.panel-dark {
+  background-color: #414141;
+}
+
+/* dialog popups ----------------------------------------------------------- */
+.dialog-dark {
+  color: #fff;
+  background-color: #414141;
+  -moz-border-radius: 0px 0px 8px 8px;
+  padding: 8px;
+  -moz-box-shadow: black 0px 4px 4px;
+}
+
+/* buttons ----------------------------------------------------------------- */
+.button-text,
+.toolbarbutton-text {
+  font-weight: bold !important;
+  font-size: 9pt !important;
+}
+
+button {
+  color: #414141;
+  padding: 0px 4px;
+  -moz-border-radius: 0.5em;
+  border-top: 4px solid #aaa;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #ccc;
+  -moz-border-top-colors: #888 #fff #fcfcfc #f8f8f8;
+  -moz-border-right-colors: #888 #c3c3c3 #dddddd #e9e9e9;
+  -moz-border-left-colors: #888 #c3c3c3 #dddddd #e9e9e9;
+  -moz-border-bottom-colors: #888 #c3c3c3 #dddddd #e9e9e9;
+  background-color: #efefef;
+}
+
+button[disabled="true"] {
+  -moz-appearance: none;
+  color: #ccc;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors: #ccc #fff #fff #fff;
+  -moz-border-right-colors: #ccc #dedede #efefef #fafafa;
+  -moz-border-left-colors: #ccc #dedede #efefef #fafafa;
+  -moz-border-bottom-colors: #ccc #dedede #efefef #fafafa;
+  background-color: #fff;
+}
+
+/* XXX needs to be updated */
+button:active {
+  padding: 0px 4px;
+  border-top: 8px solid #ccc;
+  border-left: 8px solid #ccc;
+  border-right: 8px solid #ccc;
+  border-bottom: 8px solid #aaa;
+  -moz-border-top-colors: #aaa #bbb #ccc #ddd;
+  -moz-border-right-colors: #aaa #bbb #ccc #ddd;
+  -moz-border-left-colors: #aaa #bbb #ccc #ddd;
+  -moz-border-bottom-colors: #aaa #bbb #ccc #ddd;
+  background-color: #ddd;
+}
+
+/* dark buttons ------------------------------------------------------------ */
+.button-dark {
+  color: #fff;
+  padding: 4px 8px;
+  -moz-border-radius: 0.5em;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors: #3b3b3b #6d6d6d #535353 #494949;
+  -moz-border-right-colors: #2d2d2d #484848 #484848 #414141;
+  -moz-border-left-colors: #2d2d2d #484848 #484848 #414141;
+  -moz-border-bottom-colors: #111111 #484848 #484848 #414141;
+  background-color: #414141;
+}
+
+.button-dark:active {
+  padding: 0px 4px;
+  border-top: 8px solid #ccc;
+  border-left: 8px solid #ccc;
+  border-right: 8px solid #ccc;
+  border-bottom: 8px solid #aaa;
+  -moz-border-top-colors:#323232 #111111 #111111 #1f1f1f #272727 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-right-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-left-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-bottom-colors:#515151 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  background-color: #2d2d2d;
+}
+
+.button-dark[disabled="true"],
+.button-dark[disabled="true"]:active {
+  color: #ccc;
+  padding: 4px 8px;
+  background-color: #414141;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors: #3b3b3b #6d6d6d #535353 #494949;
+  -moz-border-right-colors: #3b3b3b #484848 #484848 #414141;
+  -moz-border-left-colors: #3b3b3b #484848 #484848 #414141;
+  -moz-border-bottom-colors: #2d2d2d #484848 #484848 #414141;
+}
+
+.button-dark[checked="true"] {
+  /* checked overrides */
+  background: none !important;
+  border-color: transparent !important;
+  padding: 0px 4px !important;
+  background-color: #2d2d2d !important;
+
+  border-top: 8px solid #ccc;
+  border-left: 8px solid #ccc;
+  border-right: 8px solid #ccc;
+  border-bottom: 8px solid #aaa;
+  -moz-border-top-colors:#323232 #111111 #111111 #1f1f1f #272727 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-right-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-left-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  -moz-border-bottom-colors:#515151 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+}
+
 /* re-theme radio buttons */
 radiogroup {
   -moz-box-orient: horizontal;
 }
 
+.radio-label {
+  font-weight: bold !important;
+  font-size: 9pt !important;
+}
+
 radio {
-  border: 1px solid #000;
-  border-left: none;
+  color: #414141;
+  padding: 0px 12px 0px 8px;
   margin: 0px;
-  padding: 6px;
+  border-top: 4px solid #ccc;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #aaa;
+  -moz-border-top-colors: #aaa #fff #fff #fff;
+  -moz-border-right-colors: #aaa #dedede #efefef #fafafa;
+  -moz-border-left-colors: #aaa #dedede #efefef #fafafa;
+  -moz-border-bottom-colors: #aaa #dedede #efefef #fafafa;
   -moz-box-align: center;
   -moz-appearance: none;
+  background-color: #fff;
+}
+
+radio[selected] {
+  padding: 0px 8px 0px 12px;
+  border-top: 4px solid #aaa;
+  border-left: 4px solid #ccc;
+  border-right: 4px solid #ccc;
+  border-bottom: 4px solid #ccc;
+  -moz-border-top-colors:#aaa #bbb #ccc #ddd;
+  -moz-border-left-colors:#aaa #bbb #ccc #ddd;
+  -moz-border-bottom-colors:#aaa #bbb #ccc #ddd;
+  -moz-border-right-colors:#aaa #bbb #ccc #ddd;
+  background-color: #ddd;
 }
 
 radio .radio-check-box1, .radio-check {
@@ -57,17 +208,11 @@ radio .radio-check-box1, .radio-check {
 }
 
 radio:first-child {
-  border-left: 1px solid #000;
-  -moz-border-radius-topleft: 8px;
-  -moz-border-radius-bottomleft: 8px;
+  -moz-border-radius-topleft: 0.5em;
+  -moz-border-radius-bottomleft: 0.5em;
 }
 
 radio:last-child {
-  -moz-border-radius-topright: 8px;
-  -moz-border-radius-bottomright: 8px;
-}
-
-radio[selected] {
-  color: #000;
-  background: gray;
+  -moz-border-radius-topright: 0.5em;
+  -moz-border-radius-bottomright: 0.5em;
 }