Clean up browser_resources.grd:

* Flatten HTML where possible
* Move resources only referenced by files in browser/resources/ into there (and out of the theme dir)
* Remove duplicate/unreferenced resources
* Remove IDs for resources that are inlined due to flattening
* Remove IDR_CHAT_MANAGER_MANIFEST but leave the files on disk (they will be moving elsewhere some time soon)

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2897015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52239 0039d316-1c4b-4281-b951-d872f2087c98

63 files changed, 69 insertions, 106 deletions

diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 20b8924..95e65db 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -49,7 +49,6 @@
       <if expr="os == 'darwin'">
         <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.png" type="BINDATA" />
       </if>
-      <include name="IDR_BOOKMARK_BAR_RECENTLY_BOOKMARKED_ICON" file="star_small.png" type="BINDATA" />
       <include name="IDR_BOOKMARK_MANAGER_RECENT_ICON" file="bookmark_manager_recent.png" type="BINDATA" />
       <include name="IDR_BOOKMARK_MANAGER_SEARCH_ICON" file="bookmark_manager_search.png" type="BINDATA" />
       <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" />
@@ -65,7 +64,6 @@
       <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
       <include name="IDR_BUBBLE_T_ARROW" file="bubble_t_arrow.png" type="BINDATA" />
       <include name="IDR_BUTTON_MASK" file="button_mask.png" type="BINDATA" />
-      <include name="IDR_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" />
       <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
       <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
       <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
@@ -94,7 +92,6 @@
       <include name="IDR_DOCK_MAX" file="dock_tab_max.png" type="BINDATA" />
       <include name="IDR_DOCK_WIDE" file="dock_tab_wide.png" type="BINDATA" />
       <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="BINDATA" />
-      <include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begin.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM" file="download_button_center_bottom.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_H" file="download_button_center_bottom_h.png" type="BINDATA" />
@@ -177,7 +174,6 @@
       <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_denied_locationbar_icon.png" type="BINDATA" />
       <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_icon.png" type="BINDATA" />
       <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" />
-      <include name="IDR_HISTORY_SECTION" file="history_section.png" type="BINDATA" />
       <include name="IDR_HOME" file="home.png" type="BINDATA" />
       <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
       <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
@@ -224,14 +220,9 @@
       <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
       <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" />
       <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_CHECKBOX_BLACK" file="checkbox_black.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_CHECKBOX_WHITE" file="checkbox_white.png" type="BINDATA" />
       <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON" file="ntp_welcome_favicon.png" type="BINDATA" />
       <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="ntp_welcome_thumb.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_CLOSE" file="ntp_close.png" type="BINDATA" />
       <include name="IDR_NEWTAB_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_CLOSE_H" file="ntp_close_h.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_CLOSE_P" file="ntp_close_p.png" type="BINDATA" />
       <include name="IDR_NEWTAB_EXTENSIONS_PROMO" file="ntp_extensions_promo.png" type="BINDATA" />
       <include name="IDR_NEWTAB_LIST_OFF" file="ntp_list_off.png" type="BINDATA" />
       <include name="IDR_NEWTAB_LIST_OFF_H" file="ntp_list_off_h.png" type="BINDATA" />
@@ -243,12 +234,6 @@
       <include name="IDR_NEWTAB_OPTION" file="ntp_option.png" type="BINDATA" />
       <include name="IDR_NEWTAB_OPTION_H" file="ntp_option_h.png" type="BINDATA" />
       <include name="IDR_NEWTAB_OPTION_P" file="ntp_option_p.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_PIN_OFF" file="ntp_pin_off.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_PIN_OFF_H" file="ntp_pin_off_h.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_PIN_OFF_P" file="ntp_pin_off_p.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_PIN_ON" file="ntp_pin_on.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_PIN_ON_H" file="ntp_pin_on_h.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_PIN_ON_P" file="ntp_pin_on_p.png" type="BINDATA" />
       <include name="IDR_NEWTAB_REMOVE_ICON" file="ntp_x_icon_small.png" type="BINDATA" />
       <include name="IDR_NEWTAB_REMOVE_THUMBNAIL" file="ntp_x_icon.png" type="BINDATA" />
       <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_ACTIVE" file="ntp_x_icon_active.png" type="BINDATA" />
@@ -296,7 +281,6 @@
       <include name="IDR_OMNIBOX_STAR_LIT" file="omnibox_star_lit.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_STAR_SELECTED" file="omnibox_star_selected.png" type="BINDATA" />
       <include name="IDR_OTR_ICON" file="otr_icon.png" type="BINDATA" />
-      <include name="IDR_OTR_ICON_STANDALONE" file="otr_icon_standalone.png" type="BINDATA" />
       <include name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" type="BINDATA" />
       <include name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" type="BINDATA" />
       <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" />
@@ -470,27 +454,13 @@
         <include name="IDR_COMPACTNAV_BACK" file="compactnav_back.png" type="BINDATA" />
         <include name="IDR_COMPACTNAV_FORWARD" file="compactnav_forward.png" type="BINDATA" />
         <include name="IDR_COMPACTNAV_SEPARATOR" file="compactnav_separator.png" type="BINDATA" />
-        <include name="IDR_FILEBROWSER_BACK" file="filebrowse_back.png" type="BINDATA" />
-        <include name="IDR_FILEBROWSER_FULLSCREEN" file="filebrowse_fullscreen.png" type="BINDATA" />
         <include name="IDR_FILEBROWSER_FWD" file="filebrowse_forward.png" type="BINDATA" />
