[MD] some tweaks to download shelf

chrome/browser/ui/views/bar_control_button.cc

Index: chrome/browser/ui/views/bar_control_button.cc
diff --git a/chrome/browser/ui/views/bar_control_button.cc b/chrome/browser/ui/views/bar_control_button.cc
index 9d472bf19430c9ea26dbba7b64a552a7e8f5e247..eecd5186b365e18fd90fc46186759b24c171021b 100644
--- a/chrome/browser/ui/views/bar_control_button.cc
+++ b/chrome/browser/ui/views/bar_control_button.cc
@@ -23,6 +23,8 @@ BarControlButton::BarControlButton(views::ButtonListener* listener)
       ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)) {
   set_ink_drop_delegate(ink_drop_delegate_.get());
   set_has_ink_drop_action_on_click(true);
+  SetImageAlignment(views::ImageButton::ALIGN_CENTER,
+                    views::ImageButton::ALIGN_MIDDLE);
 }
 
 BarControlButton::~BarControlButton() {}
@@ -33,11 +35,11 @@ void BarControlButton::SetIcon(
   id_ = id;
   get_text_color_callback_ = get_text_color_callback;
 
-  SetBorder(views::Border::CreateEmptyBorder(
-      kButtonExtraTouchSize, kButtonExtraTouchSize, kButtonExtraTouchSize,
-      kButtonExtraTouchSize));
-  SetImageAlignment(views::ImageButton::ALIGN_CENTER,
-                    views::ImageButton::ALIGN_MIDDLE);
+  if (!border()) {
+    SetBorder(views::Border::CreateEmptyBorder(
+        kButtonExtraTouchSize, kButtonExtraTouchSize, kButtonExtraTouchSize,
+        kButtonExtraTouchSize));
+  }
 }
 
 void BarControlButton::OnThemeChanged() {