Inconsistent use of [x] close panel icon

The close button in download pane should be the tab close button asset : tab_close_*.png
(this was originally reported as part of BUG=173251).

By the same logic the same smaller bitmap with red hover background should be used for all infobars
such as translate bar, save password bar, etc. It should also be used for find-in-page bar on all
platforms (Mac was missed with the previous implementation).

The close button in the chrome UI and Web UI bubbles was left the same as before (this needs to be regression-tested).

Code was rearranged to make explicit the disrepancy between the IDR_CLOSE_BAR and IDR_CLOSE_BUBBLE.
IDR_TAB_CLOSE was renamed IDR_CLOSE_1.
IDR_CLOSE_BAR was renamed IDR_CLOSE_2.
png files were also renamed.

BUG=217094
TEST=Open any page that downloads an attachment such as gmail email with an attachment or a page with images. Download an image or an attachment. Verify that the close button in download bar at the bottom of the screen has a red circular background when mouse hovers over it - same as the close tab button.

TEST=Open find-in-page (Ctrl+F) box on Mac, Linux and Windows and check that the close button is same as tab close (has a red circular background when mouse hovers over it).

TEST=Open any infobar (translate / save password) on both ChromeOS and linux and check that the close button is same as tab close (has a red circular background when mouse hovers over it). Opening a non-English news page is usually the easiest way.

TEST=Trigger chrome to show a toolbar bubble such as extension installed bubble that shows when an extension is installed from chrome web store (see bitmaps in comments attached to BUG=217094). Confirm that the close buttons in those bubbles are NOT changed from before the change (they should NOT have the red circular background when mouse hovers over).

Review URL: https://codereview.chromium.org/12634025

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

59 files changed, 121 insertions, 118 deletions

diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index 705c939..2c7f661 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -1,6 +1,8 @@
 IDR_ABOUT_VERSION_HTML
 IDR_ABOUT_VERSION_JS
 IDR_BOOKMARK_BAR_FOLDER
+IDR_CLOSE_1_MASK
+IDR_CLOSE_1_P
 IDR_CRASHES_HTML
 IDR_CRASHES_JS
 IDR_CREDITS_HTML
@@ -54,8 +56,6 @@ IDR_SYNC_INTERNALS_SYNC_LOG_JS
 IDR_SYNC_INTERNALS_SYNC_NODE_BROWSER_JS
 IDR_SYNC_INTERNALS_SYNC_SEARCH_JS
 IDR_SYNC_INTERNALS_TRAFFIC_JS
-IDR_TAB_CLOSE_MASK
-IDR_TAB_CLOSE_P
 IDR_THROBBER
 IDR_UPDATE_BADGE4
 IDR_UPDATE_MENU4
diff --git a/chrome/app/theme/default_100_percent/common/tab_close_normal.png b/chrome/app/theme/default_100_percent/common/close_1.png
index 902a7dc..902a7dc 100644
--- a/chrome/app/theme/default_100_percent/common/tab_close_normal.png
+++ b/chrome/app/theme/default_100_percent/common/close_1.png
diff --git a/chrome/app/theme/default_100_percent/common/tab_close_hover.png b/chrome/app/theme/default_100_percent/common/close_1_hover.png
index 8f230e1..8f230e1 100644
--- a/chrome/app/theme/default_100_percent/common/tab_close_hover.png
+++ b/chrome/app/theme/default_100_percent/common/close_1_hover.png
diff --git a/chrome/app/theme/default_100_percent/common/tab_close_mask.png b/chrome/app/theme/default_100_percent/common/close_1_mask.png
index 2d059d6..2d059d6 100644
--- a/chrome/app/theme/default_100_percent/common/tab_close_mask.png
+++ b/chrome/app/theme/default_100_percent/common/close_1_mask.png
diff --git a/chrome/app/theme/default_100_percent/common/tab_close_pressed.png b/chrome/app/theme/default_100_percent/common/close_1_pressed.png
index 5507466..5507466 100644
--- a/chrome/app/theme/default_100_percent/common/tab_close_pressed.png
+++ b/chrome/app/theme/default_100_percent/common/close_1_pressed.png
diff --git a/chrome/app/theme/default_200_percent/common/tab_close_normal.png b/chrome/app/theme/default_200_percent/common/close_1.png
index 9e2356d..9e2356d 100644
--- a/chrome/app/theme/default_200_percent/common/tab_close_normal.png
+++ b/chrome/app/theme/default_200_percent/common/close_1.png
diff --git a/chrome/app/theme/default_200_percent/common/tab_close_hover.png b/chrome/app/theme/default_200_percent/common/close_1_hover.png
index 0b8ee7a..0b8ee7a 100644
--- a/chrome/app/theme/default_200_percent/common/tab_close_hover.png
+++ b/chrome/app/theme/default_200_percent/common/close_1_hover.png
diff --git a/chrome/app/theme/default_200_percent/common/tab_close_mask.png b/chrome/app/theme/default_200_percent/common/close_1_mask.png
index 508caca..508caca 100644
--- a/chrome/app/theme/default_200_percent/common/tab_close_mask.png
+++ b/chrome/app/theme/default_200_percent/common/close_1_mask.png
diff --git a/chrome/app/theme/default_200_percent/common/tab_close_pressed.png b/chrome/app/theme/default_200_percent/common/close_1_pressed.png
index f9e213b..f9e213b 100644
--- a/chrome/app/theme/default_200_percent/common/tab_close_pressed.png
+++ b/chrome/app/theme/default_200_percent/common/close_1_pressed.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 8454eac..8e1cc8c 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -752,10 +752,10 @@
         <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="mac/tab_alpha_left.png" />
         <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="mac/tab_alpha_right.png" />
       </if>
