diff --git a/mozilla/browser/themes/pinstripe/browser/Search-bar.png b/mozilla/browser/themes/pinstripe/browser/Search-bar.png
new file mode 100644
index 00000000000..d32ef3d14bf
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/Search-bar.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/Secure-Glyph-White.png b/mozilla/browser/themes/pinstripe/browser/Secure-Glyph-White.png
new file mode 100644
index 00000000000..a14aea4a015
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/Secure-Glyph-White.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/Toolbar.png b/mozilla/browser/themes/pinstripe/browser/Toolbar.png
index e798328ed32..bb1921857ad 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/Toolbar.png and b/mozilla/browser/themes/pinstripe/browser/Toolbar.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/bookmark_toolbar_background-inactive.png b/mozilla/browser/themes/pinstripe/browser/bookmark_toolbar_background-inactive.png
new file mode 100644
index 00000000000..786373b1ad6
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/bookmark_toolbar_background-inactive.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/browser.css b/mozilla/browser/themes/pinstripe/browser/browser.css
index dd5fe70e74d..c17eeaa8e65 100755
--- a/mozilla/browser/themes/pinstripe/browser/browser.css
+++ b/mozilla/browser/themes/pinstripe/browser/browser.css
@@ -25,6 +25,7 @@
  *   Kevin Gerich (kevin@kmgerich.com)
  *   Pamela Greene (pamg.bugs@gmail.com)
  *   Dao Gottwald (dao@design-noir.de)
+ *   Stephen Horlander (stephen@noved.org)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -51,7 +52,7 @@
 }
 
 #main-window[chromehidden~="toolbar"][chromehidden~="location"][chromehidden~="directories"] {
-  border-top: 1px solid #606060;
+  border-top: 1px solid rgba(0,0,0,0.65);
 }
 
 /* ----- SEARCH FIELD ----- */
@@ -64,9 +65,9 @@
 
 #PersonalToolbar {
   background: url("chrome://browser/skin/bookmark_toolbar_background.gif") repeat-x center center;
-  border-top: 1px solid #DDDDDD;
+  border-top: 1px solid rgba(255,255,255,0.25);
   border-bottom: 2px solid;
-  -moz-border-bottom-colors: #404040 #9D9D9D;
+  -moz-border-bottom-colors: rgba(0,0,0,0.35) transparent;
   padding: 2px 0;
 }
 
@@ -78,7 +79,7 @@
 }
 
 .query-item[container] {
-  list-style-image: url("chrome://browser/skin/places/query.png");
+  list-style-image: url("chrome://browser/skin/places/history.png");
 }
 
 toolbarbutton.bookmark-item:hover
@@ -255,6 +256,11 @@ toolbarpaletteitem[place="toolbar"] .places-toolbar-items {
   -moz-box-orient: vertical;
 }
 
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
+}
+
 toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-text {
   margin: 4px;
 }
@@ -336,7 +342,7 @@ toolbar[mode="icons"] #forward-button .toolbarbutton-text-box,
 /* ----- DEFAULT BACK/FORWARD BUTTONS ----- */
 
 toolbar[mode="icons"] #back-button {
-  -moz-image-region: rect(0px, 548px, 39px, 504px) !important;
+  -moz-image-region: rect(0px, 539px, 33px, 504px) !important;
   -moz-margin-end: 0 !important;
   -moz-padding-end: 0 !important;
   border-left: none !important;
@@ -344,16 +350,16 @@ toolbar[mode="icons"] #back-button {
 }
 
 toolbar[mode="icons"] #back-button[disabled="true"] {
- -moz-image-region: rect(39px, 548px, 78px, 504px) !important;
+ -moz-image-region: rect(33px, 539px, 66px, 504px) !important;
 }
 
 toolbar[mode="icons"] #back-button:hover:active:not([disabled]),
 toolbar[mode="icons"] #back-button[open="true"] {
-  -moz-image-region: rect(78px, 548px, 117px, 504px) !important;
+  -moz-image-region: rect(66px, 539px, 99px, 504px) !important;
 }
 
 toolbar[mode="icons"] #forward-button {
-  -moz-image-region: rect(0px, 576px, 39px, 548px) !important;
+  -moz-image-region: rect(0px, 566px, 33px, 539px) !important;
   -moz-margin-start: 0 !important;
   -moz-margin-end: 0 !important;
   -moz-padding-start: 0 !important;
@@ -363,16 +369,16 @@ toolbar[mode="icons"] #forward-button {
 }
 
 toolbar[mode="icons"] #forward-button[disabled="true"] {
- -moz-image-region: rect(39px, 576px, 78px, 548px) !important;
+ -moz-image-region: rect(33px, 566px, 66px, 539px) !important;
 }
 
 toolbar[mode="icons"] #forward-button:hover:active:not([disabled]),
 toolbar[mode="icons"] #forward-button[open="true"] {
-  -moz-image-region: rect(78px, 576px, 117px, 548px) !important;
+  -moz-image-region: rect(66px, 566px, 99px, 539px) !important;
 }
 
 toolbar[mode="icons"] #back-forward-dropmarker {
-  -moz-image-region: rect(0px, 590px, 39px, 576px) !important;
+  -moz-image-region: rect(0px, 582px, 33px, 566px) !important;
   -moz-margin-start: 0 !important;
   -moz-margin-end: 3px !important;
   -moz-padding-start: 0 !important;
@@ -392,18 +398,18 @@ toolbar[mode="icons"] #back-forward-dropmarker > dropmarker {
 }
 
 toolbar[mode="icons"] #back-forward-dropmarker[disabled="true"] {
- -moz-image-region: rect(39px, 590px, 78px, 576px) !important;
+ -moz-image-region: rect(33px, 582px, 66px, 566px) !important;
 }
 
 toolbar[mode="icons"] #back-forward-dropmarker:hover:active:not([disabled]),
 toolbar[mode="icons"] #back-forward-dropmarker[open="true"] {
-  -moz-image-region: rect(78px, 590px, 117px, 576px) !important;
+  -moz-image-region: rect(0px, 582px, 33px, 566px) !important;
 }
 
 /* ----- SMALL BACK BUTTON, PAIRED----- */	
 
 toolbar[iconsize="small"][mode="icons"] #back-button {
-  -moz-image-region: rect(0px, 623px, 23px, 590px) !important;
+  -moz-image-region: rect(0px, 616px, 23px, 582px) !important;
   -moz-margin-end: 0 !important;
   -moz-padding-end: 0 !important;
   border-left: none !important;
@@ -411,44 +417,44 @@ toolbar[iconsize="small"][mode="icons"] #back-button {
 }
 
 toolbar[iconsize="small"][mode="icons"] #back-button[disabled="true"] {
- -moz-image-region: rect(23px, 623px, 46px, 590px) !important;
+  -moz-image-region: rect(23px, 616px, 46px, 582px) !important;
 }
 
 toolbar[iconsize="small"][mode="icons"] #back-button:hover:active:not([disabled]),
 toolbar[iconsize="small"][mode="icons"] #back-button[open="true"] {
-  -moz-image-region: rect(46px, 623px, 69px, 590px) !important;
+  -moz-image-region: rect(46px, 616px, 69px, 582px) !important;
 }
 
 /* ----- SMALL FORWARD BUTTON, PAIRED ----- */	
 
 toolbar[iconsize="small"][mode="icons"] #forward-button {
-  -moz-image-region: rect(0px, 657px, 23px, 623px) !important;
+  -moz-image-region: rect(0px, 649px, 23px, 616px) !important;
   -moz-margin-start: 0 !important;
   -moz-padding-start: 0 !important;
   border-left: none !important;
   border-right: none !important;
 }
 toolbar[iconsize="small"][mode="icons"] #forward-button[disabled="true"] {
