Fixed icon uris broken in browser shim removal. bug=328543 r=ben@mozilla.org

browser/components/places/src/nsLivemarkService.cpp

@@ -49,7 +49,7 @@
 
 #define LIVEMARK_TIMEOUT          15000       // fire every 15 seconds
 #define PLACES_STRING_BUNDLE_URI  "chrome://browser/locale/places/places.properties"
-#define LIVEMARK_ICON_URI         "chrome://browser/skin/places/livemark_item.png"
+#define LIVEMARK_ICON_URI         "chrome://browser/skin/places/livemarkItem.png"
 
 // Constants for parsing RDF Livemarks
 // These are used in nsBookmarksFeedHandler.cpp, but because there is

browser/themes/pinstripe/browser/browser.css

@@ -897,8 +897,7 @@ browsermessage {
 }
 
 #places-bookmark {
-  list-style-image: url("chrome://browser/skin/bookmarks/Bookmarks-toolbar.png");
-  -moz-image-region: rect(0px 24px 24px 0px);
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
 }
 
 #places-subscribe {
@@ -911,7 +910,7 @@ browsermessage {
 }
 
 #bookmarksBarShowPlaces {
-  list-style-image: url("chrome://browser/skin/places/places-icon.png");
+  list-style-image: url("chrome://browser/skin/places/placesIcon.png");
 }
 
 /* Personal toolbar */

browser/themes/winstripe/browser/browser.css

@@ -962,8 +962,7 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
 }
 
 #places-bookmark {
-  list-style-image: url("chrome://browser/skin/bookmarks/Bookmarks-toolbar.png");
-  -moz-image-region: rect(0px 24px 24px 0px);
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
 }
 
 #places-subscribe {
@@ -976,7 +975,7 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
 }
 
 #bookmarksBarShowPlaces {
-  list-style-image: url("chrome://browser/skin/places/places-icon.png");
+  list-style-image: url("chrome://browser/skin/places/placesIcon.png");
 }