brave · simonhong · Mar 2, 2026 · Feb 24, 2026 · Feb 24, 2026 · Feb 25, 2026
diff --git a/browser/ui/color/brave_color_id.h b/browser/ui/color/brave_color_id.h
@@ -56,7 +56,6 @@
     E_CPONLY(kColorSidebarAddBubbleItemTextBackgroundHovered) \
     E_CPONLY(kColorSidebarAddBubbleItemTextHovered)           \
     E_CPONLY(kColorSidebarAddBubbleItemTextNormal)            \
-    E_CPONLY(kColorSidebarAddButtonDisabled)                  \
     E_CPONLY(kColorSidebarArrowBackgroundHovered)             \
     E_CPONLY(kColorSidebarArrowDisabled)                      \
     E_CPONLY(kColorSidebarArrowNormal)                        \

diff --git a/browser/ui/color/brave_color_mixer.cc b/browser/ui/color/brave_color_mixer.cc
@@ -423,10 +423,6 @@ void AddBraveLightThemeColorMixer(ui::ColorProvider* provider,
     mixer[kColorSidebarButtonPressed] = {kColorToolbarButtonActivated};
   }
 
-  mixer[kColorSidebarAddButtonDisabled] = {PickColorContrastingToToolbar(
-      key, mixer, SkColorSetARGB(0x66, 0x49, 0x50, 0x57),
-      SkColorSetARGB(0x66, 0xC2, 0xC4, 0xCF))};
-
   mixer[kColorSidebarArrowDisabled] = {PickColorContrastingToToolbar(
       key, mixer, SkColorSetARGB(0x8A, 0x49, 0x50, 0x57),
       SkColorSetARGB(0x8A, 0xAE, 0xB1, 0xC2))};