- -moz-image-region: rect(23px, 657px, 46px, 623px) !important;
+ -moz-image-region: rect(23px, 649px, 46px, 616px) !important;
 }
 toolbar[iconsize="small"][mode="icons"] #forward-button:hover:active:not([disabled]),
 toolbar[iconsize="small"][mode="icons"] #forward-button[open="true"] {
-  -moz-image-region: rect(46px, 657px, 69px, 623px) !important;
+  -moz-image-region: rect(46px, 649px, 69px, 616px) !important;
 }
 
 /* ----- SMALL BACK/FORWARD DROPMARKER ----- */	
 
 toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker {
-  -moz-image-region: rect(0px, 672px, 23px, 657px) !important;
+  -moz-image-region: rect(0px, 664px, 23px, 649px) !important;
 }
 
 toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[disabled="true"] {
- -moz-image-region: rect(23px, 672px, 46px, 657px) !important;
+ -moz-image-region: rect(23px, 664px, 46px, 649px) !important;
 }
 
 toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:hover:active:not([disabled]),
 toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[open="true"] {
-  -moz-image-region: rect(46px, 672px, 69px, 657px) !important;
+  -moz-image-region: rect(46px, 664px, 69px, 649px) !important;
 }
 
 /* ----- DEFAULT RELOAD BUTTON ----- */	
@@ -713,6 +719,7 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[open="true"] {
 
 #PopupAutoCompleteRichResult {
   direction: ltr !important;
+  margin-top: -2px;
 }
 
 /* ----- PAGE PROXY ICON ----- */
@@ -812,21 +819,42 @@ statusbarpanel#statusbar-display {
   -moz-image-region: rect(0px, 16px, 16px, 0px);  
 }
 
+#go-button:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);  
+}
+
+#go-button:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);  
+}
+
 /* STAR BUTTON */
 #star-button {
   padding: 1px;
-  list-style-image: url("chrome://browser/skin/places/starPage.png");
+  list-style-image: url("chrome://browser/skin/places/star-icons.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);  
+}
+
+#star-button:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);  
+}
+
+#star-button:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);  
 }
 
 #star-button[starred="true"] {
-  list-style-image: url("chrome://browser/skin/places/pageStarred.png");
+  -moz-image-region: rect(16px, 16px, 32px, 0px);  
+}
+
+#star-button:hover[starred="true"] {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);  
+}
+
+#star-button:hover:active[starred="true"] {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);  
 }
 
 /* BOOKMARKING PANEL */
-#editBookmarkPanel {
-  padding: 4px;
-}
-
 #editBookmarkPanelStarIcon {
   list-style-image: url("chrome://browser/skin/places/starred48.png");
   width: 48px;
@@ -837,10 +865,325 @@ statusbarpanel#statusbar-display {
   list-style-image: url("chrome://browser/skin/places/unstarred48.png");
 }
 
-#editBookmarkPanelTitle {
-  font-size: 130%;
+#editBookmarkPanel {
+  -moz-appearance: none;
+  background-color: rgba(68,68,68,0.9);
+  border: 1px solid rgba(255,255,255,0.15);
+  -moz-border-radius: 8px;
+  -moz-border-radius-topright: 0px ;
+  padding: 10px 8px 6px 8px;
+  margin-top: 4px;
+  color: #ffffff;
 }
 