-      <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE" file="common/tab_close_normal.png" />
-      <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_H" file="common/tab_close_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_MASK" file="common/tab_close_mask.png" />
-      <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_P" file="common/tab_close_pressed.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_1" file="common/close_1.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_1_H" file="common/close_1_hover.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_1_MASK" file="common/close_1_mask.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_1_P" file="common/close_1_pressed.png" />
       <structure type="chrome_scaled_image" name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" />
       <structure type="chrome_scaled_image" name="IDR_TAB_DROP_UP" file="tab_drop_up.png" />
       <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
diff --git a/chrome/app/theme/touch_100_percent/common/tab_close_normal.png b/chrome/app/theme/touch_100_percent/common/close_1.png
index dfab58b..dfab58b 100644
--- a/chrome/app/theme/touch_100_percent/common/tab_close_normal.png
+++ b/chrome/app/theme/touch_100_percent/common/close_1.png
diff --git a/chrome/app/theme/touch_100_percent/common/tab_close_hover.png b/chrome/app/theme/touch_100_percent/common/close_1_hover.png
index 4b220c5..4b220c5 100644
--- a/chrome/app/theme/touch_100_percent/common/tab_close_hover.png
+++ b/chrome/app/theme/touch_100_percent/common/close_1_hover.png
diff --git a/chrome/app/theme/touch_100_percent/common/tab_close_mask.png b/chrome/app/theme/touch_100_percent/common/close_1_mask.png
index 86382ef..86382ef 100644
--- a/chrome/app/theme/touch_100_percent/common/tab_close_mask.png
+++ b/chrome/app/theme/touch_100_percent/common/close_1_mask.png
diff --git a/chrome/app/theme/touch_100_percent/common/tab_close_pressed.png b/chrome/app/theme/touch_100_percent/common/close_1_pressed.png
index 56e3598..56e3598 100644
--- a/chrome/app/theme/touch_100_percent/common/tab_close_pressed.png
+++ b/chrome/app/theme/touch_100_percent/common/close_1_pressed.png
diff --git a/chrome/app/theme/touch_140_percent/common/tab_close_normal.png b/chrome/app/theme/touch_140_percent/common/close_1.png
index f7724f9..f7724f9 100644
--- a/chrome/app/theme/touch_140_percent/common/tab_close_normal.png
+++ b/chrome/app/theme/touch_140_percent/common/close_1.png
diff --git a/chrome/app/theme/touch_140_percent/common/tab_close_hover.png b/chrome/app/theme/touch_140_percent/common/close_1_hover.png
index bcf04ff..bcf04ff 100644
--- a/chrome/app/theme/touch_140_percent/common/tab_close_hover.png
+++ b/chrome/app/theme/touch_140_percent/common/close_1_hover.png
diff --git a/chrome/app/theme/touch_140_percent/common/tab_close_mask.png b/chrome/app/theme/touch_140_percent/common/close_1_mask.png
index 198afa5..198afa5 100644
--- a/chrome/app/theme/touch_140_percent/common/tab_close_mask.png
+++ b/chrome/app/theme/touch_140_percent/common/close_1_mask.png
diff --git a/chrome/app/theme/touch_140_percent/common/tab_close_pressed.png b/chrome/app/theme/touch_140_percent/common/close_1_pressed.png
index ec83dfe..ec83dfe 100644
--- a/chrome/app/theme/touch_140_percent/common/tab_close_pressed.png
+++ b/chrome/app/theme/touch_140_percent/common/close_1_pressed.png
diff --git a/chrome/app/theme/touch_180_percent/common/tab_close_normal.png b/chrome/app/theme/touch_180_percent/common/close_1.png
index a85b38c..a85b38c 100644
--- a/chrome/app/theme/touch_180_percent/common/tab_close_normal.png
+++ b/chrome/app/theme/touch_180_percent/common/close_1.png
diff --git a/chrome/app/theme/touch_180_percent/common/tab_close_hover.png b/chrome/app/theme/touch_180_percent/common/close_1_hover.png
index 59cb494..59cb494 100644
--- a/chrome/app/theme/touch_180_percent/common/tab_close_hover.png
+++ b/chrome/app/theme/touch_180_percent/common/close_1_hover.png
diff --git a/chrome/app/theme/touch_180_percent/common/tab_close_mask.png b/chrome/app/theme/touch_180_percent/common/close_1_mask.png
index 63288bd..63288bd 100644
--- a/chrome/app/theme/touch_180_percent/common/tab_close_mask.png
+++ b/chrome/app/theme/touch_180_percent/common/close_1_mask.png
diff --git a/chrome/app/theme/touch_180_percent/common/tab_close_pressed.png b/chrome/app/theme/touch_180_percent/common/close_1_pressed.png
index 30eaa38..30eaa38 100644
--- a/chrome/app/theme/touch_180_percent/common/tab_close_pressed.png
+++ b/chrome/app/theme/touch_180_percent/common/close_1_pressed.png
diff --git a/chrome/browser/resources/ntp4/new_tab.css b/chrome/browser/resources/ntp4/new_tab.css
index d44a767..87fa6b9 100644
--- a/chrome/browser/resources/ntp4/new_tab.css
+++ b/chrome/browser/resources/ntp4/new_tab.css
@@ -80,8 +80,8 @@ html[dir='rtl'] #notification-container {
   background-color: transparent;
   /* TODO(estade): this should animate between states. */
   background-image: -webkit-image-set(
-      url('../../../../ui/resources/default_100_percent/close_bar.png') 1x,
-      url('../../../../ui/resources/default_200_percent/close_bar.png') 2x);
+      url('../../../../ui/resources/default_100_percent/close_2.png') 1x,
+      url('../../../../ui/resources/default_200_percent/close_2.png') 2x);
   border: 0;
   cursor: default;
   display: inline-block;