@@ -499,9 +495,6 @@ void AddBraveDarkThemeColorMixer(ui::ColorProvider* provider,
   if (!HasCustomToolbarColor(key)) {
     mixer[kColorSidebarButtonPressed] = {kColorToolbarButtonActivated};
   }
-  mixer[kColorSidebarAddButtonDisabled] = {PickColorContrastingToToolbar(
-      key, mixer, SkColorSetARGB(0x66, 0x49, 0x50, 0x57),
-      SkColorSetARGB(0x66, 0xC2, 0xC4, 0xCF))};
   mixer[kColorSidebarArrowDisabled] = {PickColorContrastingToToolbar(
       key, mixer, SkColorSetARGB(0x8A, 0x49, 0x50, 0x57),
       SkColorSetARGB(0x8A, 0xAE, 0xB1, 0xC2))};

diff --git a/browser/ui/views/bookmarks/brave_bookmark_bar_view.h b/browser/ui/views/bookmarks/brave_bookmark_bar_view.h
@@ -1,4 +1,3 @@
-
 /* Copyright (c) 2024 The Brave Authors. All rights reserved.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,

diff --git a/browser/ui/views/frame/vertical_tabs/vertical_tab_strip_widget_delegate_view.cc b/browser/ui/views/frame/vertical_tabs/vertical_tab_strip_widget_delegate_view.cc
@@ -41,6 +41,16 @@ class VerticalTabStripWidget : public ThemeCopyingWidget {
     return new VerticalTabStripRootView(browser_view_, this);
   }
 
+  // views::Widget:
+  bool ShouldViewsStyleFollowWidgetActivation() const override {
+    // Want to make view consider widget activation state.
+    // Ex, some controls apply disabled state when its widget is inactive.
+    // As this widget is created as not-activatable,
+    // need to explicitely give true by overriding this method.
+    // Default impl is "return CanActivate()". So we need this override.
+    return true;
+  }
+
  private:
   raw_ptr<BrowserView> browser_view_;
 };

diff --git a/browser/ui/views/sidebar/sidebar_button_view.cc b/browser/ui/views/sidebar/sidebar_button_view.cc
@@ -17,8 +17,7 @@
 
 SidebarButtonView::SidebarButtonView(const std::u16string& accessible_name) {
   // Locate image at center of the button.
-  SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);
-  SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE);
+  SetHorizontalAlignment(gfx::ALIGN_CENTER);
 
   // In order to make use of margin collapsing sets the margin keys.
   // But at the same time, we want the sidebar buttons fill the entire width
@@ -37,7 +36,7 @@ SidebarButtonView::SidebarButtonView(const std::u16string& accessible_name) {
 SidebarButtonView::~SidebarButtonView() = default;
 
 void SidebarButtonView::OnThemeChanged() {
-  ImageButton::OnThemeChanged();
+  LabelButton::OnThemeChanged();
 
   // Apply toolbar button's ink drop config.
   // Reset ink drop config as inkdrop has different config per themes.

diff --git a/browser/ui/views/sidebar/sidebar_button_view.h b/browser/ui/views/sidebar/sidebar_button_view.h
@@ -8,10 +8,10 @@
 
 #include <string>
 
-#include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/button/label_button.h"
 
-class SidebarButtonView : public views::ImageButton {
-  METADATA_HEADER(SidebarButtonView, views::ImageButton)
+class SidebarButtonView : public views::LabelButton {
+  METADATA_HEADER(SidebarButtonView, views::LabelButton)
  public:
   // Value ought to follow TOOLBAR_BUTTON_HEIGHT in brave_layout_constants.cc
   static constexpr int kSidebarButtonSize = 28;
@@ -28,7 +28,7 @@ class SidebarButtonView : public views::ImageButton {
   SidebarButtonView(const SidebarButtonView&) = delete;
   SidebarButtonView operator=(const SidebarButtonView&) = delete;
 
-  // views::ImageButton overrides:
+  // views::LabelButton overrides:
   void OnThemeChanged() override;
   gfx::Size CalculatePreferredSize(
       const views::SizeBounds& available_size) const override;

diff --git a/browser/ui/views/sidebar/sidebar_control_view.cc b/browser/ui/views/sidebar/sidebar_control_view.cc
@@ -84,6 +84,7 @@ void SidebarControlView::OnThemeChanged() {
 
   UpdateBackgroundAndBorder();
   UpdateItemAddButtonState();
+  UpdateSettingsButtonState();
 }
 
 void SidebarControlView::UpdateBackgroundAndBorder() {
@@ -241,7 +242,7 @@ void SidebarControlView::UpdateSettingsButtonState() {
   sidebar_settings_view_->SetImageModel(
       views::Button::STATE_DISABLED,
       ui::ImageModel::FromVectorIcon(kLeoSettingsIcon,
-                                     kColorSidebarAddButtonDisabled,
+                                     kColorToolbarButtonIconInactive,
                                      SidebarButtonView::kDefaultIconSize));
 }
 

diff --git a/browser/ui/views/sidebar/sidebar_item_add_button.cc b/browser/ui/views/sidebar/sidebar_item_add_button.cc
@@ -14,6 +14,7 @@
 #include "brave/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.h"
 #include "brave/components/vector_icons/vector_icons.h"
 #include "brave/grit/brave_theme_resources.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -74,7 +75,7 @@ void SidebarItemAddButton::UpdateButtonImages() {
   SetImageModel(
       STATE_DISABLED,
       ui::ImageModel::FromVectorIcon(
-          kLeoPlusAddIcon, kColorSidebarAddButtonDisabled, kDefaultIconSize));
+          kLeoPlusAddIcon, kColorToolbarButtonIconInactive, kDefaultIconSize));
 }
 
 BEGIN_METADATA(SidebarItemAddButton)

diff --git a/browser/ui/views/sidebar/sidebar_item_add_button.h b/browser/ui/views/sidebar/sidebar_item_add_button.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/callback_list.h"
 #include "base/memory/raw_ptr.h"
 #include "base/scoped_observation.h"
 #include "brave/browser/ui/views/sidebar/sidebar_button_view.h"

diff --git a/browser/ui/views/sidebar/sidebar_item_view.cc b/browser/ui/views/sidebar/sidebar_item_view.cc
@@ -46,7 +46,7 @@ void SidebarItemView::ClearHorizontalBorder() {
 }
 
 void SidebarItemView::OnPaintBorder(gfx::Canvas* canvas) {
-  ImageButton::OnPaintBorder(canvas);
+  SidebarButtonView::OnPaintBorder(canvas);
 
   const ui::ColorProvider* color_provider = GetColorProvider();
   if (draw_horizontal_border_ && color_provider) {

diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc
@@ -22,6 +22,7 @@
 #include "brave/browser/profiles/profile_util.h"
 #include "brave/browser/ui/brave_browser.h"
 #include "brave/browser/ui/color/brave_color_id.h"
+#include "brave/browser/ui/color/color_palette.h"
 #include "brave/browser/ui/sidebar/sidebar_controller.h"
 #include "brave/browser/ui/sidebar/sidebar_model.h"
 #include "brave/browser/ui/sidebar/sidebar_service_factory.h"
@@ -41,6 +42,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_window/public/browser_window_features.h"
 #include "chrome/browser/ui/browser_window/public/browser_window_interface_iterator.h"
+#include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/default_style.h"
@@ -403,11 +405,15 @@ void SidebarItemsContentsView::SetImageForItem(const sidebar::SidebarItem& item,
   CHECK_LT(*index, children().size());
 
   SidebarItemView* item_view = GetItemViewAt(*index);
+  const auto resized = gfx::ImageSkiaOperations::CreateResizedImage(
+      image, skia::ImageOperations::RESIZE_BEST, kIconSize);
+  item_view->SetImageModel(views::Button::STATE_NORMAL,
+                           ui::ImageModel::FromImageSkia(resized));
   item_view->SetImageModel(
-      views::Button::STATE_NORMAL,
+      views::Button::STATE_DISABLED,
       ui::ImageModel::FromImageSkia(
-          gfx::ImageSkiaOperations::CreateResizedImage(
-              image, skia::ImageOperations::RESIZE_BEST, kIconSize)));
+          gfx::ImageSkiaOperations::CreateTransparentImage(
+              resized, kBraveDisabledControlAlpha / 255.0)));
 }
 
 void SidebarItemsContentsView::ClearDragIndicator() {
@@ -566,14 +572,16 @@ ui::ImageModel SidebarItemsContentsView::GetImageForBuiltInItems(
     views::Button::ButtonState state) const {
   const auto get_image_model = [](const gfx::VectorIcon& icon,
                                   views::Button::ButtonState state) {
-    return ui::ImageModel::FromVectorIcon(
-        icon,
-        state == views::Button::STATE_DISABLED
-            ? kColorSidebarArrowDisabled
-            : (state == views::Button::STATE_PRESSED
-                   ? kColorSidebarButtonPressed
-                   : kColorSidebarButtonBase),
-        SidebarButtonView::kDefaultIconSize);
+    ui::ColorId color_id;
+    if (state == views::Button::STATE_DISABLED) {
+      color_id = kColorToolbarButtonIconInactive;
+    } else if (state == views::Button::STATE_PRESSED) {
+      color_id = kColorSidebarButtonPressed;
+    } else {
+      color_id = kColorSidebarButtonBase;
+    }
+    return ui::ImageModel::FromVectorIcon(icon, color_id,
+                                          SidebarButtonView::kDefaultIconSize);
   };
 
   switch (type) {

diff --git a/browser/ui/views/toolbar/bookmark_button.cc b/browser/ui/views/toolbar/bookmark_button.cc
@@ -32,13 +32,14 @@ void BraveBookmarkButton::SetToggled(bool on) {
 }
 
 void BraveBookmarkButton::UpdateImageAndText() {
-  const ui::ColorProvider* color_provider = GetColorProvider();
-  SkColor icon_color = color_provider->GetColor(kColorToolbarButtonIcon);
   const gfx::VectorIcon& icon = active_ ? omnibox::kStarActiveChromeRefreshIcon
                                         : omnibox::kStarChromeRefreshIcon;
-  SetImageModel(
-      views::Button::STATE_NORMAL,
-      ui::ImageModel::FromVectorIcon(icon, icon_color, GetIconSize()));
+  SetImageModel(views::Button::STATE_NORMAL,
+                ui::ImageModel::FromVectorIcon(icon, kColorToolbarButtonIcon,
+                                               GetIconSize()));
+  SetImageModel(views::Button::STATE_DISABLED,
+                ui::ImageModel::FromVectorIcon(
+                    icon, kColorToolbarButtonIconInactive, GetIconSize()));
 
   int tooltip_id = active_ ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR;
   SetTooltipText(l10n_util::GetStringUTF16(tooltip_id));

diff --git a/browser/ui/views/toolbar/brave_vpn_button.cc b/browser/ui/views/toolbar/brave_vpn_button.cc
@@ -15,6 +15,7 @@
 #include "brave/browser/brave_vpn/brave_vpn_service_factory.h"
 #include "brave/browser/ui/brave_icon_with_badge_image_source.h"
 #include "brave/browser/ui/color/brave_color_id.h"
+#include "brave/browser/ui/color/color_palette.h"
 #include "brave/components/brave_vpn/browser/brave_vpn_service.h"
 #include "brave/components/vector_icons/vector_icons.h"
 #include "brave/grit/brave_generated_resources.h"
@@ -32,6 +33,7 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/rrect_f.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/menus/simple_menu_model.h"
@@ -267,9 +269,14 @@ void BraveVPNButton::UpdateColorsAndInsets() {
   }
   image_source->SetIcon(gfx::Image(gfx::CreateVectorIcon(
       kLeoProductVpnIcon, GetIconSize(), GetIconColor())));
+  gfx::ImageSkia vpn_image(std::move(image_source), kImageSizeWithBadge);
+
   SetImageModel(views::Button::STATE_NORMAL,
-                ui::ImageModel::FromImageSkia(gfx::ImageSkia(
-                    std::move(image_source), kImageSizeWithBadge)));
+                ui::ImageModel::FromImageSkia(vpn_image));
+  SetImageModel(views::Button::STATE_DISABLED,
+                ui::ImageModel::FromImageSkia(
+                    gfx::ImageSkiaOperations::CreateTransparentImage(
+                        vpn_image, kBraveDisabledControlAlpha / 255.0)));
 }
 
 SkColor BraveVPNButton::GetIconColor() {

diff --git a/browser/ui/views/toolbar/wallet_button.cc b/browser/ui/views/toolbar/wallet_button.cc
@@ -13,6 +13,7 @@
 #include "brave/browser/brave_wallet/brave_wallet_tab_helper.h"
 #include "brave/browser/ui/brave_icon_with_badge_image_source.h"
 #include "brave/browser/ui/color/brave_color_id.h"
+#include "brave/browser/ui/color/color_palette.h"
 #include "brave/components/brave_wallet/browser/pref_names.h"
 #include "brave/components/brave_wallet/common/common_utils.h"
 #include "brave/components/constants/webui_url_constants.h"
@@ -33,6 +34,7 @@
 #include "ui/color/color_provider_manager.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/rrect_f.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/highlight_path_generator.h"
@@ -151,6 +153,7 @@ WalletButton::WalletButton(View* backup_anchor_view, Profile* profile)
 WalletButton::~WalletButton() = default;
 
 void WalletButton::AddedToWidget() {
+  ToolbarButton::AddedToWidget();
   if (notification_source_) {
     notification_source_->Init();
   }
@@ -200,17 +203,24 @@ void WalletButton::UpdateImageAndText(bool activated) {
                 (counter_ > 0)));
 
   const ui::ColorProvider* color_provider = GetColorProvider();
-
-  ui::ColorId color_id = kColorToolbarButtonIcon;
-  if (activated) {
-    color_id = kColorToolbarButtonActivated;
+  if (!color_provider) {
+    return;
   }
 
+  ui::ColorId color_id =
+      activated ? static_cast<ui::ColorId>(kColorToolbarButtonActivated)
+                : static_cast<ui::ColorId>(kColorToolbarButtonIcon);
+
   if (counter_ == 0) {
     SetImageModel(views::Button::STATE_NORMAL,
                   ui::ImageModel::FromVectorIcon(
                       kLeoProductBraveWalletIcon,
                       color_provider->GetColor(color_id), GetIconSize()));
+    SetImageModel(views::Button::STATE_DISABLED,
+                  ui::ImageModel::FromVectorIcon(
+                      kLeoProductBraveWalletIcon,
+                      color_provider->GetColor(kColorToolbarButtonIconInactive),
+                      GetIconSize()));
     return;
   }
 
@@ -233,9 +243,14 @@ void WalletButton::UpdateImageAndText(bool activated) {
   auto text = GetBadgeText();
   image_source->SetBadge(std::make_unique<IconWithBadgeImageSource::Badge>(
       text, brave::kBadgeTextColor, brave::kBadgeNotificationBG));
+  gfx::ImageSkia badge_image(std::move(image_source), preferred_size);
+
   SetImageModel(views::Button::STATE_NORMAL,
+                ui::ImageModel::FromImageSkia(badge_image));
+  SetImageModel(views::Button::STATE_DISABLED,
                 ui::ImageModel::FromImageSkia(
-                    gfx::ImageSkia(std::move(image_source), preferred_size)));
+                    gfx::ImageSkiaOperations::CreateTransparentImage(
+                        badge_image, kBraveDisabledControlAlpha / 255.0)));
 }
 
 void WalletButton::ShowWalletBubble() {

diff --git a/browser/ui/views/toolbar/wallet_button.h b/browser/ui/views/toolbar/wallet_button.h
@@ -38,7 +38,9 @@ class WalletButton : public ToolbarButton {
   views::View* GetAsAnchorView();
 
  private:
+  // views::View:
   void AddedToWidget() override;
+
   std::string GetBadgeText();
   void OnWalletPressed(const ui::Event& event);
   void OnNotificationUpdate(bool show_suggest_badge, size_t counter);

@@ -117,8 +117,13 @@ ui::ImageModel GetBookmarkFolderIcon(BookmarkFolderIconType icon_type,
   const gfx::VectorIcon* id = icon_type == BookmarkFolderIconType::kManaged
                                   ? &vector_icons::kFolderManagedRefreshIcon
                                   : &vector_icons::kFolderChromeRefreshIcon;
-  // Use toolbar icon color for visual consistency with other toolbar icons.
-  return ui::ImageModel::FromVectorIcon(*id, kColorToolbarButtonIcon, 20);
+  if (color == ui::kColorIconDisabled) {
+    color = kColorToolbarButtonIconInactive;
+  } else if (color == kColorBookmarkFolderIcon) {
+    color = kColorToolbarButtonIcon;
+  }
+
+  return ui::ImageModel::FromVectorIcon(*id, color, 20);
 }
 
 #endif  // defined(TOOLKIT_VIEWS)