+#editBookmarkPanelTitle {
+  font-size: 130%;
+  font-weight: bold;
+  margin: 8px 12px 0px 9px;
+}
+
+#editBookmarkPanel > hbox {
+ padding-right: 1px;
+}
+
+/**** HUD style buttons ****/
+
+#editBookmarkPanel > hbox > vbox > hbox > button,
+#editBookmarkPanel > #editBookmarkPanelBottomButtons > button {
+  -moz-appearance: none;
+  background: url("chrome://browser/skin/hud-style-button-middle-background.png") repeat-x #464646 center center;
+  border-width: 3px;
+  border-style: solid;
+  -moz-border-radius: 20px;
+  -moz-border-top-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  -moz-border-right-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  -moz-border-bottom-colors: rgba(128,128,128,0.35) rgba(0,0,0,0.5) rgba(255,255,255,0.15);
+  -moz-border-left-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  padding: 0 9px;
+  margin: 6px;
+  min-width: 79px;
+  min-height: 22px;
+  color: #ffffff;
+}
+
+#editBookmarkPanel > hbox > vbox > hbox > button:hover:active,
+#editBookmarkPanel > #editBookmarkPanelBottomButtons > button:hover:active {
+  background-color: #86888B;
+}
+
+#editBookmarkPanel > hbox > vbox > hbox > button:focus,
+#editBookmarkPanel > #editBookmarkPanelBottomButtons > button:focus {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 100%;
+}
+
+#editBookmarkPanel > #editBookmarkPanelBottomButtons > button[default="true"] {
+  background-color: #222;
+}
+
+#editBookmarkPanel > #editBookmarkPanelContent {
+  margin-top: 6px;
+}
+
+#editBookmarkPanel #editBMPanel_newFolderBox {
+  background-image: url("chrome://browser/skin/hud-style-new-folder-bar-background.png");
+  background-repeat: repeat-x;
+  border: 0;
+  border-width: 1px 0 1px 0;
+  border-style: solid;
+  border-top-color: #212121;
+  border-bottom-color: #212121;
+  padding: 0;
+  margin: 0;
+  -moz-margin-start: -8px;
+  -moz-margin-end: -8px;
+  margin-bottom: 8px !important;
+  height:  20px;
+}
+
+#editBookmarkPanel #editBMPanel_newFolderButton {
+  -moz-appearance: none;
+  background-color: transparent !important;
+  border-width: 0 3px 0 0;
+  border-style: solid;
+  -moz-border-right-colors: rgba(255,255,255,0.15) rgba(0,0,0,0.5) rgba(255,255,255,0.15);
+  padding: 0 9px;
+  margin: 0;
+  min-width: 21px;
+  min-height: 20px;
+  height:  20px;
+  color: #ffffff;
+  list-style-image: url("chrome://browser/skin/hud-style-new-folder-plus-sign.png") !important;
+}
+
+#editBookmarkPanel #editBMPanel_newFolderButton:hover:active {
+  background-color: #86888B;
+}
+
+#editBookmarkPanel #editBMPanel_newFolderButton:focus {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 1px;
+}
+
+#editBookmarkPanel #editBMPanel_newFolderButton .button-text {
+  display: none !important;
+}
+
+#editBookmarkPanel #editBMPanel_folderMenuList {
+  -moz-appearance: none;
+  background: url("chrome://browser/skin/hud-style-button-middle-background.png") repeat-x #464646 center center;
+  border: 3px solid;
+  -moz-border-radius: 5px;
+  -moz-border-top-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  -moz-border-right-colors: rgba(53,53,53,1) rgba(53,53,53,1) rgba(162,162,162,1);
+  -moz-border-bottom-colors: rgba(128,128,128,0.35) rgba(0,0,0,0.5) rgba(255,255,255,0.15);
+  -moz-border-left-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  margin: 0 3px !important;
+  min-height: 22px;
+  -moz-padding-start: 2px;
+  color: #ffffff !important;
+}
+
+#editBookmarkPanel #editBMPanel_folderMenuList:focus {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 5px;
+}
+
+#editBookmarkPanel #editBMPanel_folderMenuList[open="true"],
+#editBookmarkPanel #editBMPanel_folderMenuList:hover:active {
+  background-image: url("chrome://browser/skin/hud-style-button-middle-background-active.png");
+}
+
+#editBookmarkPanel #editBMPanel_folderMenuList > .menulist-dropmarker {
+  -moz-appearance: none;
+  display: -moz-box;
+  background-color: transparent;
+  border: 0;
+  margin: 0;
+  padding: 0;
+}
+
+#editBookmarkPanel #editBMPanel_folderMenuList > .menulist-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://browser/skin/hud-style-dropmarker-double-arrows.png");
+}
+
+/**** folder tree ****/
+
+#editBookmarkPanel #editBMPanel_folderTree {
+  background-color: #333333;
+  border-top: 2px solid !important;
+  border-right: 0 !important;
+  border-bottom: 0 !important;
+  border-left: 0 !important;
+  -moz-border-top-colors: rgba(0,0,0,0.35) rgba(255,255,255,0.15);
+  margin: 0px;
+  -moz-margin-start: -8px;
+  -moz-margin-end: -8px;
+  color: #ffffff !important;
+}
+
+#editBookmarkPanel #editBMPanel_folderTree:focus {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 1px;
+}
+
+#editBookmarkPanel #editBMPanel_tagsSelector {
+  -moz-appearance: none;
+  background-color: #333333;
+  border-top: 2px solid !important;
+  border-right: 0 !important;
+  border-bottom: 2px solid !important;
+  border-left: 0 !important;
+  -moz-border-top-colors: rgba(0,0,0,0.35) rgba(255,255,255,0.15);
+  -moz-border-bottom-colors: rgba(255,255,255,0.30) rgba(0,0,0,0.35) ;
+  margin: 6px -8px !important;
+  color: #ffffff !important;
+}
+
+#editBookmarkPanel #editBMPanel_tagsSelector:focus {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 1px;
+}
+
+#editBookmarkPanel #editBMPanel_tagsSelector .listcell-check {
+  -moz-appearance: none !important;
+  background-color: transparent;
+  border: 0;
+  list-style-image: url("chrome://browser/skin/hud-style-check-box-empty.png");
+  min-height: 14px;
+  min-width: 14px;
+}
+
+#editBookmarkPanel #editBMPanel_tagsSelector .listcell-check[checked="true"] {
+  list-style-image: url("chrome://browser/skin/hud-style-check-box-checked.png");
+}
+
+#editBMPanel_folderTree treechildren::-moz-tree-row {
+  color: #ffffff !important;
+  background-color: transparent !important;
+  border: none !important;
+}
+
+#editBMPanel_folderTree treechildren::-moz-tree-row(selected) {
+  background-color: #b3b3b3 !important;
+}
+
+#editBMPanel_folderTree treechildren::-moz-tree-cell-text(selected),
+#editBMPanel_folderTree treechildren::-moz-tree-cell-text(selected, focus) {
+  color: #222222 !important;
+}
+
+#editBMPanel_folderTree treechildren::-moz-tree-row(selected, focus) {
+  background-color: #b3b3b3 !important;
+}
+
+#editBookmarkPanel #editBMPanel_tagsSelector > listitem[selected="true"] {
+  color: #222222;
+  background-color: #b3b3b3;
+}
+
+/**** expanders ****/
+
+#editBookmarkPanel .expander-up,
+#editBookmarkPanel .expander-down {
+  -moz-appearance: none;
+  background: url("chrome://browser/skin/hud-style-button-middle-background.png") repeat-x #464646 center center;
+  border: 3px solid;
+  -moz-border-radius: 5px;
+  -moz-border-top-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  -moz-border-right-colors: rgba(53,53,53,1) rgba(53,53,53,1) rgba(162,162,162,1);
+  -moz-border-bottom-colors: rgba(128,128,128,0.35) rgba(0,0,0,0.5) rgba(255,255,255,0.15);
+  -moz-border-left-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  -moz-margin-start: 4px;
+  -moz-margin-end: 2px;
+  padding: 0 0 0 4px;
+  min-width: 10px;
+  min-height: 22px;
+  color: #ffffff !important;
+}
+
+#editBookmarkPanel .expander-up:focus,
+#editBookmarkPanel .expander-down:focus {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 5px;
+}
+
+#editBookmarkPanel .expander-up {
+  list-style-image: url("chrome://browser/skin/hud-style-expander-open.png") !important;
+}
+
+#editBookmarkPanel .expander-down {
+  list-style-image: url("chrome://browser/skin/hud-style-expander-closed.png") !important;
+}
+
+#editBookmarkPanel .expander-down:hover:active {
+  list-style-image: url("chrome://browser/skin/hud-style-expander-open.png") !important;
+  background-image: url("chrome://browser/skin/hud-style-button-middle-background-active.png") !important;
+  background-repeat: repeat-x !important;
+}
+
+#editBookmarkPanel .expander-up:hover:active {
+  list-style-image: url("chrome://browser/skin/hud-style-expander-closed.png") !important;
+  background-image: url("chrome://browser/skin/hud-style-button-middle-background-active.png") !important;
+  background-repeat: repeat-x !important;
+}
+
+
+/**** name picker ****/
+
+#editBookmarkPanel #editBMPanel_namePicker[droppable="false"] {
+  color: #ffffff !important;
+}
+
+#editBookmarkPanel #editBMPanel_namePicker[droppable="false"] > .menulist-dropmarker {
+  display: none;
+}
+
+#editBookmarkPanel #editBMPanel_tagsField,
+#editBookmarkPanel #editBMPanel_namePicker[droppable="false"] > .menulist-editable-box {
+  -moz-appearance: none !important;
+  cursor: text;
+  margin: 2px 4px;
+  border: 2px solid;
+  -moz-border-top-colors: #1c1c1c #545454 ;
+  -moz-border-right-colors: #1c1c1c #636363;
+  -moz-border-bottom-colors: #1c1c1c #797979;
+  -moz-border-left-colors: #1c1c1c #636363;
+  -moz-border-radius: 1px;
+  padding: 0;
+  background-color: #666666;
+  color: #ffffff;
+}
+
+#editBookmarkPanel #editBMPanel_tagsField[focused="true"],
+#editBookmarkPanel #editBMPanel_namePicker[droppable="false"][focused="true"] > .menulist-editable-box {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -1px;
+  -moz-outline-radius: 1px;
+}
+
+#editBookmarkPanel #editBMPanel_namePicker[droppable="false"][disabled="true"] > .menulist-editable-box {
+  color: #ffffff;
+}
+
+#editBookmarkPanel #editBMPanel_namePicker[droppable="false"] > .menulist-editable-box > html|*.menulist-editable-input {
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+  background-color: inherit;
+  color: #ffffff !important;
+  font: inherit;
+}
+
+#editBookmarkPanel > #editBookmarkPanelContent > #editBookmarkPanelGrid > rows > row > label {
+  text-align: right;
+}
 
 /* ----- SIDEBAR ELEMENTS ----- */
 
@@ -936,14 +1279,14 @@ sidebarheader > .tabs-closebutton > .toolbarbutton-text {
 }
 
 #feed-button[feeds] {