@@ -93,17 +93,15 @@ html[dir='rtl'] #notification-container {
 .close-button:hover,
 .close-button:focus {
   background-image: -webkit-image-set(
-      url('../../../../ui/resources/default_100_percent/close_bar_hover.png')
-          1x,
-      url('../../../../ui/resources/default_200_percent/close_bar_hover.png')
-          2x);
+      url('../../../../ui/resources/default_100_percent/close_2_hover.png') 1x,
+      url('../../../../ui/resources/default_200_percent/close_2_hover.png') 2x);
 }
 
 .close-button:active {
   background-image: -webkit-image-set(
-      url('../../../../ui/resources/default_100_percent/close_bar_pressed.png')
+      url('../../../../ui/resources/default_100_percent/close_2_pressed.png')
           1x,
-      url('../../../../ui/resources/default_200_percent/close_bar_pressed.png')
+      url('../../../../ui/resources/default_200_percent/close_2_pressed.png')
           2x);
 }
 
diff --git a/chrome/browser/resources/options/chromeos/accounts_options_page.css b/chrome/browser/resources/options/chromeos/accounts_options_page.css
index 0eaa5f9..bba94ea 100644
--- a/chrome/browser/resources/options/chromeos/accounts_options_page.css
+++ b/chrome/browser/resources/options/chromeos/accounts_options_page.css
@@ -43,17 +43,17 @@
 
 .remove-user-button {
   background-image: -webkit-image-set(
-      url('../../../../../ui/resources/default_100_percent/close_bar.png') 1x,
-      url('../../../../../ui/resources/default_200_percent/close_bar.png') 2x);
+      url('../../../../../ui/resources/default_100_percent/close_2.png') 1x,
+      url('../../../../../ui/resources/default_200_percent/close_2.png') 2x);
   height: 16px;
   width: 16px;
 }
 
 .remove-user-button:hover {
   background-image: -webkit-image-set(
-      url('../../../../../ui/resources/default_100_percent/close_bar_hover.png')
+      url('../../../../../ui/resources/default_100_percent/close_2_hover.png')
           1x,
-      url('../../../../../ui/resources/default_200_percent/close_bar_hover.png')
+      url('../../../../../ui/resources/default_200_percent/close_2_hover.png')
           2x);
 }
 
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 1bbe97f..c3a1926 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -277,8 +277,8 @@ list .row-delete-button {
   background-color: transparent;
   /* TODO(stuartmorgan): Replace with real images once they are available. */
   background-image: -webkit-image-set(
-      url('../../../../ui/resources/default_100_percent/close_bar.png') 1x,
-      url('../../../../ui/resources/default_200_percent/close_bar.png') 2x);
+      url('../../../../ui/resources/default_100_percent/close_2.png') 1x,
+      url('../../../../ui/resources/default_200_percent/close_2.png') 2x);
   border: none;
   display: block;
   height: 16px;
@@ -303,17 +303,15 @@ list div[role='listitem'][managedby='HostedApp'] .row-delete-button {
 
 list .row-delete-button:hover {
   background-image: -webkit-image-set(
-      url('../../../../ui/resources/default_100_percent/close_bar_hover.png')
-          1x,
-      url('../../../../ui/resources/default_200_percent/close_bar_hover.png')
-          2x);
+      url('../../../../ui/resources/default_100_percent/close_2_hover.png') 1x,
+      url('../../../../ui/resources/default_200_percent/close_2_hover.png') 2x);
 }
 
 list .row-delete-button:active {
   background-image: -webkit-image-set(
-      url('../../../../ui/resources/default_100_percent/close_bar_pressed.png')
+      url('../../../../ui/resources/default_100_percent/close_2_pressed.png')
           1x,
-      url('../../../../ui/resources/default_200_percent/close_bar_pressed.png')
+      url('../../../../ui/resources/default_200_percent/close_2_pressed.png')
           2x);
 }
 
diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm
index 374500b..3c2a952 100644
--- a/chrome/browser/ui/cocoa/hover_close_button.mm
+++ b/chrome/browser/ui/cocoa/hover_close_button.mm
@@ -160,16 +160,16 @@ NSString* const kFadeOutValueKeyPath = @"fadeOutValue";
 }
 
 - (NSImage*)imageForHoverState:(HoverState)hoverState {
-  int imageID = IDR_TAB_CLOSE;
+  int imageID = IDR_CLOSE_1;
   switch (hoverState) {
     case kHoverStateNone:
-      imageID = IDR_TAB_CLOSE;
+      imageID = IDR_CLOSE_1;
       break;
     case kHoverStateMouseOver:
-      imageID = IDR_TAB_CLOSE_H;
+      imageID = IDR_CLOSE_1_H;
       break;
     case kHoverStateMouseDown:
-      imageID = IDR_TAB_CLOSE_P;
+      imageID = IDR_CLOSE_1_P;
       break;
   }
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
diff --git a/chrome/browser/ui/gtk/confirm_bubble_gtk.cc b/chrome/browser/ui/gtk/confirm_bubble_gtk.cc
index 7822767..c00463d 100644
--- a/chrome/browser/ui/gtk/confirm_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/confirm_bubble_gtk.cc
@@ -81,7 +81,7 @@ void ConfirmBubbleGtk::Show() {
   gtk_box_pack_start(GTK_BOX(row), title_label, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(row), gtk_label_new(NULL), TRUE, TRUE, 0);
 
-  close_button_.reset(CustomDrawButton::CloseButton(theme_service));
+  close_button_.reset(CustomDrawButton::CloseButtonBubble(theme_service));
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonThunk), this);
   gtk_box_pack_end(GTK_BOX(row), close_button_->widget(), FALSE, FALSE, 0);
diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc
index 2b41351..0c7ce85 100644
--- a/chrome/browser/ui/gtk/custom_button.cc
+++ b/chrome/browser/ui/gtk/custom_button.cc
@@ -355,10 +355,20 @@ gboolean CustomDrawButton::OnCustomExpose(GtkWidget* sender,
 }
 
 // static
-CustomDrawButton* CustomDrawButton::CloseButton(
+CustomDrawButton* CustomDrawButton::CloseButtonBar(
     GtkThemeService* theme_provider) {
-  CustomDrawButton* button = new CustomDrawButton(theme_provider, IDR_CLOSE_BAR,
-      IDR_CLOSE_BAR_P, IDR_CLOSE_BAR_H, 0, GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+  CustomDrawButton* button = new CustomDrawButton(theme_provider,
+      IDR_CLOSE_1, IDR_CLOSE_1_P, IDR_CLOSE_1_H, 0,
+      GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+  return button;
+}
+
+// static
+CustomDrawButton* CustomDrawButton::CloseButtonBubble(
+    GtkThemeService* theme_provider) {
+  CustomDrawButton* button = new CustomDrawButton(theme_provider,
+      IDR_CLOSE_2, IDR_CLOSE_2_P, IDR_CLOSE_2_H, 0,
+      GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
   return button;
 }
 
diff --git a/chrome/browser/ui/gtk/custom_button.h b/chrome/browser/ui/gtk/custom_button.h
index cf9b076..c10ba1e 100644
--- a/chrome/browser/ui/gtk/custom_button.h
+++ b/chrome/browser/ui/gtk/custom_button.h
@@ -197,9 +197,14 @@ class CustomDrawButton : public content::NotificationObserver {
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Returns a standard close button. Pass a |theme_provider| to use Gtk icons
-  // in Gtk rendering mode.
-  static CustomDrawButton* CloseButton(GtkThemeService* theme_provider);
+  // Returns a standard close button used for infobars and shelves (smaller
+  // with red hover).
+  // Pass a |theme_provider| to use Gtk icons in Gtk rendering mode.
+  static CustomDrawButton* CloseButtonBar(GtkThemeService* theme_provider);
+
+  // Returns a standard close button used for bubbles (larger).
+  // Pass a |theme_provider| to use Gtk icons in Gtk rendering mode.
+  static CustomDrawButton* CloseButtonBubble(GtkThemeService* theme_provider);
 
  private:
   // Sets the button to themed or not.
diff --git a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
index d5a2aa5..90df4b3 100644
--- a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
@@ -120,7 +120,7 @@ DownloadShelfGtk::DownloadShelfGtk(Browser* browser, GtkWidget* parent)
   gtk_container_add(GTK_CONTAINER(shelf_.get()), vbox);
 
   // Create and pack the close button.
-  close_button_.reset(CustomDrawButton::CloseButton(theme_service_));
+  close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
   gtk_util::CenterWidgetInHBox(outer_hbox, close_button_->widget(), true, 0);
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnButtonClickThunk), this);
diff --git a/chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc
index 792642b..29c03ee 100644
--- a/chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc
@@ -85,7 +85,7 @@ void BundleInstalledBubbleGtk::ShowInternal(const BundleInstaller* bundle) {
   // Close button
   GtkWidget* close_column = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(bubble_content), close_column, FALSE, FALSE, 0);
-  close_button_.reset(CustomDrawButton::CloseButton(theme_provider));
+  close_button_.reset(CustomDrawButton::CloseButtonBubble(theme_provider));
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnButtonClick), this);
   gtk_box_pack_start(GTK_BOX(close_column), close_button_->widget(),
diff --git a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc
index 1ceea2e..32fc317 100644
--- a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc
@@ -320,7 +320,7 @@ void ExtensionInstalledBubbleGtk::ShowInternal() {
   // Create and pack the close button.
   GtkWidget* close_column = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(bubble_content), close_column, FALSE, FALSE, 0);
-  close_button_.reset(CustomDrawButton::CloseButton(theme_provider));
+  close_button_.reset(CustomDrawButton::CloseButtonBubble(theme_provider));
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnButtonClick), this);
   gtk_box_pack_start(GTK_BOX(close_column), close_button_->widget(),
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index 6e71775..ef3d70d 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -248,10 +248,7 @@ void FindBarGtk::InitWidgets() {
                                            0, false, true, NULL));
 
   GtkWidget* close_alignment = gtk_alignment_new(0, 0.6, 1, 0);