-        <include name="IDR_FILEBROWSER_MENU" file="filebrowse_menu.png" type="BINDATA" />
         <include name="IDR_FILEBROWSER_UPLOAD" file="filebrowse_upload.png" type="BINDATA" />
         <include name="IDR_ICON_APP" file="icon_app.png" type="BINDATA" />
-        <include name="IDR_ICON_FILE" file="icon_file.png" type="BINDATA" />
-        <include name="IDR_ICON_FOLDER" file="icon_folder.png" type="BINDATA" />
-        <include name="IDR_ICON_MEDIA" file="icon_media.png" type="BINDATA" />
-        <include name="IDR_ICON_PHOTO" file="icon_photo.png" type="BINDATA" />
         <include name="IDR_ICON_WEBPAGE" file="icon_webpage.png" type="BINDATA" />
         <include name="IDR_LOGIN_DEFAULT_USER" file="login_default.png" type="BINDATA" />
         <include name="IDR_LOGIN_OTHER_USER" file="login_other.png" type="BINDATA" />
-        <include name="IDR_MEDIAPLAYER_FULL_SCREEN" file="mediaplayer_full_screen.png" type="BINDATA" />
         <include name="IDR_MEDIAPLAYER_MENU" file="mediaplayer_menu.png" type="BINDATA" />
-        <include name="IDR_MEDIAPLAYER_NEXT" file="mediaplayer_next.png" type="BINDATA" />
-        <include name="IDR_MEDIAPLAYER_PAUSE" file="mediaplayer_pause.png" type="BINDATA" />
-        <include name="IDR_MEDIAPLAYER_PLAY" file="mediaplayer_play.png" type="BINDATA" />
-        <include name="IDR_MEDIAPLAYER_PLAYLIST" file="mediaplayer_playlist.png" type="BINDATA" />
-        <include name="IDR_MEDIAPLAYER_PREV" file="mediaplayer_prev.png" type="BINDATA" />
-        <include name="IDR_MEDIAPLAYER_VOL_HIGH" file="mediaplayer_vol_high.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_LOW_BATTERY" file="notification_battery_low.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_NETWORK_FAILED" file="notification_network_failed.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_NETWORK_OPEN" file="notification_network_open.png" type="BINDATA" />
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index af4e84f..ccdbc04 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -20,17 +20,13 @@ without changes to the corresponding grd file. eadee -->
       <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1">
         <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" />
       </if>
-      <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" type="BINDATA" />
+      <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_APP_GALLERY_ICON" file="resources\app_gallery_icon.png" type="BINDATA" />
       <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\manifest.json" type="BINDATA" />
       <include name="IDR_CALENDAR_APP_MANIFEST" file="resources\calendar_app\manifest.json" type="BINDATA" />
-      <include name="IDR_CHAT_MANAGER_MANIFEST" file="resources\chat_manager\manifest.json" type="BINDATA" />
       <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_DOCS_APP_MANIFEST" file="resources\docs_app\manifest.json" type="BINDATA" />
-      <include name="IDR_DOM_UI_CSS" file="resources\dom_ui.css" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_DOM_UI2_CSS" file="resources\dom_ui2.css" flattenhtml="true" type="BINDATA" />
       <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_EXTENSION_DEFAULT_ICON" file="resources\extension_default_icon.png" type="BINDATA" />
       <if expr="os == 'darwin'">
@@ -46,14 +42,11 @@ without changes to the corresponding grd file. eadee -->
       <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_LOCAL_STRINGS_JS" file="resources\shared\js\local_strings.js" type="BINDATA" />
       <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incognito_tab_theme.css" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type="BINDATA" />
       <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_NEW_NEW_TAB_JS" file="resources\new_new_tab.js" type="BINDATA" />
       <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1line.html" type="BINDATA" />
-      <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2line.html" type="BINDATA" />
+      <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1line.html" flattenhtml="true" type="BINDATA" />
+      <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2line.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_icon.html" type="BINDATA" />
       <include name="IDR_OPTIONS_HTML" file="resources\options.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml="true" type="BINDATA" />
@@ -75,14 +68,14 @@ without changes to the corresponding grd file. eadee -->
       <include name="IDR_AUTOFILL_CC_SOLO" file="resources\solo.png" type="BINDATA" />
       <include name="IDR_AUTOFILL_CC_VISA" file="resources\visa.png" type="BINDATA" />
 
-      <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
-          <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" />
-          <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" flattenhtml="true" type="BINDATA" />
-          <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_registration_page.html" flattenhtml="true" type="BINDATA" />
-          <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" flattenhtml="true" type="BINDATA" />
-          <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.html" flattenhtml="true" type="BINDATA" />
-          <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.html" flattenhtml="true" type="BINDATA" />
-          <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flattenhtml="true" type="BINDATA" />
+      <if expr="pp_ifdef('chromeos')">
+        <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_registration_page.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flattenhtml="true" type="BINDATA" />
       </if>
     </includes>
   </release>
diff --git a/chrome/browser/resources/about_memory.html b/chrome/browser/resources/about_memory.html
index 6259052..0dbc2a1 100644
--- a/chrome/browser/resources/about_memory.html
+++ b/chrome/browser/resources/about_memory.html
@@ -69,7 +69,7 @@ div#header h1 {
   padding-left: 37px;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 div#header p {