-  list-style-image: url("chrome://browser/skin/livemark-item.png");
-  -moz-image-region: rect(0px, 36px, 18px, 18px);
+  list-style-image: url("chrome://browser/skin/feed-icons.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 #feed-button[feeds]:hover {
-  -moz-image-region: rect(18px, 36px, 36px, 18px);
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 #feed-button[feeds]:active {
-  -moz-image-region: rect(54px, 36px, 72px, 18px);
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
 /* ----- THROBBER ----- */
@@ -989,7 +1332,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 #nav-bar {
   background-color: #9B9B9B;
   border-top: none;
-  border-bottom: 1px solid #404040;
+  border-bottom: 1px solid rgba(0,0,0,0.35);
   background-image: url("chrome://global/skin/toolbar/toolbar-background.gif");
   background-repeat: repeat-x;
   background-position: top right;
@@ -998,8 +1341,8 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 #nav-bar[collapsed="true"] + toolbar[customindex] {
  border-top: 2px solid;
- -moz-border-top-colors: #606060 #C7C7C7;
-}
+ -moz-border-top-colors: rgba(0,0,0,0.35) rgba(255,255,255,0.45);
+} 
 
 .bookmark-item {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
@@ -1120,6 +1463,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 .tabbrowser-strip {
   margin-top: -1px;
   border-bottom: 1px solid #404040;
+  background-color: #9B9B9B;
 }
 
 .tabbrowser-tabs {
@@ -1237,17 +1581,23 @@ tabbrowser > tabbox > tabpanels {
 
 .tabs-alltabs-box {
   margin: 0;
-  width: 27px;
-  background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-bkgnd.png");
-  background-repeat: no-repeat;
-  list-style-image: none;
+  width: 25px;
 }
 
 .tabs-alltabs-button {
-  margin: 2px 0px 3px 0px;
+  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png");
+  border-left: 2px solid;
+  -moz-border-left-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
+  margin: 0;
   padding-left: 0;
   padding-right: 0;
-  border: none;
+}
+.tabs-alltabs-button:hover {
+  background-color: rgba(0,0,0,0.10);
+}
+.tabs-alltabs-button:hover:active,
+.tabs-alltabs-button[open="true"] {
+  background-color: rgba(0,0,0,0.20);
 }
 
 .tabs-alltabs-button  > .toolbarbutton-menu-dropmarker {
@@ -1478,7 +1828,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #identity-popup-content-box > description,
 #identity-popup-encryption-label {
   white-space: pre-wrap;
-  color: black;
+  color: #ffffff;
   padding-left: 15px;
   margin: 2px 0 4px;
 }
@@ -1512,21 +1862,57 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
   margin-top: 10px;
-  margin-left: -18px;
+  margin-left: -24px;
 }
 
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon {
-  list-style-image: url("chrome://browser/skin/Secure.png");
-  -moz-image-region: rect(0px, 18px, 18px, 0px);
+  margin-top: 5px;
+  list-style-image: url("chrome://browser/skin/Secure-Glyph-White.png");
 }
 
 /* Popup Bounding Box */
-#identity-popup-container {
-  background-image: none;
-  background-color: white;
+#identity-popup {
+  -moz-appearance: none;
+  background-color: rgba(68,68,68,0.9);
+  border: 1px solid rgba(255,255,255,0.15);
+  -moz-border-radius: 8px;
+  -moz-border-radius-topleft: 0px;
+  padding: 10px 8px 6px 8px;
+  margin-top: -3px;
+  -moz-margin-start: 11px;
+  color:  #ffffff;
   min-width: 280px;
-  padding: 10px;
+}
+
+#identity-popup-container {
+  -moz-appearance: none;
+  color:  #ffffff;
+}
+
+/* Popup Buttons */
+#identity-popup-more-info-button {
+  -moz-appearance: none;
+  background: url("chrome://browser/skin/hud-style-button-middle-background.png") repeat-x #464646 center center;
+  border: 3px solid;
+  -moz-border-radius: 5px;
+  -moz-border-top-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  -moz-border-right-colors: rgba(53,53,53,1) rgba(53,53,53,1) rgba(162,162,162,1);
+  -moz-border-bottom-colors: rgba(128,128,128,0.35) rgba(0,0,0,0.5) rgba(255,255,255,0.15);
+  -moz-border-left-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4);
+  -moz-border-radius: 20px;
+  padding: 1px 9px;
+  margin: 6px;
+  min-height: 0px;
+  color:  #ffffff;	
+}
+
+#identity-popup-more-info-button > .button-box > .button-text {
+  margin: 0 !important;
+}
+
+#identity-popup-more-info-button:hover:active {
+  background-color: #86888B;
 }
 
 #download-monitor {
diff --git a/mozilla/browser/themes/pinstripe/browser/feed-icons.png b/mozilla/browser/themes/pinstripe/browser/feed-icons.png
new file mode 100644
index 00000000000..c27ec500ac3
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/feed-icons.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/feeds/feedIcon.png b/mozilla/browser/themes/pinstripe/browser/feeds/feedIcon.png
index 4d153046432..236b5f82106 100755
Binary files a/mozilla/browser/themes/pinstripe/browser/feeds/feedIcon.png and b/mozilla/browser/themes/pinstripe/browser/feeds/feedIcon.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-button-middle-background.png b/mozilla/browser/themes/pinstripe/browser/hud-style-button-middle-background.png
new file mode 100644
index 00000000000..d3ce59b19fe
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-button-middle-background.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-check-box-checked.png b/mozilla/browser/themes/pinstripe/browser/hud-style-check-box-checked.png
new file mode 100644
index 00000000000..d1a81fbd323
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-check-box-checked.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-check-box-empty.png b/mozilla/browser/themes/pinstripe/browser/hud-style-check-box-empty.png
new file mode 100644
index 00000000000..77156c06031
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-check-box-empty.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-dropmarker-double-arrows.png b/mozilla/browser/themes/pinstripe/browser/hud-style-dropmarker-double-arrows.png
new file mode 100644
index 00000000000..ecf5ee24eb6
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-dropmarker-double-arrows.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-expander-closed.png b/mozilla/browser/themes/pinstripe/browser/hud-style-expander-closed.png
new file mode 100644
index 00000000000..25219fea225
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-expander-closed.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-expander-open.png b/mozilla/browser/themes/pinstripe/browser/hud-style-expander-open.png
new file mode 100644
index 00000000000..168b53a5e8b
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-expander-open.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background-active.png b/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background-active.png
new file mode 100644
index 00000000000..1a7ed7d2281
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background-active.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background.gif b/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background.gif
new file mode 100644
index 00000000000..509b0be0a02
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background.gif differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background.png b/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background.png
new file mode 100644
index 00000000000..1a6ee66f65f
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-bar-background.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-plus-sign.png b/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-plus-sign.png
new file mode 100644
index 00000000000..5d3e60d3e84
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/hud-style-new-folder-plus-sign.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/jar.mn b/mozilla/browser/themes/pinstripe/browser/jar.mn
index 0b85fe432be..0935a926211 100644
--- a/mozilla/browser/themes/pinstripe/browser/jar.mn
+++ b/mozilla/browser/themes/pinstripe/browser/jar.mn
@@ -1,6 +1,7 @@
 classic.jar:
 % skin browser classic/1.0 %skin/classic/browser/
   skin/classic/browser/bookmark_toolbar_background.gif
+  skin/classic/browser/bookmark_toolbar_background-inactive.png
   skin/classic/browser/bookmark-open-left.png
   skin/classic/browser/bookmark-open-mid.png
   skin/classic/browser/bookmark-open-right.png
@@ -9,10 +10,21 @@ classic.jar:
   skin/classic/browser/contextDialogBackground.png
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/expander-round.png 
+  skin/classic/browser/feed-icons.png
   skin/classic/browser/find.png
   skin/classic/browser/find-bar-background.png
   skin/classic/browser/Go-arrow.png
   skin/classic/browser/home.png
+  skin/classic/browser/hud-style-button-middle-background.png
+  skin/classic/browser/hud-style-check-box-checked.png
+  skin/classic/browser/hud-style-check-box-empty.png
+  skin/classic/browser/hud-style-dropmarker-double-arrows.png
+  skin/classic/browser/hud-style-expander-closed.png
+  skin/classic/browser/hud-style-expander-open.png
+  skin/classic/browser/hud-style-new-folder-bar-background-active.png
+  skin/classic/browser/hud-style-new-folder-bar-background.gif
+  skin/classic/browser/hud-style-new-folder-bar-background.png
+  skin/classic/browser/hud-style-new-folder-plus-sign.png
   skin/classic/browser/identity.png
   skin/classic/browser/Info.png
   skin/classic/browser/page-livemarks.png