-  close_button_.reset(new CustomDrawButton(
-      theme_service_, IDR_TAB_CLOSE,
-      IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE,
-      GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
+  close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
   gtk_container_add(GTK_CONTAINER(close_alignment), close_button_->widget());
   gtk_box_pack_end(GTK_BOX(hbox), close_alignment, FALSE, FALSE,
                    kCloseButtonPadding);
@@ -561,8 +558,8 @@ void FindBarGtk::Observe(int type,
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetBackground(
         theme_service_->GetColor(ThemeProperties::COLOR_TAB_TEXT),
-        rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),
-        rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap());
+        rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),
+        rb.GetImageNamed(IDR_CLOSE_1).AsBitmap());
   }
 
   UpdateMatchLabelAppearance(match_label_failure_);
diff --git a/chrome/browser/ui/gtk/infobars/infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/infobar_gtk.cc
index a5eae474..d933b007 100644
--- a/chrome/browser/ui/gtk/infobars/infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/infobar_gtk.cc
@@ -83,7 +83,7 @@ InfoBarGtk::InfoBarGtk(InfoBarService* owner, InfoBarDelegate* delegate)
     gtk_box_pack_start(GTK_BOX(hbox_), image, FALSE, FALSE, 0);
   }
 
-  close_button_.reset(CustomDrawButton::CloseButton(theme_service_));
+  close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
   gtk_util::CenterWidgetInHBox(hbox_, close_button_->widget(), true, 0);
   signals_->Connect(close_button_->widget(), "clicked",
                     G_CALLBACK(OnCloseButtonThunk), this);
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
index e6bc666..80da5f5 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
@@ -268,14 +268,11 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Create a button to dismiss the balloon and add it to the toolbar.
-  close_button_.reset(new CustomDrawButton(IDR_TAB_CLOSE,
-                                           IDR_TAB_CLOSE_P,
-                                           IDR_TAB_CLOSE_H,
-                                           IDR_TAB_CLOSE));
+  close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
   close_button_->SetBackground(
       SK_ColorBLACK,
-      rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),
-      rb.GetImageNamed(IDR_TAB_CLOSE_MASK).AsBitmap());
+      rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),
+      rb.GetImageNamed(IDR_CLOSE_1_MASK).AsBitmap());
   gtk_widget_set_tooltip_text(close_button_->widget(), dismiss_text.c_str());
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonThunk), this);
diff --git a/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc b/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc
index 6b656f34..5e840de 100644
--- a/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/one_click_signin_bubble_gtk.cc
@@ -153,7 +153,7 @@ void OneClickSigninBubbleGtk::InitializeWidgets(
                          pango_attr_weight_new(PANGO_WEIGHT_BOLD));
   gtk_label_set_attributes(GTK_LABEL(header_label_), attributes);
   pango_attr_list_unref(attributes);
-  close_button_.reset(CustomDrawButton::CloseButton(theme_provider));
+  close_button_.reset(CustomDrawButton::CloseButtonBubble(theme_provider));
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnClickCloseButtonThunk), this);
 }
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index 9a3a844..54b984d 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -820,8 +820,8 @@ void TabRendererGtk::Layout() {
         close_button_color_ = tab_text_color;
         ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
         close_button_->SetBackground(close_button_color_,
-            rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),
-            rb.GetImageNamed(IDR_TAB_CLOSE_MASK).AsBitmap());
+            rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),
+            rb.GetImageNamed(IDR_CLOSE_1_MASK).AsBitmap());
       }
     }
   } else {
@@ -1140,8 +1140,7 @@ bool TabRendererGtk::ShouldShowCloseBox() const {
 }
 
 CustomDrawButton* TabRendererGtk::MakeCloseButton() {
-  CustomDrawButton* button = new CustomDrawButton(IDR_TAB_CLOSE,
-      IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE);
+  CustomDrawButton* button = CustomDrawButton::CloseButtonBar(theme_service_);
   button->ForceChromeTheme();
 
   g_signal_connect(button->widget(), "clicked",
@@ -1246,7 +1245,7 @@ void TabRendererGtk::InitResources() {
       IDR_TAB_INACTIVE_LEFT).ToGdkPixbuf();
   tab_inactive_l_height_ = gdk_pixbuf_get_height(tab_inactive_l);
 
-  GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_TAB_CLOSE).ToGdkPixbuf();
+  GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_CLOSE_1).ToGdkPixbuf();
   close_button_width_ = gdk_pixbuf_get_width(tab_close);
   close_button_height_ = gdk_pixbuf_get_height(tab_close);
 
diff --git a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc
index 4f6dff9..5c8b7f2 100644
--- a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc
+++ b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc
@@ -489,7 +489,7 @@ void WebsiteSettingsPopupGtk::SetIdentityInfo(
   gtk_label_set_attributes(GTK_LABEL(identity_label), attributes);
   pango_attr_list_unref(attributes);
   gtk_box_pack_start(GTK_BOX(hbox), identity_label, FALSE, FALSE, 0);
-  close_button_.reset(CustomDrawButton::CloseButton(theme_service_));
+  close_button_.reset(CustomDrawButton::CloseButtonBubble(theme_service_));
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonClickedThunk), this);
   gtk_box_pack_start(GTK_BOX(hbox), close_button_->widget(), FALSE, FALSE, 0);
diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc
index 5f1ad43..ec700de 100644
--- a/chrome/browser/ui/views/download/download_shelf_view.cc
+++ b/chrome/browser/ui/views/download/download_shelf_view.cc
@@ -320,11 +320,11 @@ void DownloadShelfView::ViewHierarchyChanged(bool is_add,
 
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
-                            rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
+                            rb.GetImageSkiaNamed(IDR_CLOSE_1));
     close_button_->SetImage(views::CustomButton::STATE_HOVERED,
-                            rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
+                            rb.GetImageSkiaNamed(IDR_CLOSE_1_H));
     close_button_->SetImage(views::CustomButton::STATE_PRESSED,
-                            rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
+                            rb.GetImageSkiaNamed(IDR_CLOSE_1_P));
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     AddChildView(close_button_);
@@ -370,8 +370,8 @@ void DownloadShelfView::UpdateColorsFromTheme() {
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_TAB_TEXT),
-        rb.GetImageSkiaNamed(IDR_CLOSE_BAR),
-        rb.GetImageSkiaNamed(IDR_CLOSE_BAR_MASK));
+        rb.GetImageSkiaNamed(IDR_CLOSE_1),
+        rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
   }
 }
 
diff --git a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
index 5256b59..f458561 100644
--- a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc
@@ -123,11 +123,11 @@ class BundleInstalledBubble : public views::BubbleDelegateView,
 
     views::ImageButton* button = new views::ImageButton(listener);
     button->SetImage(views::CustomButton::STATE_NORMAL,
-                     rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
+                     rb.GetImageSkiaNamed(IDR_CLOSE_2));
     button->SetImage(views::CustomButton::STATE_HOVERED,
-                     rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
+                     rb.GetImageSkiaNamed(IDR_CLOSE_2_H));
     button->SetImage(views::CustomButton::STATE_PRESSED,
-                     rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
+                     rb.GetImageSkiaNamed(IDR_CLOSE_2_P));
     layout->AddView(button);
   }
 
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index baccb1f..3fd85eb 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -236,11 +236,11 @@ class InstalledBubbleContent : public views::View,
     // Add the Close button (for all flavors).
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
-        rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
+        rb.GetImageSkiaNamed(IDR_CLOSE_2));
     close_button_->SetImage(views::CustomButton::STATE_HOVERED,
-        rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
+        rb.GetImageSkiaNamed(IDR_CLOSE_2_H));
     close_button_->SetImage(views::CustomButton::STATE_PRESSED,
-        rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
+        rb.GetImageSkiaNamed(IDR_CLOSE_2_P));
     AddChildView(close_button_);
   }
 
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index cff5935..3732c60 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -136,11 +136,11 @@ FindBarView::FindBarView(FindBarHost* host)
   close_button_->set_tag(CLOSE_TAG);
   close_button_->set_focusable(true);
   close_button_->SetImage(views::CustomButton::STATE_NORMAL,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1));
   close_button_->SetImage(views::CustomButton::STATE_HOVERED,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1_H));
   close_button_->SetImage(views::CustomButton::STATE_PRESSED,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1_P));
   close_button_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_CLOSE_TOOLTIP));
   close_button_->SetAccessibleName(
@@ -520,7 +520,7 @@ void FindBarView::OnThemeChanged() {
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_TAB_TEXT),
-        rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
-        rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
+        rb.GetImageSkiaNamed(IDR_CLOSE_1),
+        rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
   }
 }
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index c400ff8..898b189 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -227,11 +227,11 @@ void InfoBarView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
     close_button_ = new views::ImageButton(this);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
