diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 1525ad396dd..20ab1a754f1 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -199,17 +199,13 @@ menuitem.bookmark-item {
 }
 
 /* Bookmark items */
-.bookmark-item  {
+.bookmark-item:not([container])  {
   list-style-image: url("chrome://global/skin/icons/folder-item.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px)
 }
 
 .bookmark-item[container] {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-.bookmark-item[container][open] {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
 }
 
 /* livemarks have the same layout as folder-item, but in the browser-only livemark-item.png */
diff --git a/browser/themes/gnomestripe/browser/places/organizer.css b/browser/themes/gnomestripe/browser/places/organizer.css
index 78439e8c2dc..ccab4eae84c 100644
--- a/browser/themes/gnomestripe/browser/places/organizer.css
+++ b/browser/themes/gnomestripe/browser/places/organizer.css
@@ -7,36 +7,34 @@
 /* back button */
 
 #back-button {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-  -moz-image-region: rect(0px, 24px, 24px, 0px);
+  list-style-image: url("moz-icon://stock/gtk-go-back?size=toolbar");
 }
 #back-button[disabled="true"] {
- -moz-image-region: rect(48px, 24px, 72px, 0px) !important;
+  list-style-image: url("moz-icon://stock/gtk-go-back?size=toolbar&state=disabled");
 }
 
 /* forward button */
 
 #forward-button {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-  -moz-image-region: rect(0px, 48px, 24px, 24px);
+  list-style-image: url("moz-icon://stock/gtk-go-forward?size=toolbar");
 }
 #forward-button[disabled="true"] {
- -moz-image-region: rect(48px, 48px, 72px, 24px) !important;
+  list-style-image: url("moz-icon://stock/gtk-go-forward?size=toolbar&state=disabled");
 }
 
 /* organize button */
 #organizeButton {
-  list-style-image: url("chrome://browser/skin/wrench.png");
+  list-style-image: url("moz-icon://stock/gtk-properties?size=button");
 }
 
 /* view button */
 #viewMenu {
-  list-style-image: url("chrome://browser/skin/wrench.png");
+  list-style-image: url("moz-icon://stock/gtk-sort-ascending?size=button");
 }
 
 /* maintenance button */
 #maintenanceButton {
-  list-style-image: url("chrome://browser/skin/wrench.png");
+  list-style-image: url("moz-icon://stock/gtk-revert-to-saved?size=button");
 }
 
 /* Root View */
@@ -79,8 +77,7 @@
   background-color: transparent;
   border: none;
   padding: 0 !important;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("moz-icon://stock/gtk-clear?size=menu");
   width: 16px;
   height: 16px;
   cursor: default;
@@ -92,14 +89,6 @@
   border: 0;
 }
 
-.textbox-input-closebutton:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-.textbox-input-closebutton:hover:active {
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
 .small, .small[disabled="true"] {
   font-size: x-small;
   min-width: 0px;
diff --git a/browser/themes/gnomestripe/browser/places/places.css b/browser/themes/gnomestripe/browser/places/places.css
index 66ac035a98f..366d96c706d 100755
--- a/browser/themes/gnomestripe/browser/places/places.css
+++ b/browser/themes/gnomestripe/browser/places/places.css
@@ -34,12 +34,7 @@ treechildren::-moz-tree-image(title, separator) {
 }
 
 treechildren::-moz-tree-image(title, container) {
-  list-style-image: url("chrome://global/skin/icons/folder-item.png");
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-treechildren::-moz-tree-image(title, open) {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
 }
 
 treechildren::-moz-tree-image(title, container, livemark) {