@@ -23,9 +35,11 @@ classic.jar:
   skin/classic/browser/searchbar.css
   skin/classic/browser/Search.png
   skin/classic/browser/Search-addengines.png
+  skin/classic/browser/Search-bar.png
   skin/classic/browser/search-bar-background-left.png
   skin/classic/browser/search-bar-background-mid.png
   skin/classic/browser/search-bar-background-right.png
+  skin/classic/browser/Secure-Glyph-White.png
   skin/classic/browser/Secure.png
   skin/classic/browser/Security-broken.png
   skin/classic/browser/Secure-statusbar.png
@@ -39,7 +53,7 @@ classic.jar:
   skin/classic/browser/feeds/videoFeedIcon16.png            (feeds/videoFeedIcon16.png)
   skin/classic/browser/feeds/audioFeedIcon.png              (feeds/audioFeedIcon.png)
   skin/classic/browser/feeds/audioFeedIcon16.png            (feeds/audioFeedIcon16.png)
-  skin/classic/browser/radio-selected-bg.gif
+  skin/classic/browser/radio-selected-bg.png
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
@@ -50,6 +64,18 @@ classic.jar:
   skin/classic/browser/places/livemarkItem.png              (places/livemarkItem.png)
   skin/classic/browser/places/bookmarksMenu.png             (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png          (places/bookmarksToolbar.png)
+  skin/classic/browser/places/expander-closed-active.png    (places/expander-closed-active.png)
+  skin/classic/browser/places/expander-closed.png           (places/expander-closed.png)
+  skin/classic/browser/places/expander-open-active.png      (places/expander-open-active.png)
+  skin/classic/browser/places/expander-open.png             (places/expander-open.png)
+  skin/classic/browser/places/history.png                   (places/history.png)
+  skin/classic/browser/places/menubutton-end-pressed.png    (places/menubutton-end-pressed.png)
+  skin/classic/browser/places/menubutton-mid-pressed.png    (places/menubutton-mid-pressed.png)
+  skin/classic/browser/places/menubutton-start-pressed.png  (places/menubutton-start-pressed.png)
+  skin/classic/browser/places/star-icons.png                (places/star-icons.png)
+  skin/classic/browser/places/toolbar-button-backup.png     (places/toolbar-button-backup.png)
+  skin/classic/browser/places/toolbar-button-organize.png   (places/toolbar-button-organize.png)
+  skin/classic/browser/places/toolbar-button-view.png       (places/toolbar-button-view.png)
   skin/classic/browser/places/toolbarDropMarker.png         (places/toolbarDropMarker.png)
   skin/classic/browser/places/folderDropArrow.png           (places/folderDropArrow.png)
   skin/classic/browser/places/infoPaneGrippy.png            (places/infoPaneGrippy.png)
@@ -88,6 +114,7 @@ classic.jar:
   skin/classic/browser/preferences/preferences.css          (preferences/preferences.css)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd.png                  (tabbrowser/alltabs-box-bkgnd.png)
+  skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png             (tabbrowser/alltabs-box-bkgnd-icon.png)
   skin/classic/browser/tabbrowser/alltabs-box-overflow-bkgnd.png         (tabbrowser/alltabs-box-overflow-bkgnd.png)
   skin/classic/browser/tabbrowser/alltabs-box-overflow-bkgnd-animate.png (tabbrowser/alltabs-box-overflow-bkgnd-animate.png)
   skin/classic/browser/tabbrowser/tab-arrow-start.png                    (tabbrowser/tab-arrow-start.png)
@@ -101,12 +128,15 @@ classic.jar:
   skin/classic/browser/tabbrowser/tab-left.png                           (tabbrowser/tab-left.png)
   skin/classic/browser/tabbrowser/tab-left-bkgnd.png                     (tabbrowser/tab-left-bkgnd.png)
   skin/classic/browser/tabbrowser/tab-left-hover.png                     (tabbrowser/tab-left-hover.png)
+  skin/classic/browser/tabbrowser/tab-left-inactive.png                  (tabbrowser/tab-left-inactive.png)
   skin/classic/browser/tabbrowser/tab-middle.png                         (tabbrowser/tab-middle.png)
   skin/classic/browser/tabbrowser/tab-middle-bkgnd.png                   (tabbrowser/tab-middle-bkgnd.png)
   skin/classic/browser/tabbrowser/tab-middle-hover.png                   (tabbrowser/tab-middle-hover.png)
+  skin/classic/browser/tabbrowser/tab-middle-inactive.png                (tabbrowser/tab-middle-inactive.png)
   skin/classic/browser/tabbrowser/tab-right.png                          (tabbrowser/tab-right.png)
   skin/classic/browser/tabbrowser/tab-right-bkgnd.png                    (tabbrowser/tab-right-bkgnd.png)
   skin/classic/browser/tabbrowser/tab-right-hover.png                    (tabbrowser/tab-right-hover.png)
+  skin/classic/browser/tabbrowser/tab-right-inactive.png                 (tabbrowser/tab-right-inactive.png)
   skin/classic/browser/tabbrowser/tabs-bottom-bg.png                     (tabbrowser/tabs-bottom-bg.png)
   skin/classic/browser/urlbar/endcap.png                                 (urlbar/endcap.png)
   skin/classic/browser/urlbar/endcap-focused.png                         (urlbar/endcap-focused.png)
diff --git a/mozilla/browser/themes/pinstripe/browser/pageInfo.css b/mozilla/browser/themes/pinstripe/browser/pageInfo.css
index e0c854796c4..7ff62f42592 100644
--- a/mozilla/browser/themes/pinstripe/browser/pageInfo.css
+++ b/mozilla/browser/themes/pinstripe/browser/pageInfo.css
@@ -48,7 +48,7 @@
   display: -moz-box;
   background-color: #969696;
   border-bottom: 1px solid #404040;
-  background-image: url("chrome://global/skin/toolbar/toolbar-background-tall.gif");
+  background-image: url("chrome://global/skin/toolbar/toolbar-background.gif");
   background-repeat: repeat-x;
   background-position: top right;
   padding: 4px 0 8px;
diff --git a/mozilla/browser/themes/pinstripe/browser/places/back-forward.png b/mozilla/browser/themes/pinstripe/browser/places/back-forward.png
index d37e20db843..ae33de5934a 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/places/back-forward.png and b/mozilla/browser/themes/pinstripe/browser/places/back-forward.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/bookmarksMenu.png b/mozilla/browser/themes/pinstripe/browser/places/bookmarksMenu.png
index 0c1a1e9471d..c27bd6a6fe5 100755
Binary files a/mozilla/browser/themes/pinstripe/browser/places/bookmarksMenu.png and b/mozilla/browser/themes/pinstripe/browser/places/bookmarksMenu.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/bookmarksToolbar.png b/mozilla/browser/themes/pinstripe/browser/places/bookmarksToolbar.png
index 33f9a22eb83..f89101f6039 100755
Binary files a/mozilla/browser/themes/pinstripe/browser/places/bookmarksToolbar.png and b/mozilla/browser/themes/pinstripe/browser/places/bookmarksToolbar.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/history.png b/mozilla/browser/themes/pinstripe/browser/places/history.png
new file mode 100755
index 00000000000..0918714221c
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/places/history.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/menubutton-end-pressed.png b/mozilla/browser/themes/pinstripe/browser/places/menubutton-end-pressed.png
new file mode 100644
index 00000000000..ec7d722dd12
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/places/menubutton-end-pressed.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/menubutton-end.png b/mozilla/browser/themes/pinstripe/browser/places/menubutton-end.png
index fe3b0a3a696..a885c9c7e3e 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/places/menubutton-end.png and b/mozilla/browser/themes/pinstripe/browser/places/menubutton-end.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/menubutton-mid-pressed.png b/mozilla/browser/themes/pinstripe/browser/places/menubutton-mid-pressed.png
new file mode 100644
index 00000000000..8441993ed05
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/places/menubutton-mid-pressed.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/menubutton-mid.png b/mozilla/browser/themes/pinstripe/browser/places/menubutton-mid.png
index 67120354086..62c2b3f7ec4 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/places/menubutton-mid.png and b/mozilla/browser/themes/pinstripe/browser/places/menubutton-mid.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/menubutton-start-pressed.png b/mozilla/browser/themes/pinstripe/browser/places/menubutton-start-pressed.png
new file mode 100644
index 00000000000..9793ec83b1f
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/places/menubutton-start-pressed.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/menubutton-start.png b/mozilla/browser/themes/pinstripe/browser/places/menubutton-start.png
index 6dec24b452d..9f374ba6272 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/places/menubutton-start.png and b/mozilla/browser/themes/pinstripe/browser/places/menubutton-start.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/organizer.css b/mozilla/browser/themes/pinstripe/browser/places/organizer.css
index 30610e20fb1..13cbb2a8b60 100644
--- a/mozilla/browser/themes/pinstripe/browser/places/organizer.css
+++ b/mozilla/browser/themes/pinstripe/browser/places/organizer.css
@@ -58,12 +58,11 @@
   background-image: none !important;       
 } 
 