-                            rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());
+                            rb.GetImageNamed(IDR_CLOSE_1).ToImageSkia());
     close_button_->SetImage(views::CustomButton::STATE_HOVERED,
-                            rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
+                            rb.GetImageNamed(IDR_CLOSE_1_H).ToImageSkia());
     close_button_->SetImage(views::CustomButton::STATE_PRESSED,
-                            rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
+                            rb.GetImageNamed(IDR_CLOSE_1_P).ToImageSkia());
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     close_button_->set_focusable(true);
diff --git a/chrome/browser/ui/views/notifications/balloon_view_views.cc b/chrome/browser/ui/views/notifications/balloon_view_views.cc
index 7ff2ada..967922e 100644
--- a/chrome/browser/ui/views/notifications/balloon_view_views.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view_views.cc
@@ -357,15 +357,15 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   frame_container_->SetAlwaysOnTop(true);
 
   close_button_->SetImage(views::CustomButton::STATE_NORMAL,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1));
   close_button_->SetImage(views::CustomButton::STATE_HOVERED,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1_H));
   close_button_->SetImage(views::CustomButton::STATE_PRESSED,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1_P));
   close_button_->SetBoundsRect(GetCloseButtonBounds());
   close_button_->SetBackground(SK_ColorBLACK,
-                               rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
-                               rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
+                               rb.GetImageSkiaNamed(IDR_CLOSE_1),
+                               rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
 
   options_menu_button_->SetIcon(*rb.GetImageSkiaNamed(IDR_BALLOON_WRENCH));
   options_menu_button_->SetHoverIcon(
diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
index d3a14cc..0058507 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
+++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
@@ -110,11 +110,11 @@ void OneClickSigninDialogView::InitContent(views::GridLayout* layout) {
 
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::ImageButton::STATE_NORMAL,
-                            rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());
+                            rb.GetImageNamed(IDR_CLOSE_2).ToImageSkia());
     close_button_->SetImage(views::ImageButton::STATE_HOVERED,
-                            rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
+                            rb.GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
     close_button_->SetImage(views::ImageButton::STATE_PRESSED,
-                            rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
+                            rb.GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
     layout->AddView(close_button_);
   }
 
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 33625db..fdc40c1 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -461,11 +461,11 @@ Tab::Tab(TabController* controller)
   close_button_ = new TabCloseButton(this);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   close_button_->SetImage(views::CustomButton::STATE_NORMAL,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1));
   close_button_->SetImage(views::CustomButton::STATE_HOVERED,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1_H));
   close_button_->SetImage(views::CustomButton::STATE_PRESSED,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_1_P));
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   // Disable animation so that the red danger sign shows up immediately
@@ -1090,8 +1090,8 @@ void Tab::PaintTab(gfx::Canvas* canvas) {
     close_button_color_ = title_color;
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetBackground(close_button_color_,
-        rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
-        rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
+        rb.GetImageSkiaNamed(IDR_CLOSE_1),
+        rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
   }
 }
 
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index d993e09..0a5ad26 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -181,11 +181,11 @@ PopupHeaderView::PopupHeaderView(views::ButtonListener* close_button_listener)
       new views::ImageButton(close_button_listener);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   close_button->SetImage(views::CustomButton::STATE_NORMAL,
-                         rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());
+                         rb.GetImageNamed(IDR_CLOSE_2).ToImageSkia());
   close_button->SetImage(views::CustomButton::STATE_HOVERED,
-                         rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
+                         rb.GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
   close_button->SetImage(views::CustomButton::STATE_PRESSED,
-                         rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
+                         rb.GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
   layout->AddView(close_button, 1, 1, views::GridLayout::TRAILING,
                   views::GridLayout::LEADING);
 
diff --git a/chrome/renderer/resources/plugin_placeholders.css b/chrome/renderer/resources/plugin_placeholders.css
index 4ec7cb7..84e66d7 100644
--- a/chrome/renderer/resources/plugin_placeholders.css
+++ b/chrome/renderer/resources/plugin_placeholders.css
@@ -60,21 +60,20 @@ p {
   height: 14px;
   width: 14px;
   background-image: -webkit-image-set(
-      url('../../../ui/resources/default_100_percent/close_bar.png') 1x,
-      url('../../../ui/resources/default_200_percent/close_bar.png') 2x);
+      url('../../../ui/resources/default_100_percent/close_2.png') 1x,
+      url('../../../ui/resources/default_200_percent/close_2.png') 2x);
   background-position: right top;
   background-repeat: no-repeat;
 }
 
 #close:hover {
   background-image: -webkit-image-set(
-      url('../../../ui/resources/default_100_percent/close_bar_hover.png') 1x,
-      url('../../../ui/resources/default_200_percent/close_bar_hover.png') 2x);
+      url('../../../ui/resources/default_100_percent/close_2_hover.png') 1x,
+      url('../../../ui/resources/default_200_percent/close_2_hover.png') 2x);
 }
 
 #close:active {
   background-image: -webkit-image-set(
-      url('../../../ui/resources/default_100_percent/close_bar_pressed.png') 1x,
-      url('../../../ui/resources/default_200_percent/close_bar_pressed.png')
-          2x);
+      url('../../../ui/resources/default_100_percent/close_2_pressed.png') 1x,
+      url('../../../ui/resources/default_200_percent/close_2_pressed.png') 2x);
 }