@@ -290,7 +290,7 @@ div.help {
   width: 14px;
   margin: -1px 0;
   height: 14px;
-  background: url('help.gif') center bottom no-repeat;
+  background: url('shared/images/help.gif') center bottom no-repeat;
   opacity: 0.33;
 }
 div.help:hover {
diff --git a/chrome/browser/resources/about_memory_linux.html b/chrome/browser/resources/about_memory_linux.html
index 2e92150..0d4c904 100644
--- a/chrome/browser/resources/about_memory_linux.html
+++ b/chrome/browser/resources/about_memory_linux.html
@@ -69,7 +69,7 @@ div#header h1 {
   padding-left: 37px;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 div#header p {
@@ -288,7 +288,7 @@ div.help {
   width: 14px;
   margin: -1px 0;
   height: 14px;
-  background: url('help.gif') center bottom no-repeat;
+  background: url('shared/images/help.gif') center bottom no-repeat;
   opacity: 0.33;
 }
 div.help:hover {
diff --git a/chrome/browser/resources/about_memory_mac.html b/chrome/browser/resources/about_memory_mac.html
index ebdfd12..299a875 100644
--- a/chrome/browser/resources/about_memory_mac.html
+++ b/chrome/browser/resources/about_memory_mac.html
@@ -69,7 +69,7 @@ div#header h1 {
   padding-left: 37px;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 div#header p {
@@ -288,7 +288,7 @@ div.help {
   width: 14px;
   margin: -1px 0;
   height: 14px;
-  background: url('help.gif') center bottom no-repeat;
+  background: url('shared/images/help.gif') center bottom no-repeat;
   opacity: 0.33;
 }
 div.help:hover {
diff --git a/chrome/browser/resources/about_sys.html b/chrome/browser/resources/about_sys.html
index 4c88c54..dbae643 100644
--- a/chrome/browser/resources/about_sys.html
+++ b/chrome/browser/resources/about_sys.html
@@ -55,7 +55,7 @@ div#header h1 {
   padding-left: 3em;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 div#header p {
diff --git a/chrome/browser/resources/app_gallery_icon.png b/chrome/browser/resources/app_gallery_icon.png
deleted file mode 100644
index d45242d..0000000
--- a/chrome/browser/resources/app_gallery_icon.png
+++ /dev/null
diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html
index 0cfbae5..77b60f1 100644
--- a/chrome/browser/resources/downloads.html
+++ b/chrome/browser/resources/downloads.html
@@ -759,7 +759,7 @@ function downloadUpdated(results) {
 <body onload="load();" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
 <div class="header">
   <a href="" onclick="setSearch(''); return false;">
-    <img src="../../app/theme/downloads_section.png"
+    <img src="shared/images/downloads_section.png"
          width="67" height="67" class="logo" border="0" /></a>
   <form method="post" action=""
       onsubmit="setSearch(this.term.value); return false;"
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index 1db6d5a..7b58fae 100644
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -140,7 +140,7 @@ html[dir=rtl] .developer-mode {
 }
 
 .extension_disabled td {
-  background: url('gray.png') 0px 0px;
+  background-color: #f0f0f0;
   color: #a0a0a0;
   padding-bottom: 4px;
   padding-top: 5px;
@@ -770,9 +770,9 @@ document.addEventListener('DOMContentLoaded', requestExtensionsData);
             <td width="18" padding="">
               <img id="collapse" class="developer-mode-image"
                    style="display:none" onclick="toggleDeveloperMode();"
-                   src="minus.png">
+                   src="shared/images/minus.png">
               <img id="expand" class="developer-mode-image"
-                   onclick="toggleDeveloperMode();" src="plus.png">
+                   onclick="toggleDeveloperMode();" src="shared/images/plus.png">
             </td>
             <td width="50" align="right">
               <div class="developer-mode-link">
diff --git a/chrome/browser/resources/filebrowse.html b/chrome/browser/resources/filebrowse.html
index 36c7c9a..8b01ade 100644
--- a/chrome/browser/resources/filebrowse.html
+++ b/chrome/browser/resources/filebrowse.html
@@ -149,7 +149,7 @@ ul.filebrowselist {
   height: 50px;
   z-index: 999999;
   cursor: pointer;
-  background: url('../../app/theme/filebrowse_fullscreen.png');
+  background: url('shared/images/filebrowse_fullscreen.png');
   position: absolute;
   background-repeat: no-repeat;
 }
@@ -170,7 +170,7 @@ li.filebrowserow div.icon {
 }
 
 .menuicon {
-  background: url('../../app/theme/filebrowse_menu.png');
+  background: url('shared/images/filebrowse_menu.png');
   position: absolute;
   right: 4px;
   top: 5px;
@@ -328,23 +328,23 @@ div.columnlist {
 }
 
 div.iconmedia {
-  background: url('../../app/theme/icon_media.png');
+  background: url('shared/images/icon_media.png');
 }
 
 div.iconfolder {
-  background: url('../../app/theme/icon_folder.png');
+  background: url('shared/images/icon_folder.png');
 }
 
 div.iconfile {
-  background: url('../../app/theme/icon_file.png');
+  background: url('shared/images/icon_file.png');
 }
 
 div.iconphoto {
-  background: url('../../app/theme/icon_photo.png');
+  background: url('shared/images/icon_photo.png');
 }
 
 div.iconmusic {
-  background: url('../../app/theme/icon_media.png');
+  background: url('shared/images/icon_media.png');
 }
 
 div.backbutton {
@@ -552,7 +552,7 @@ div.fullcontainer {
 
 </style>
 <script src="shared/js/local_strings.js"></script>
-<script src="media_common.js"></script>
+<script src="shared/js/media_common.js"></script>
 <script>
 
 
@@ -1550,7 +1550,7 @@ function createNewList(title, results, main, path) {
 <body onload='load();' onclick='clearMenus()' onselectstart='return false'>
 <div id='header' class=''>
   <div id='back' class='backbutton controlbutton' onclick='goBackInList();return false;'>
-    <img src="../../app/theme/filebrowse_back.png" width='100%' height='100%'>
+    <img src="shared/images/filebrowse_back.png" width='100%' height='100%'>
   </div>
   <div id='currenttitle' class=''></div>
 </div><br>
diff --git a/chrome/browser/resources/gray.png b/chrome/browser/resources/gray.png
deleted file mode 100644
index 13851ad..0000000
--- a/chrome/browser/resources/gray.png
+++ /dev/null
diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html
index d102f18..8f29115 100644
--- a/chrome/browser/resources/history.html
+++ b/chrome/browser/resources/history.html
@@ -1135,7 +1135,7 @@ html[dir='rtl'] .time {
   margin-top:18px;
 }
 .title > .starred {
-  background:url('../../app/theme/star_small.png');
+  background:url('shared/images/star_small.png');
   background-repeat:no-repeat;
   display:inline-block;
   margin-left:12px;
@@ -1172,7 +1172,7 @@ html[dir='rtl'] .entry .title > a {
 <body onload="load();" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
 <div class="header">
   <a href="" onclick="setSearch(''); return false;">
-    <img src="../../app/theme/history_section.png"
+    <img src="shared/images/history_section.png"
          width="67" height="67" class="logo" border="0"></a>
   <form method="post" action=""
       onsubmit="setSearch(this.term.value); return false;"
diff --git a/chrome/browser/resources/history2.html b/chrome/browser/resources/history2.html
index 6d75f727..a2a2ca3 100644
--- a/chrome/browser/resources/history2.html
+++ b/chrome/browser/resources/history2.html
@@ -1136,7 +1136,7 @@ html[dir='rtl'] .time {
   margin-top:18px;
 }
 .title > .starred {
-  background:url('../../app/theme/star_small.png');
+  background:url('shared/images/star_small.png');
   background-repeat:no-repeat;
   display:inline-block;
   margin-left:12px;
@@ -1173,7 +1173,7 @@ html[dir='rtl'] .entry .title > a {
 <body onload="load();" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
 <div class="header">
   <a href="" onclick="setSearch(''); return false;">
-    <img src="../../app/theme/history_section.png"
+    <img src="shared/images/history_section.png"
          width="67" height="67" class="logo" border="0"></a>
   Debug: this is History 2
   <form method="post" action=""
diff --git a/chrome/browser/resources/incognito_tab.html b/chrome/browser/resources/incognito_tab.html
index cdff80a..3f40fe3 100644
--- a/chrome/browser/resources/incognito_tab.html
+++ b/chrome/browser/resources/incognito_tab.html
@@ -48,7 +48,7 @@ document.write('<link id="incognitothemecss" rel="stylesheet" ' +
 </head>
 <body>
 <div class="content" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
-  <img src="../../app/theme/otr_icon_standalone.png" class="icon" />
+  <img src="shared/images/otr_icon_standalone.png" class="icon" />
   <span i18n-values=".innerHTML:content"></span>
 </div>
 <div class="extensionsmessage" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
diff --git a/chrome/browser/resources/mediaplayer.html b/chrome/browser/resources/mediaplayer.html
index 762f356..09f7b1e 100644
--- a/chrome/browser/resources/mediaplayer.html
+++ b/chrome/browser/resources/mediaplayer.html
@@ -133,11 +133,11 @@ body {
 }
 
 .soundiconhigh {
-  background: url('../../app/theme/mediaplayer_vol_high.png');
+  background: url('shared/images/mediaplayer_vol_high.png');
 }
 
 .soundiconmuted {
-  background: url('../../app/theme/mediaplayer_vol_mute.png');
+  background: url('shared/images/mediaplayer_vol_mute.png');
 }
 
 .soundiconhigh,
@@ -170,7 +170,7 @@ body {
 }
 
 .fullscreenicon {
-  background: url('../../app/theme/mediaplayer_full_screen.png');
+  background: url('shared/images/mediaplayer_full_screen.png');
   background-repeat: no-repeat;
   background-position: 6px 8px;
 }
@@ -193,7 +193,7 @@ body {
 }
 
 .playicon {
-  background: url('../../app/theme/mediaplayer_play.png');
+  background: url('shared/images/mediaplayer_play.png');
   background-repeat: no-repeat;
   background-position: 9px 8px;
 }
@@ -207,7 +207,7 @@ body {
 }
 
 .pauseicon {
-  background: url('../../app/theme/mediaplayer_pause.png');
+  background: url('shared/images/mediaplayer_pause.png');
   background-repeat: no-repeat;
   background-position: 9px 8px;
 }
@@ -220,7 +220,7 @@ body {
 }
 
 .previcon {
-  background: url('../../app/theme/mediaplayer_prev.png');
+  background: url('shared/images/mediaplayer_prev.png');
   background-repeat: no-repeat;
   background-position: 6px 8px;
 }
@@ -259,7 +259,7 @@ body {
 }
 
 .nexticon {
-  background: url('../../app/theme/mediaplayer_next.png');
+  background: url('shared/images/mediaplayer_next.png');
   background-repeat: no-repeat;
   background-position: 6px 8px;
 }
@@ -273,7 +273,7 @@ body {
 }
 
 .playlisticon {
-  background: url('../../app/theme/mediaplayer_playlist.png');
+  background: url('shared/images/mediaplayer_playlist.png');
   background-repeat: no-repeat;
   background-position: 6px 8px;
 }
@@ -301,7 +301,7 @@ body {
 
 </style>
 <script src="shared/js/local_strings.js"></script>
-<script src="media_common.js"></script>
+<script src="shared/js/media_common.js"></script>
 <script>
 
 function $(o) {
diff --git a/chrome/browser/resources/new_new_tab.css b/chrome/browser/resources/new_new_tab.css
index e7534b8..a201da6 100644
--- a/chrome/browser/resources/new_new_tab.css
+++ b/chrome/browser/resources/new_new_tab.css
@@ -156,7 +156,7 @@ html[dir=rtl] .item {
                         on :hover. To get this to work we have to set visibility
                         to visible which unfortunately breaks the ellipsis for t
                         he window items */
-  background-image: url(chrome://theme/IDR_NEWTAB_CLOSED_WINDOW);
+  background-image: url('ntp/closed_window.png');
 }
 
 .window-menu {
@@ -340,11 +340,11 @@ html[dir=rtl] #option-menu > [command=hide]:before {
 }
 
 #option-menu > [command=hide]:before {
-  background-image: url(chrome://theme/IDR_NEWTAB_CHECKBOX_BLACK);
+  background-image: url('ntp/checkbox_black.png');
 }
 
 #option-menu > [selected][command=hide]:active:before {
-  background-image: url(chrome://theme/IDR_NEWTAB_CHECKBOX_WHITE);
+  background-image: url('ntp/checkbox_white.png');
 }
 
 #attribution {
diff --git a/chrome/app/theme/checkbox_black.png b/chrome/browser/resources/ntp/checkbox_black.png
index 3420cd6..3420cd6 100644
--- a/chrome/app/theme/checkbox_black.png
+++ b/chrome/browser/resources/ntp/checkbox_black.png
diff --git a/chrome/app/theme/checkbox_white.png b/chrome/browser/resources/ntp/checkbox_white.png
index 95d6b13..95d6b13 100644
--- a/chrome/app/theme/checkbox_white.png
+++ b/chrome/browser/resources/ntp/checkbox_white.png
diff --git a/chrome/app/theme/closed_window.png b/chrome/browser/resources/ntp/closed_window.png
index b8d35b2..b8d35b2 100644
--- a/chrome/app/theme/closed_window.png
+++ b/chrome/browser/resources/ntp/closed_window.png
diff --git a/chrome/browser/resources/ntp/most_visited.css b/chrome/browser/resources/ntp/most_visited.css
index 5d1dff83..25366b8 100644
--- a/chrome/browser/resources/ntp/most_visited.css
+++ b/chrome/browser/resources/ntp/most_visited.css
@@ -120,39 +120,39 @@
 }
 
 .edit-bar > .pin {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF);
+  background-image: url('ntp_pin_off.png');
 }
 
 .edit-bar > .pin:hover {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF_H);
+  background-image: url('ntp_pin_off_h.png');
 }
 
 .edit-bar > .pin:active {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF_P);
+  background-image: url('ntp_pin_off_p.png');
 }
 
 .pinned .edit-bar > .pin {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON);
+  background-image: url('ntp_pin_on.png');
 }
 
 .pinned .edit-bar > .pin:hover {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON_H);
+  background-image: url(ntp_pin_on_h.png');
 }
 
 .pinned .edit-bar > .pin:active {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON_P);
+  background-image: url(ntp_pin_on_p.png');
 }
 
 .edit-bar > .remove {
-  background-image: url(chrome://theme/IDR_NEWTAB_CLOSE);
+  background-image: url('ntp_close.png');
 }
 
 .edit-bar > .remove:hover {
-  background-image: url(chrome://theme/IDR_NEWTAB_CLOSE_H);
+  background-image: url('ntp_close_h.png');
 }
 
 .edit-bar > .remove:active {
-  background-image: url(chrome://theme/IDR_NEWTAB_CLOSE_P);
+  background-image: url('ntp_close_p.png');
 }
 
 .thumbnail-container > .title > div {
diff --git a/chrome/app/theme/ntp_close.png b/chrome/browser/resources/ntp/ntp_close.png
index 031dba6..031dba6 100644
--- a/chrome/app/theme/ntp_close.png
+++ b/chrome/browser/resources/ntp/ntp_close.png
diff --git a/chrome/app/theme/ntp_close_h.png b/chrome/browser/resources/ntp/ntp_close_h.png
index cd3e978..cd3e978 100644
--- a/chrome/app/theme/ntp_close_h.png
+++ b/chrome/browser/resources/ntp/ntp_close_h.png
diff --git a/chrome/app/theme/ntp_close_p.png b/chrome/browser/resources/ntp/ntp_close_p.png
index 96cf7412..96cf7412 100644
--- a/chrome/app/theme/ntp_close_p.png
+++ b/chrome/browser/resources/ntp/ntp_close_p.png
diff --git a/chrome/app/theme/ntp_pin_off.png b/chrome/browser/resources/ntp/ntp_pin_off.png
index 0e8a718..0e8a718 100644
--- a/chrome/app/theme/ntp_pin_off.png
+++ b/chrome/browser/resources/ntp/ntp_pin_off.png
diff --git a/chrome/app/theme/ntp_pin_off_h.png b/chrome/browser/resources/ntp/ntp_pin_off_h.png
index e271f11..e271f11 100644
--- a/chrome/app/theme/ntp_pin_off_h.png
+++ b/chrome/browser/resources/ntp/ntp_pin_off_h.png
diff --git a/chrome/app/theme/ntp_pin_off_p.png b/chrome/browser/resources/ntp/ntp_pin_off_p.png
index eb5e7ff..eb5e7ff 100644
--- a/chrome/app/theme/ntp_pin_off_p.png
+++ b/chrome/browser/resources/ntp/ntp_pin_off_p.png
diff --git a/chrome/app/theme/ntp_pin_on.png b/chrome/browser/resources/ntp/ntp_pin_on.png
index 29b5457..29b5457 100644
--- a/chrome/app/theme/ntp_pin_on.png
+++ b/chrome/browser/resources/ntp/ntp_pin_on.png
diff --git a/chrome/app/theme/ntp_pin_on_h.png b/chrome/browser/resources/ntp/ntp_pin_on_h.png
index 93ebe83..93ebe83 100644
--- a/chrome/app/theme/ntp_pin_on_h.png
+++ b/chrome/browser/resources/ntp/ntp_pin_on_h.png
diff --git a/chrome/app/theme/ntp_pin_on_p.png b/chrome/browser/resources/ntp/ntp_pin_on_p.png
index 4b3a6b6..4b3a6b6 100644
--- a/chrome/app/theme/ntp_pin_on_p.png
+++ b/chrome/browser/resources/ntp/ntp_pin_on_p.png
diff --git a/chrome/browser/resources/plugins.html b/chrome/browser/resources/plugins.html
index fdd5e68..e8b14c5 100644
--- a/chrome/browser/resources/plugins.html
+++ b/chrome/browser/resources/plugins.html
@@ -481,9 +481,9 @@ document.addEventListener('DOMContentLoaded', requestPluginsData);
           <td width="18">
             <img id="collapse" class="tmi-mode-image"
                  style="display:none" onclick="toggleTmiMode();"
-                 src="minus.png">
+                 src="shared/images/minus.png">
             <img id="expand" class="tmi-mode-image"
-                 onclick="toggleTmiMode();" src="plus.png">
+                 onclick="toggleTmiMode();" src="shared/images/plus.png">
           </td>
           <td>
             <div class="tmi-mode-link">
diff --git a/chrome/browser/resources/safe_browsing_malware_block.html b/chrome/browser/resources/safe_browsing_malware_block.html
index 45a0eea..d8a5a39 100644
--- a/chrome/browser/resources/safe_browsing_malware_block.html
+++ b/chrome/browser/resources/safe_browsing_malware_block.html
@@ -85,7 +85,7 @@ input {
 <table width="100%" cellspacing="0" cellpadding="0">
   <td class="cell" valign="middle" align="center">
     <div class="box">
-      <div class="icon"><img src="phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
+      <div class="icon"><img src="shared/images/phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
       <div class="title" i18n-content="headLine"></div>
       <div class="main" i18n-values=".innerHTML:description1"></div>
       <div class="main" i18n-values=".innerHTML:description2"></div>
diff --git a/chrome/browser/resources/safe_browsing_multiple_threat_block.html b/chrome/browser/resources/safe_browsing_multiple_threat_block.html
index c1aba11..a8aaf70 100644
--- a/chrome/browser/resources/safe_browsing_multiple_threat_block.html
+++ b/chrome/browser/resources/safe_browsing_multiple_threat_block.html
@@ -114,7 +114,7 @@ function takeMeBack() {
 <table width="100%" cellspacing="0" cellpadding="0">
   <td class="cell" valign="middle" align="center">
     <div class="box">
-      <div class="icon"><img src="phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
+      <div class="icon"><img src="shared/images/phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
       <div class="title" i18n-content="headLine"></div>
       <div class="main" i18n-values=".innerHTML:description1"></div>
       <div class="main" i18n-content="description2"></div>
diff --git a/chrome/browser/resources/safe_browsing_phishing_block.html b/chrome/browser/resources/safe_browsing_phishing_block.html
index d34e583..46d400a 100644
--- a/chrome/browser/resources/safe_browsing_phishing_block.html
+++ b/chrome/browser/resources/safe_browsing_phishing_block.html
@@ -87,7 +87,7 @@ html[dir='rtl'] .helpbutton {
 <table width="100%" cellspacing="0" cellpadding="0">
   <td class="cell" valign="middle" align="center">
     <div class="box">
-      <div class="icon"><img src="phishing_icon.png" alt="Phishing Warning Icon" onmousedown="return false;"></div>
+      <div class="icon"><img src="shared/images/phishing_icon.png" alt="Phishing Warning Icon" onmousedown="return false;"></div>
       <div class="title" i18n-content="headLine"></div>
       <div class="main" i18n-values=".innerHTML:description1"></div>
       <div class="main"><a href="" i18n-content="description2" onclick="sendCommand('learnMore'); return false;" onmousedown="return false;"></a></div>
diff --git a/chrome/app/theme/downloads_section.png b/chrome/browser/resources/shared/images/downloads_section.png
index e7a7c2d..e7a7c2d 100644
--- a/chrome/app/theme/downloads_section.png
+++ b/chrome/browser/resources/shared/images/downloads_section.png
diff --git a/chrome/app/theme/filebrowse_back.png b/chrome/browser/resources/shared/images/filebrowse_back.png
index 0ec8cc7..0ec8cc7 100644
--- a/chrome/app/theme/filebrowse_back.png
+++ b/chrome/browser/resources/shared/images/filebrowse_back.png
diff --git a/chrome/app/theme/filebrowse_fullscreen.png b/chrome/browser/resources/shared/images/filebrowse_fullscreen.png
index 92f925d..92f925d 100644
--- a/chrome/app/theme/filebrowse_fullscreen.png
+++ b/chrome/browser/resources/shared/images/filebrowse_fullscreen.png
diff --git a/chrome/app/theme/filebrowse_menu.png b/chrome/browser/resources/shared/images/filebrowse_menu.png
index d58dbd0..d58dbd0 100644
--- a/chrome/app/theme/filebrowse_menu.png
+++ b/chrome/browser/resources/shared/images/filebrowse_menu.png
diff --git a/chrome/browser/resources/gear.png b/chrome/browser/resources/shared/images/gear.png
index 3dce105..3dce105 100644
--- a/chrome/browser/resources/gear.png
+++ b/chrome/browser/resources/shared/images/gear.png
diff --git a/chrome/browser/resources/help.gif b/chrome/browser/resources/shared/images/help.gif
index f49c094..f49c094 100644
--- a/chrome/browser/resources/help.gif
+++ b/chrome/browser/resources/shared/images/help.gif
diff --git a/chrome/app/theme/history_section.png b/chrome/browser/resources/shared/images/history_section.png
index 2640d5ad..2640d5ad 100644
--- a/chrome/app/theme/history_section.png
+++ b/chrome/browser/resources/shared/images/history_section.png
diff --git a/chrome/app/theme/icon_file.png b/chrome/browser/resources/shared/images/icon_file.png
index 1b11e56..1b11e56 100644
--- a/chrome/app/theme/icon_file.png
+++ b/chrome/browser/resources/shared/images/icon_file.png
diff --git a/chrome/app/theme/icon_folder.png b/chrome/browser/resources/shared/images/icon_folder.png
index d994cc21..d994cc21 100644
--- a/chrome/app/theme/icon_folder.png
+++ b/chrome/browser/resources/shared/images/icon_folder.png
diff --git a/chrome/app/theme/icon_media.png b/chrome/browser/resources/shared/images/icon_media.png
index dcf0cef..dcf0cef 100644
--- a/chrome/app/theme/icon_media.png
+++ b/chrome/browser/resources/shared/images/icon_media.png
diff --git a/chrome/app/theme/icon_photo.png b/chrome/browser/resources/shared/images/icon_photo.png
index f98e113..f98e113 100644
--- a/chrome/app/theme/icon_photo.png
+++ b/chrome/browser/resources/shared/images/icon_photo.png
diff --git a/chrome/app/theme/mediaplayer_full_screen.png b/chrome/browser/resources/shared/images/mediaplayer_full_screen.png
index 750c39e..750c39e 100644
--- a/chrome/app/theme/mediaplayer_full_screen.png
+++ b/chrome/browser/resources/shared/images/mediaplayer_full_screen.png
diff --git a/chrome/app/theme/mediaplayer_next.png b/chrome/browser/resources/shared/images/mediaplayer_next.png
index 9e42b4e..9e42b4e 100644
--- a/chrome/app/theme/mediaplayer_next.png
+++ b/chrome/browser/resources/shared/images/mediaplayer_next.png
diff --git a/chrome/app/theme/mediaplayer_pause.png b/chrome/browser/resources/shared/images/mediaplayer_pause.png
index 9b83ca5..9b83ca5 100644
--- a/chrome/app/theme/mediaplayer_pause.png
+++ b/chrome/browser/resources/shared/images/mediaplayer_pause.png
diff --git a/chrome/app/theme/mediaplayer_play.png b/chrome/browser/resources/shared/images/mediaplayer_play.png
index e2b4b81..e2b4b81 100644
--- a/chrome/app/theme/mediaplayer_play.png
+++ b/chrome/browser/resources/shared/images/mediaplayer_play.png
diff --git a/chrome/app/theme/mediaplayer_playlist.png b/chrome/browser/resources/shared/images/mediaplayer_playlist.png
index 932fd98..932fd98 100644
--- a/chrome/app/theme/mediaplayer_playlist.png
+++ b/chrome/browser/resources/shared/images/mediaplayer_playlist.png
diff --git a/chrome/app/theme/mediaplayer_prev.png b/chrome/browser/resources/shared/images/mediaplayer_prev.png
index c02eccd..c02eccd 100644
--- a/chrome/app/theme/mediaplayer_prev.png
+++ b/chrome/browser/resources/shared/images/mediaplayer_prev.png
diff --git a/chrome/app/theme/mediaplayer_vol_high.png b/chrome/browser/resources/shared/images/mediaplayer_vol_high.png
index 3b073b7..3b073b7 100644
--- a/chrome/app/theme/mediaplayer_vol_high.png
+++ b/chrome/browser/resources/shared/images/mediaplayer_vol_high.png
diff --git a/chrome/app/theme/mediaplayer_vol_mute.png b/chrome/browser/resources/shared/images/mediaplayer_vol_mute.png
index 0cf8741..0cf8741 100644
--- a/chrome/app/theme/mediaplayer_vol_mute.png
+++ b/chrome/browser/resources/shared/images/mediaplayer_vol_mute.png
diff --git a/chrome/browser/resources/minus.png b/chrome/browser/resources/shared/images/minus.png
index 7f8e396..7f8e396 100644
--- a/chrome/browser/resources/minus.png
+++ b/chrome/browser/resources/shared/images/minus.png
diff --git a/chrome/app/theme/otr_icon_standalone.png b/chrome/browser/resources/shared/images/otr_icon_standalone.png
index 872120b..872120b 100644
--- a/chrome/app/theme/otr_icon_standalone.png
+++ b/chrome/browser/resources/shared/images/otr_icon_standalone.png
diff --git a/chrome/browser/resources/phishing_icon.png b/chrome/browser/resources/shared/images/phishing_icon.png
index b23e76b..b23e76b 100644
--- a/chrome/browser/resources/phishing_icon.png
+++ b/chrome/browser/resources/shared/images/phishing_icon.png
diff --git a/chrome/browser/resources/plus.png b/chrome/browser/resources/shared/images/plus.png
index 35e8d6b..35e8d6b 100644
--- a/chrome/browser/resources/plus.png
+++ b/chrome/browser/resources/shared/images/plus.png
diff --git a/chrome/app/theme/star_small.png b/chrome/browser/resources/shared/images/star_small.png
index 59fe948..59fe948 100644
--- a/chrome/app/theme/star_small.png
+++ b/chrome/browser/resources/shared/images/star_small.png
diff --git a/chrome/browser/resources/media_common.js b/chrome/browser/resources/shared/js/media_common.js
index 8528809..8528809 100644
--- a/chrome/browser/resources/media_common.js
+++ b/chrome/browser/resources/shared/js/media_common.js
diff --git a/chrome/browser/resources/slideshow.html b/chrome/browser/resources/slideshow.html
index 6cc7dbd..10ed4cb 100644
--- a/chrome/browser/resources/slideshow.html
+++ b/chrome/browser/resources/slideshow.html
@@ -53,7 +53,7 @@ body {
 }
 
 #prevbutton > div {
-  background: url('../../app/theme/mediaplayer_prev.png');
+  background: url('shared/images/mediaplayer_prev.png');
   background-repeat: no-repeat;
   background-position: 4px 8px;
   width: 100%;
@@ -83,7 +83,7 @@ body {
 }
 
 #nextbutton > div {
-  background: url('../../app/theme/mediaplayer_next.png');
+  background: url('shared/images/mediaplayer_next.png');
   background-repeat: no-repeat;
   background-position: 4px 8px;
   width: 100%;
@@ -112,7 +112,7 @@ button:hover {
 
 </style>
 <script src="shared/js/local_strings.js"></script>
-<script src="media_common.js"></script>
+<script src="shared/js/media_common.js"></script>
 <script>
 
 document.addEventListener('DOMContentLoaded', load);
diff --git a/chrome/browser/sync/resources/about_sync.html b/chrome/browser/sync/resources/about_sync.html
index 58407e9..c65a7bb 100644
--- a/chrome/browser/sync/resources/about_sync.html
+++ b/chrome/browser/sync/resources/about_sync.html
@@ -60,7 +60,7 @@ div#header h1 {
   padding-left: 37px;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('../../resources/shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 
diff --git a/chrome/browser/sync/resources/gaia_login.html b/chrome/browser/sync/resources/gaia_login.html
index a9d8417..9f55bd1 100644
--- a/chrome/browser/sync/resources/gaia_login.html
+++ b/chrome/browser/sync/resources/gaia_login.html
@@ -438,7 +438,7 @@
                 <tr>
                   <td>
                     <div id="throbber_container" style="display:none;">
-                      <div id="throb" style="background-image:url(throbber.png);
+                      <div id="throb" style="background-image:url(../../../../app/resources/throbber.png);
                            width:16px; height:16px; background-position:0px;
                            margin:0px 10px 0px 10px">
                       </div>
diff --git a/chrome/browser/sync/resources/gear.png b/chrome/browser/sync/resources/gear.png
deleted file mode 100644
index 3dce105..0000000
--- a/chrome/browser/sync/resources/gear.png
+++ /dev/null
diff --git a/chrome/renderer/resources/neterror.html b/chrome/renderer/resources/neterror.html
index 087b270..9955021 100644
--- a/chrome/renderer/resources/neterror.html
+++ b/chrome/renderer/resources/neterror.html
@@ -114,8 +114,8 @@ function toggleDiv() {
 
 <div id="errorDetails" class="hide-details">
  <a href="javascript:void(0);" style="text-decoration:none" onclick="toggleDiv()">
-  <img id="plus" src="../../browser/resources/plus.png">
-  <img id="minus" src="../../browser/resources/minus.png">
+  <img id="plus" src="../../browser/resources/shared/images/plus.png">
+  <img id="minus" src="../../browser/resources/shared/images/minus.png">
   <span id="errorExpander" i18n-content="detailsLink" style="text-decoration:underline"></span>
  </a>
  <div id="zipInfo">