-
 /* back button */
 
 #back-button {
   list-style-image: url("chrome://browser/skin/places/back-forward.png");
-  -moz-image-region: rect(0px, 27px, 23px, 0px);
+  -moz-image-region: rect(0px, 34px, 23px, 0px);
   -moz-margin-end: 0;
   -moz-padding-end: 0;
   border-left: none;
@@ -71,13 +70,13 @@
 }
 
 #back-button[disabled="true"] {
- -moz-image-region: rect(23px, 27px, 46px, 0px) !important;
+ -moz-image-region: rect(23px, 34px, 46px, 0px) !important;
 }
 
 #back-button:hover:active,
 #back-button[buttondown="true"],
 #back-button[open="true"] {
-  -moz-image-region: rect(46px, 27px, 69px, 0px);
+  -moz-image-region: rect(46px, 34px, 69px, 0px);
 }
 
 #back-button > .toolbarbutton-text,
@@ -89,7 +88,7 @@
 
 #forward-button {
   list-style-image: url("chrome://browser/skin/places/back-forward.png");
-  -moz-image-region: rect(0px, 53px, 23px, 27px);
+  -moz-image-region: rect(0px, 67px, 23px, 34px);
   -moz-margin-start: 0;
   -moz-margin-end: 8px;
   -moz-padding-start: 0;
@@ -98,20 +97,23 @@
 }
 
 #forward-button[disabled="true"] {
- -moz-image-region: rect(23px, 53px, 46px, 27px) !important;
+ -moz-image-region: rect(23px, 67px, 46px, 34px) !important;
 }
 
 #forward-button:hover:active,
 #forward-button[buttondown="true"],
 #forward-button[open="true"] {
-  -moz-image-region: rect(46px, 53px, 69px, 27px);
+  -moz-image-region: rect(46px, 67px, 69px, 34px);
 }
 
 #placesToolbar > toolbarbutton[type="menu"] {
   -moz-margin-start: 5px;
-  -moz-padding-end: 6px;
+  -moz-padding-end: 10px;
   background: url("chrome://browser/skin/places/menubutton-end.png") center right no-repeat;
 }
+#placesToolbar > toolbarbutton[type="menu"][open="true"] {
+  background: url("chrome://browser/skin/places/menubutton-end-pressed.png") center right no-repeat;
+}
 
 #placesToolbar > toolbarbutton[type="menu"] > menupopup {
   -moz-margin-start: 2px;
@@ -120,31 +122,35 @@
 
 #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-icon {
   background: url("chrome://browser/skin/places/menubutton-start.png") center left no-repeat;
-  padding: 4px 2px;
+  padding: 3px 4px 4px 10px;
   height: 23px;
 }
+#placesToolbar > toolbarbutton[type="menu"][open="true"] > .toolbarbutton-icon {
+  background: url("chrome://browser/skin/places/menubutton-start-pressed.png") center left no-repeat;
+}
 
 #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-text {
-  background: url("chrome://browser/skin/places/menubutton-mid.png") center left repeat-x;
-  height: 23px;
-  margin: 0;
-  padding: 4px;
+  display:  none;
 }
 
 #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://browser/skin/places/folderDropArrow.png");
+  padding: 0;
 }
 
 /* organize button */
 #organizeButton {
+  list-style-image: url("chrome://browser/skin/places/toolbar-button-organize.png");
 }
 
 /* view button */
 #viewMenu {
+  list-style-image: url("chrome://browser/skin/places/toolbar-button-view.png");
 }
 
 /* maintenance button */
 #maintenanceButton {
+  list-style-image: url("chrome://browser/skin/places/toolbar-button-backup.png");
 }
 
 /* Root View */
@@ -206,6 +212,21 @@
   padding-top: 1px;
 }
 
+#placeContent treechildren::-moz-tree-row(odd) {
+  background-color: #edf3fe;
+}
+
+#placeContent treechildren::-moz-tree-row(selected),
+#placeContent treechildren::-moz-tree-row(odd, selected) {
+  background-color: -moz-mac-secondaryhighlight;
+}
+
+#placeContent treechildren::-moz-tree-row(selected, focus), 
+#placeContent treechildren::-moz-tree-row(odd, selected, focus) {
+  background-color: Highlight;
+  color: HighlightText !important;
+}
+
 #placeContent treechildren::-moz-tree-cell,
 #placeContent treechildren::-moz-tree-column {
   border-right: 1px solid #d7dad7;
@@ -265,13 +286,19 @@
   -moz-border-bottom-colors: #C2C2C2 #A4A4A4 -moz-Field;
   -moz-border-right-colors: #969696 #C5C5C5 -moz-Field;
   -moz-border-left-colors: #969696 #C5C5C5 -moz-Field;
-  -moz-border-radius: 11.5px;
+  -moz-border-radius: 12px;
   background: url("chrome://global/skin/icons/search-textbox.png") -moz-Field no-repeat 1px center;
-  -moz-background-clip: padding !important;
+  -moz-background-clip: border !important;
   padding: 0;
   -moz-padding-start: 14px;
 }
 
+#searchFilter[focused="true"] {
+  outline: 2px solid #4F8EC9;
+  -moz-outline-radius: 12px;
+  -moz-outline-offset: -2px;
+}
+
 #searchFilter > .textbox-input-box {
   padding: 2px;
   border-left: 2px solid transparent;
@@ -418,6 +445,21 @@ menulist[open="true"] > .menulist-label-box  .menulist-label {
   margin: 0px !important;
   padding:  0px !important;
 }
+#editBMPanel_namePicker[droppable="false"] > .menulist-editable-box {
+  -moz-appearance: textfield;
+  cursor: text;
+  margin: 4px 4px;
+  border: 3px solid;
+  -moz-border-top-colors: transparent #888888 #000000;
+  -moz-border-right-colors: transparent #FFFFFF #000000;
+  -moz-border-bottom-colors: transparent #FFFFFF #000000;
+  -moz-border-left-colors: transparent #888888 #000000;
+  -moz-border-radius-topright: 2px;
+  -moz-border-radius-bottomleft: 2px;
+  padding: 0;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
 
 #saveSearch {
   -moz-appearance: none;
@@ -533,6 +575,7 @@ menulist[open="true"] > .menulist-label-box  .menulist-label {
   background: url("chrome://browser/skin/places/minus-active.png") no-repeat left center;
 }
 
+%endif
 
 /**** expanders ****/
 