diff --git a/ui/resources/default_100_percent/close_bar.png b/ui/resources/default_100_percent/close_2.png
index 912df05d..912df05d 100644
--- a/ui/resources/default_100_percent/close_bar.png
+++ b/ui/resources/default_100_percent/close_2.png
diff --git a/ui/resources/default_100_percent/close_bar_hover.png b/ui/resources/default_100_percent/close_2_hover.png
index c5e1481..c5e1481 100644
--- a/ui/resources/default_100_percent/close_bar_hover.png
+++ b/ui/resources/default_100_percent/close_2_hover.png
diff --git a/ui/resources/default_100_percent/close_bar_mask.png b/ui/resources/default_100_percent/close_2_mask.png
index 0b604ee..0b604ee 100644
--- a/ui/resources/default_100_percent/close_bar_mask.png
+++ b/ui/resources/default_100_percent/close_2_mask.png
diff --git a/ui/resources/default_100_percent/close_bar_pressed.png b/ui/resources/default_100_percent/close_2_pressed.png
index cc5bbbe..cc5bbbe 100644
--- a/ui/resources/default_100_percent/close_bar_pressed.png
+++ b/ui/resources/default_100_percent/close_2_pressed.png
diff --git a/ui/resources/default_200_percent/close_bar.png b/ui/resources/default_200_percent/close_2.png
index 1818bb2..1818bb2 100644
--- a/ui/resources/default_200_percent/close_bar.png
+++ b/ui/resources/default_200_percent/close_2.png
diff --git a/ui/resources/default_200_percent/close_bar_hover.png b/ui/resources/default_200_percent/close_2_hover.png
index 04624df..04624df 100644
--- a/ui/resources/default_200_percent/close_bar_hover.png
+++ b/ui/resources/default_200_percent/close_2_hover.png
diff --git a/ui/resources/default_200_percent/close_bar_mask.png b/ui/resources/default_200_percent/close_2_mask.png
index fb57484..fb57484 100644
--- a/ui/resources/default_200_percent/close_bar_mask.png
+++ b/ui/resources/default_200_percent/close_2_mask.png
diff --git a/ui/resources/default_200_percent/close_bar_pressed.png b/ui/resources/default_200_percent/close_2_pressed.png
index 4d0b267..4d0b267 100644
--- a/ui/resources/default_200_percent/close_bar_pressed.png
+++ b/ui/resources/default_200_percent/close_2_pressed.png
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 748b9f9..811bd91 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -163,10 +163,10 @@
       <if expr="pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_CLOSE" file="close.png" />
       </if>
-      <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR" file="close_bar.png" />
-      <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_H" file="close_bar_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" />
-      <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_P" file="close_bar_pressed.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_2" file="close_2.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_2_H" file="close_2_hover.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_2_MASK" file="close_2_mask.png" />
+      <structure type="chrome_scaled_image" name="IDR_CLOSE_2_P" file="close_2_pressed.png" />
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG" file="close_dialog.png" />
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_H" file="close_dialog_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_P" file="close_dialog_pressed.png" />
diff --git a/ui/webui/resources/css/bubble.css b/ui/webui/resources/css/bubble.css
index ad42d96..9975cfe 100644
--- a/ui/webui/resources/css/bubble.css
+++ b/ui/webui/resources/css/bubble.css
@@ -42,20 +42,20 @@ html[dir='rtl'] .bubble-close {
 
 .bubble-close {
   background-image: -webkit-image-set(
-      url('../../../resources/default_100_percent/close_bar.png') 1x,
-      url('../../../resources/default_200_percent/close_bar.png') 2x);
+      url('../../../resources/default_100_percent/close_2.png') 1x,
+      url('../../../resources/default_200_percent/close_2.png') 2x);
 }
 
 .bubble-close:hover {
   background-image: -webkit-image-set(
-      url('../../../resources/default_100_percent/close_bar_hover.png') 1x,
-      url('../../../resources/default_200_percent/close_bar_hover.png') 2x);
+      url('../../../resources/default_100_percent/close_2_hover.png') 1x,
+      url('../../../resources/default_200_percent/close_2_hover.png') 2x);
 }
 
 .bubble-close:active {
   background-image: -webkit-image-set(
-    url('../../../resources/default_100_percent/close_bar_pressed.png') 1x,
-    url('../../../resources/default_200_percent/close_bar_pressed.png') 2x);
+      url('../../../resources/default_100_percent/close_2_pressed.png') 1x,
+      url('../../../resources/default_200_percent/close_2_pressed.png') 2x);
 }
 
 .bubble-shadow {
diff --git a/ui/webui/resources/css/expandable_bubble.css b/ui/webui/resources/css/expandable_bubble.css
index ee4bc03..a5b51b5 100644
--- a/ui/webui/resources/css/expandable_bubble.css
+++ b/ui/webui/resources/css/expandable_bubble.css
@@ -74,18 +74,18 @@
 
 .expandable-bubble-close {
   background-image: -webkit-image-set(
-      url('../../../resources/default_100_percent/close_bar.png') 1x,
-      url('../../../resources/default_200_percent/close_bar.png') 2x);
+      url('../../../resources/default_100_percent/close_2.png') 1x,
+      url('../../../resources/default_200_percent/close_2.png') 2x);
 }
 
 .expandable-bubble-close:hover {
   background-image: -webkit-image-set(
-      url('../../../resources/default_100_percent/close_bar_hover.png') 1x,
-      url('../../../resources/default_200_percent/close_bar_hover.png') 2x);
+      url('../../../resources/default_100_percent/close_2_hover.png') 1x,
+      url('../../../resources/default_200_percent/close_2_hover.png') 2x);
 }
 
 .expandable-bubble-close:active {
   background-image: -webkit-image-set(
-    url('../../../resources/default_100_percent/close_bar_pressed.png') 1x,
-    url('../../../resources/default_200_percent/close_bar_pressed.png') 2x);
+      url('../../../resources/default_100_percent/close_2_pressed.png') 1x,
+      url('../../../resources/default_200_percent/close_2_pressed.png') 2x);
 }