@@ -559,7 +602,6 @@ menulist[open="true"] > .menulist-label-box  .menulist-label {
 .expander-up:hover:active {
   list-style-image: url("chrome://browser/skin/places/expander-open-active.png") !important;
 }
-%endif
 
 .no-margin-button {
   min-width:0em;
@@ -570,6 +612,7 @@ menulist[open="true"] > .menulist-label-box  .menulist-label {
  */
 
 /* More/Less button */
+
 #infoScrollboxExpander {
   list-style-image: url("chrome://browser/skin/places/twisty-open.gif");
   -moz-appearance: none;
diff --git a/mozilla/browser/themes/pinstripe/browser/places/query.png b/mozilla/browser/themes/pinstripe/browser/places/query.png
index 0918714221c..0ccb8470256 100755
Binary files a/mozilla/browser/themes/pinstripe/browser/places/query.png and b/mozilla/browser/themes/pinstripe/browser/places/query.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/star-icons.png b/mozilla/browser/themes/pinstripe/browser/places/star-icons.png
new file mode 100644
index 00000000000..19ae80a16c6
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/places/star-icons.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/starred48.png b/mozilla/browser/themes/pinstripe/browser/places/starred48.png
index 8940b57596c..873d63ccf20 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/places/starred48.png and b/mozilla/browser/themes/pinstripe/browser/places/starred48.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-backup.png b/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-backup.png
new file mode 100644
index 00000000000..0b463b4715b
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-backup.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-organize.png b/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-organize.png
new file mode 100644
index 00000000000..57f4477366d
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-organize.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-view.png b/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-view.png
new file mode 100644
index 00000000000..ad30157df7b
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/places/toolbar-button-view.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/preferences/Options.png b/mozilla/browser/themes/pinstripe/browser/preferences/Options.png
index 4d650ff3c55..b0584324816 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/preferences/Options.png and b/mozilla/browser/themes/pinstripe/browser/preferences/Options.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css b/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
index 2fd0b9a7984..37a6360ca04 100644
--- a/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -61,7 +61,7 @@
   padding: 0 5px 2px 5px;
   background-color: #999;
   border-bottom: 1px solid #404040;
-  background-image: url("chrome://global/skin/toolbar/toolbar-background-tall.gif");
+  background-image: url("chrome://global/skin/toolbar/toolbar-background-tall.png");
   background-repeat: repeat-x;
   background-position: top right;
   margin: 0;
@@ -90,7 +90,7 @@
 }
 
 radio[pane][selected="true"] {
-    background: url("chrome://browser/skin/radio-selected-bg.gif") repeat-x center center;
+    background: url("chrome://browser/skin/radio-selected-bg.png") repeat-x center center;
     -moz-border-left-colors: #6a6a6a #868686;
     -moz-border-right-colors: #6a6a6a #868686;    
 }
diff --git a/mozilla/browser/themes/pinstripe/browser/radio-selected-bg.png b/mozilla/browser/themes/pinstripe/browser/radio-selected-bg.png
new file mode 100644
index 00000000000..aa4b345c74b
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/radio-selected-bg.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd-icon.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd-icon.png
new file mode 100644
index 00000000000..1d997635c1d
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd-icon.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd.png
index a97badc1058..d0b203cc6ee 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd.png and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/alltabs-box-bkgnd.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left-bkgnd.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left-bkgnd.png
index 616987db206..0dc3b51b62e 100755
Binary files a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left-bkgnd.png and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left-bkgnd.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left-inactive.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left-inactive.png
new file mode 100644
index 00000000000..56dbbed4581
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left-inactive.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left.png
index 8acba611ea6..128a879c263 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left.png and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-left.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle-bkgnd.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle-bkgnd.png
index 855a91cfbdd..0178363e662 100755
Binary files a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle-bkgnd.png and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle-bkgnd.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle-inactive.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle-inactive.png
new file mode 100644
index 00000000000..500cabe51d0
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle-inactive.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png
index 3a05b85e0aa..10b990b4832 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png
index cbc79133bae..8a1410bcbad 100755
Binary files a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right-inactive.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right-inactive.png
new file mode 100644
index 00000000000..62063ef3ac1
Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right-inactive.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right.png
index c7337c90d96..b2a6b5a47c0 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right.png and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tab-right.png differ
diff --git a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png
index 2c4259f495a..1f80c83e76a 100644
Binary files a/mozilla/browser/themes/pinstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png and b/mozilla/browser/themes/pinstripe/browser/tabbrowser/tabbrowser-tabs-bkgnd.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/global/dirListing/remote.png b/mozilla/toolkit/themes/pinstripe/global/dirListing/remote.png
index 4febb764bd8..85d931ddaa5 100755
Binary files a/mozilla/toolkit/themes/pinstripe/global/dirListing/remote.png and b/mozilla/toolkit/themes/pinstripe/global/dirListing/remote.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/global/findBar.css b/mozilla/toolkit/themes/pinstripe/global/findBar.css
index dad16f16d0a..df262d5e876 100644
--- a/mozilla/toolkit/themes/pinstripe/global/findBar.css
+++ b/mozilla/toolkit/themes/pinstripe/global/findBar.css
@@ -98,7 +98,7 @@ findbar > checkbox > .checkbox-label-box > .checkbox-label {
   -moz-border-left-colors: #7F7F7F #EFEFEF -moz-Field;
   -moz-border-radius: 11.5px;
   background: url("chrome://global/skin/icons/search-textbox.png") -moz-Field no-repeat 1px center;
-  -moz-background-clip: padding !important;
+  -moz-background-clip: border !important;
   padding: 0 8px;
   -moz-padding-start: 17px;
 }
diff --git a/mozilla/toolkit/themes/pinstripe/global/globalBindings.xml b/mozilla/toolkit/themes/pinstripe/global/globalBindings.xml
index 45124504b4b..885f8bbfd10 100644
--- a/mozilla/toolkit/themes/pinstripe/global/globalBindings.xml
+++ b/mozilla/toolkit/themes/pinstripe/global/globalBindings.xml
@@ -50,7 +50,7 @@
              closebuttonaccesskey="&preferencesCloseButton.accesskey;"
              role="dialog"
              title="&preferencesDefaultTitleMac.title;"
-             titlebarcolor="#C9C9C9">
+             titlebarcolor="#bbbbbb">
       <xul:radiogroup anonid="selector" orient="horizontal" class="paneSelector chromeclass-toolbar"
                       role="listbox"/> <!-- Expose to accessibility APIs as a listbox -->
       <xul:hbox flex="1" class="paneDeckContainer">
diff --git a/mozilla/toolkit/themes/pinstripe/global/jar.mn b/mozilla/toolkit/themes/pinstripe/global/jar.mn
index e9f977d8dc0..0fd46288444 100644
--- a/mozilla/toolkit/themes/pinstripe/global/jar.mn
+++ b/mozilla/toolkit/themes/pinstripe/global/jar.mn
@@ -43,6 +43,7 @@ classic.jar:
 +  skin/classic/global/spinbuttons.css
 +  skin/classic/global/splitter.css
 +  skin/classic/global/statusbar-background.gif
++  skin/classic/global/statusbar-background-inactive.gif
 +  skin/classic/global/tabbox.css
 +  skin/classic/global/textbox.css
 +  skin/classic/global/datetimepicker.css
@@ -174,7 +175,9 @@ classic.jar:
 +  skin/classic/global/toolbar/dropmark-nav-small.png                 (toolbar/dropmark-nav-small.png)
 +  skin/classic/global/toolbar/spring.gif                             (toolbar/spring.gif)
 +  skin/classic/global/toolbar/toolbar-background.gif                 (toolbar/toolbar-background.gif)
-+  skin/classic/global/toolbar/toolbar-background-tall.gif            (toolbar/toolbar-background-tall.gif)
++  skin/classic/global/toolbar/toolbar-background-inactive.png        (toolbar/toolbar-background-inactive.png)
++  skin/classic/global/toolbar/toolbar-background-tall.png            (toolbar/toolbar-background-tall.png)
++  skin/classic/global/toolbar/toolbar-background-tall-inactive.png   (toolbar/toolbar-background-tall-inactive.png)
 +  skin/classic/global/toolbar/toolbar-pinstripe-overlay.png          (toolbar/toolbar-pinstripe-overlay.png)
 +  skin/classic/global/toolbar/toolbar-separator.png                  (toolbar/toolbar-separator.png)
 +  skin/classic/global/toolbar/toolbarbutton-customhover-left.png     (toolbar/toolbarbutton-customhover-left.png)
@@ -187,4 +190,3 @@ classic.jar:
 +  skin/classic/global/tree/item-grayscale.png                        (tree/item-grayscale.png)
 +  skin/classic/global/tree/sort-asc.gif                              (tree/sort-asc.gif)
 +  skin/classic/global/tree/sort-dsc.gif                              (tree/sort-dsc.gif)
-
diff --git a/mozilla/toolkit/themes/pinstripe/global/statusbar-background-inactive.gif b/mozilla/toolkit/themes/pinstripe/global/statusbar-background-inactive.gif
new file mode 100644
index 00000000000..40c3220e0a5
Binary files /dev/null and b/mozilla/toolkit/themes/pinstripe/global/statusbar-background-inactive.gif differ
diff --git a/mozilla/toolkit/themes/pinstripe/global/textbox.css b/mozilla/toolkit/themes/pinstripe/global/textbox.css
index 01c7339106b..1904bd51817 100644
--- a/mozilla/toolkit/themes/pinstripe/global/textbox.css
+++ b/mozilla/toolkit/themes/pinstripe/global/textbox.css
@@ -127,7 +127,7 @@ textbox.plain {
   -moz-border-left-colors: #7F7F7F #EFEFEF -moz-Field;
   -moz-border-radius: 11px;
   background: url("chrome://global/skin/icons/search-textbox.png") -moz-Field no-repeat 1px center;
-  -moz-background-clip: padding !important;
+  -moz-background-clip: border !important;
   padding: 0 8px;
   -moz-padding-start: 17px;
 }
diff --git a/mozilla/toolkit/themes/pinstripe/global/toolbar.css b/mozilla/toolkit/themes/pinstripe/global/toolbar.css
index e3fbb17a95a..b8edf0b0169 100644
--- a/mozilla/toolkit/themes/pinstripe/global/toolbar.css
+++ b/mozilla/toolkit/themes/pinstripe/global/toolbar.css
@@ -55,9 +55,9 @@ toolbarpalette {
   min-width: 1px;
   min-height: 20px !important;
   color: #000000;
-  border-top: 1px solid #C7C7C7;
-  border-bottom: 1px solid #404040;
-  background-color: #A1A1A1;
+  border-top: 1px solid rgba(255,255,255,0.45);
+  border-bottom: 1px solid rgba(0,0,0,0.35);
+  background-color: #9C9C9C;
 }
 
 menubar {
diff --git a/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-inactive.png b/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-inactive.png
new file mode 100644
index 00000000000..a4751e7a673
Binary files /dev/null and b/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-inactive.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-tall-inactive.png b/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-tall-inactive.png
new file mode 100644
index 00000000000..a211130db04
Binary files /dev/null and b/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-tall-inactive.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-tall.png b/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-tall.png
new file mode 100644
index 00000000000..f0a221a54b8
Binary files /dev/null and b/mozilla/toolkit/themes/pinstripe/global/toolbar/toolbar-background-tall.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/downloads/buttons.png b/mozilla/toolkit/themes/pinstripe/mozapps/downloads/buttons.png
index 9e1ee629ef7..04da26a2524 100644
Binary files a/mozilla/toolkit/themes/pinstripe/mozapps/downloads/buttons.png and b/mozilla/toolkit/themes/pinstripe/mozapps/downloads/buttons.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/downloads/downloads.css b/mozilla/toolkit/themes/pinstripe/mozapps/downloads/downloads.css
index e3e47330dbc..671d63981de 100644
--- a/mozilla/toolkit/themes/pinstripe/mozapps/downloads/downloads.css
+++ b/mozilla/toolkit/themes/pinstripe/mozapps/downloads/downloads.css
@@ -49,19 +49,46 @@ richlistitem[type="download"] button {
   list-style-image: url(chrome://mozapps/skin/downloads/buttons.png);
 }
 .cancel {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-.pause {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-.pause[disabled="true"] {
-  -moz-image-region: rect(16px, 48px, 16px, 32px);
-}
-.resume {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
+.cancel:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+.cancel:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+.pause {
+  -moz-image-region: rect(48px, 16px, 64px, 0px);
+}
+.pause:hover {
+  -moz-image-region: rect(48px, 32px, 64px, 16px);
+}
+.pause:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px, 48px, 64px, 32px);
+}
+.pause[disabled="true"] {
+  -moz-image-region: rect(48px, 16px, 64px, 0px);
+}
+
+.resume {
+  -moz-image-region: rect(16px, 16px, 32px, 0px);
+}
+.resume:hover {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+.resume:hover:active {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+
 .retry {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
+  -moz-image-region: rect(32px, 16px, 48px, 0px);
+}
+.retry:hover {
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
+}
+.retry:hover:active {
+  -moz-image-region: rect(32px, 48px, 48px, 32px);
 }
 
 .blockedIcon {
@@ -91,7 +118,13 @@ richlistitem[type="download"] button {
   -moz-border-left-colors: #969696 #C5C5C5 -moz-Field;
   -moz-border-radius: 11.5px;
   background: url("chrome://global/skin/icons/search-textbox.png") -moz-Field no-repeat 1px center;
-  -moz-background-clip: padding !important;
+  -moz-background-clip: border !important;
   padding: 0 8px;
   -moz-padding-start: 16px;
 }
+
+#searchbox[focused="true"] {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 100%;
+}
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensionItem.png b/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensionItem.png
index a13c4ca7dd0..a86d0070049 100644
Binary files a/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensionItem.png and b/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensionItem.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensions.css b/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
index 06f24579590..4c9414ec565 100644
--- a/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
+++ b/mozilla/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
@@ -372,7 +372,7 @@ vbox[typeName="status"][type="header-recommended"] {
 .viewSelector {
   background-color: #969696;
   border-bottom: 1px solid #404040;
-  background-image: url("chrome://global/skin/toolbar/toolbar-background-tall.gif");
+  background-image: url("chrome://global/skin/toolbar/toolbar-background.gif");
   background-repeat: repeat-x;
   padding: 4px 0 8px;
   margin: 0;
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/extensions/searchIcons.png b/mozilla/toolkit/themes/pinstripe/mozapps/extensions/searchIcons.png
index 5ed481041b2..68863e2bed5 100644
Binary files a/mozilla/toolkit/themes/pinstripe/mozapps/extensions/searchIcons.png and b/mozilla/toolkit/themes/pinstripe/mozapps/extensions/searchIcons.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/passwordmgr/key.png b/mozilla/toolkit/themes/pinstripe/mozapps/passwordmgr/key.png
index a850044ee1d..4ec1a928140 100644
Binary files a/mozilla/toolkit/themes/pinstripe/mozapps/passwordmgr/key.png and b/mozilla/toolkit/themes/pinstripe/mozapps/passwordmgr/key.png differ
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallItemGeneric.png b/mozilla/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallItemGeneric.png
index a13c4ca7dd0..a86d0070049 100644
Binary files a/mozilla/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallItemGeneric.png and b/mozilla/toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallItemGeneric.png differ