diff --git a/browser/ui/brave_shields_data_controller.cc b/browser/ui/brave_shields_data_controller.cc
index 8028a1b43676..5302fa355d11 100644
--- a/browser/ui/brave_shields_data_controller.cc
+++ b/browser/ui/brave_shields_data_controller.cc
@@ -13,7 +13,11 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/navigation_handle.h"
+#include "net/base/url_util.h"
+
+using net::AppendQueryParameter;
 
 namespace brave_shields {
 
@@ -22,7 +26,10 @@ BraveShieldsDataController::~BraveShieldsDataController() = default;
 BraveShieldsDataController::BraveShieldsDataController(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      content::WebContentsUserData<BraveShieldsDataController>(*web_contents) {}
+      content::WebContentsUserData<BraveShieldsDataController>(*web_contents) {
+  favicon::ContentFaviconDriver::FromWebContents(web_contents)
+      ->AddObserver(this);
+}
 
 void BraveShieldsDataController::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
@@ -32,6 +39,23 @@ void BraveShieldsDataController::DidFinishNavigation(
   }
 }
 
+void BraveShieldsDataController::WebContentsDestroyed() {
+  favicon::ContentFaviconDriver::FromWebContents(web_contents())
+      ->RemoveObserver(this);
+}
+
+void BraveShieldsDataController::OnFaviconUpdated(
+    favicon::FaviconDriver* favicon_driver,
+    NotificationIconType notification_icon_type,
+    const GURL& icon_url,
+    bool icon_url_changed,
+    const gfx::Image& image) {
+  if (icon_url_changed) {
+    for (Observer& obs : observer_list_)
+      obs.OnFaviconUpdated();
+  }
+}
+
 void BraveShieldsDataController::ReloadWebContents() {
   web_contents()->GetController().Reload(content::ReloadType::NORMAL, true);
 }
@@ -112,6 +136,22 @@ GURL BraveShieldsDataController::GetCurrentSiteURL() {
   return web_contents()->GetLastCommittedURL();
 }
 
+GURL BraveShieldsDataController::GetFaviconURL(bool refresh) {
+  auto url = GURL("chrome://favicon2/");
+  url = AppendQueryParameter(url, "size", "16");
+  url = AppendQueryParameter(url, "scale_factor", "2x");
+  url = AppendQueryParameter(url, "show_fallback_monogram", "");
+  url = AppendQueryParameter(url, "page_url",
+                             GetCurrentSiteURL().GetWithoutFilename().spec());
+
+  if (refresh) {
+    url = AppendQueryParameter(url, "v",
+                               std::to_string(base::Time::Now().ToJsTime()));
+  }
+
+  return url;
+}
+
 AdBlockMode BraveShieldsDataController::GetAdBlockMode() {
   auto* map = HostContentSettingsMapFactory::GetForProfile(
       web_contents()->GetBrowserContext());
diff --git a/browser/ui/brave_shields_data_controller.h b/browser/ui/brave_shields_data_controller.h
index 431cc5007659..0d37577d8219 100644
--- a/browser/ui/brave_shields_data_controller.h
+++ b/browser/ui/brave_shields_data_controller.h
@@ -12,6 +12,7 @@
 
 #include "base/observer_list.h"
 #include "brave/components/brave_shields/common/brave_shields_panel.mojom.h"
+#include "components/favicon/core/favicon_driver_observer.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -26,7 +27,8 @@ namespace brave_shields {
 // Per-tab class to manage Shields panel data
 class BraveShieldsDataController
     : public content::WebContentsObserver,
-      public content::WebContentsUserData<BraveShieldsDataController> {
+      public content::WebContentsUserData<BraveShieldsDataController>,
+      public favicon::FaviconDriverObserver {
  public:
   BraveShieldsDataController(const BraveShieldsDataController&) = delete;
   BraveShieldsDataController& operator=(const BraveShieldsDataController&) =
@@ -36,6 +38,7 @@ class BraveShieldsDataController
   class Observer : public base::CheckedObserver {
    public:
     virtual void OnResourcesChanged() = 0;
+    virtual void OnFaviconUpdated() {}
   };
 
   void HandleItemBlocked(const std::string& block_type,
@@ -49,6 +52,7 @@ class BraveShieldsDataController
   bool GetBraveShieldsEnabled();
   void SetBraveShieldsEnabled(bool is_enabled);
   GURL GetCurrentSiteURL();
+  GURL GetFaviconURL(bool refresh);
 
   AdBlockMode GetAdBlockMode();
   FingerprintMode GetFingerprintMode();
@@ -70,8 +74,17 @@ class BraveShieldsDataController
 
   explicit BraveShieldsDataController(content::WebContents* web_contents);
 
+  // content::WebContentsObserver
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
+  void WebContentsDestroyed() override;
+
+  // favicon::FaviconDriverObserver
+  void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
+                        NotificationIconType notification_icon_type,
+                        const GURL& icon_url,
+                        bool icon_url_changed,
+                        const gfx::Image& image) override;
 
   void ReloadWebContents();
 
diff --git a/browser/ui/brave_shields_data_controller_unittest.cc b/browser/ui/brave_shields_data_controller_unittest.cc
index ca9026c66610..bb512432f7d4 100644
--- a/browser/ui/brave_shields_data_controller_unittest.cc
+++ b/browser/ui/brave_shields_data_controller_unittest.cc
@@ -17,6 +17,7 @@
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_task_environment.h"
 #include "content/public/test/test_renderer_host.h"
@@ -49,6 +50,8 @@ class BraveShieldsDataControllerTest : public testing::Test {
 
     test_web_contents_ =
         content::WebContentsTester::CreateTestWebContents(profile_, nullptr);
+    favicon::ContentFaviconDriver::CreateForWebContents(
+        test_web_contents_.get(), nullptr);
     BraveShieldsDataController::CreateForWebContents(test_web_contents_.get());
   }
 
diff --git a/browser/ui/views/brave_actions/brave_shields_action_view.cc b/browser/ui/views/brave_actions/brave_shields_action_view.cc
index 367abea83d76..6f3040cdbd41 100644
--- a/browser/ui/views/brave_actions/brave_shields_action_view.cc
+++ b/browser/ui/views/brave_actions/brave_shields_action_view.cc
@@ -10,6 +10,7 @@
 #include <utility>
 
 #include "brave/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.h"
+#include "brave/common/pref_names.h"
 #include "brave/common/webui_url_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -17,6 +18,8 @@
 #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h"
 #include "components/grit/brave_components_resources.h"
 #include "components/grit/brave_components_strings.h"
+#include "components/prefs/pref_service.h"
+#include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/image_model.h"
@@ -104,8 +107,8 @@ BraveShieldsActionView::GetImageSource() {
     auto* shields_data_controller =
         brave_shields::BraveShieldsDataController::FromWebContents(
             web_contents);
-    int count = shields_data_controller->GetTotalBlockedCount();
 
+    int count = shields_data_controller->GetTotalBlockedCount();
     if (count > 0) {
       badge_text = count > 99 ? "99+" : std::to_string(count);
     }
@@ -116,10 +119,18 @@ BraveShieldsActionView::GetImageSource() {
       badge = std::make_unique<IconWithBadgeImageSource::Badge>(
           badge_text, SK_ColorWHITE, kBadgeBg);
     }
+
+    SetTooltipText(l10n_util::GetStringUTF16(IDS_BRAVE_SHIELDS));
+
+    if (is_enabled) {
+      SetTooltipText(
+          l10n_util::GetStringFUTF16Int(IDS_BRAVE_SHIELDS_ICON_TOOLTIP, count));
+    }
   }
 
   image_source->SetIcon(gfx::Image(GetIconImage(is_enabled)));
-  if (is_enabled)
+
+  if (is_enabled && profile_->GetPrefs()->GetBoolean(kShieldsStatsBadgeVisible))
     image_source->SetBadge(std::move(badge));
 
   return image_source;
@@ -145,6 +156,11 @@ void BraveShieldsActionView::UpdateIconState() {
 }
 
 void BraveShieldsActionView::ButtonPressed() {
+  auto* web_content = tab_strip_model_->GetActiveWebContents();
+  if (web_content && SchemeIsLocal(web_content->GetLastCommittedURL())) {
+    return;  // Do not show bubble if it's a local scheme
+  }
+
   if (!webui_bubble_manager_) {
     webui_bubble_manager_ =
         std::make_unique<WebUIBubbleManagerT<ShieldsPanelUI>>(
@@ -159,6 +175,13 @@ void BraveShieldsActionView::ButtonPressed() {
   webui_bubble_manager_->ShowBubble();
 }
 
+bool BraveShieldsActionView::SchemeIsLocal(GURL url) {
+  return url.SchemeIs(url::kAboutScheme) || url.SchemeIs(url::kBlobScheme) ||
+         url.SchemeIs(url::kDataScheme) ||
+         url.SchemeIs(url::kFileSystemScheme) ||
+         url.SchemeIs(content::kChromeUIScheme);
+}
+
 std::unique_ptr<views::LabelButtonBorder>
 BraveShieldsActionView::CreateDefaultBorder() const {
   std::unique_ptr<views::LabelButtonBorder> border =
diff --git a/browser/ui/views/brave_actions/brave_shields_action_view.h b/browser/ui/views/brave_actions/brave_shields_action_view.h
index 73d6aff5e9b3..0d3d111e4c6c 100644
--- a/browser/ui/views/brave_actions/brave_shields_action_view.h
+++ b/browser/ui/views/brave_actions/brave_shields_action_view.h
@@ -37,6 +37,7 @@ class BraveShieldsActionView
 
  private:
   void ButtonPressed();
+  bool SchemeIsLocal(GURL url);
   void UpdateIconState();
   gfx::ImageSkia GetIconImage(bool is_enabled);
   std::unique_ptr<IconWithBadgeImageSource> GetImageSource();
diff --git a/browser/ui/webui/brave_shields/shields_panel_data_handler.cc b/browser/ui/webui/brave_shields/shields_panel_data_handler.cc
index aac0fdff675e..c53a0c26495a 100644
--- a/browser/ui/webui/brave_shields/shields_panel_data_handler.cc
+++ b/browser/ui/webui/brave_shields/shields_panel_data_handler.cc
@@ -6,6 +6,7 @@
 #include <utility>
 
 #include "brave/browser/ui/webui/brave_shields/shields_panel_data_handler.h"
+#include "brave/browser/webcompat_reporter/webcompat_reporter_dialog.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -107,6 +108,13 @@ void ShieldsPanelDataHandler::SetBraveShieldsEnabled(bool is_enabled) {
   shields_data_ctrlr->SetBraveShieldsEnabled(is_enabled);
 }
 
+void ShieldsPanelDataHandler::OpenWebCompatWindow() {
+  auto* shields_data_ctrlr = GetActiveShieldsDataController();
+  DCHECK(shields_data_ctrlr);
+
+  OpenWebcompatReporterDialog(shields_data_ctrlr->web_contents());
+}
+
 BraveShieldsDataController*
 ShieldsPanelDataHandler::GetActiveShieldsDataController() {
   auto* profile = Profile::FromWebUI(webui_controller_->web_ui());
@@ -139,6 +147,12 @@ void ShieldsPanelDataHandler::UpdateSiteBlockInfo() {
   site_block_info_.is_shields_enabled =
       shields_data_ctrlr->GetBraveShieldsEnabled();
 
+  // This method gets called from various callsites. Constantly updating favicon
+  // url will replace the hashed version too. So, we update this once only
+  if (site_block_info_.favicon_url.is_empty()) {
+    site_block_info_.favicon_url = shields_data_ctrlr->GetFaviconURL(false);
+  }
+
   // Notify remote that data changed
   if (ui_handler_remote_) {
     ui_handler_remote_.get()->OnSiteBlockInfoChanged(site_block_info_.Clone());
@@ -149,6 +163,19 @@ void ShieldsPanelDataHandler::OnResourcesChanged() {
   UpdateSiteBlockInfo();
 }
 
+void ShieldsPanelDataHandler::OnFaviconUpdated() {
+  auto* shields_data_ctrlr = GetActiveShieldsDataController();
+  if (!shields_data_ctrlr)
+    return;
+
+  site_block_info_.favicon_url = shields_data_ctrlr->GetFaviconURL(true);
+
+  // Notify remote that favicon changed
+  if (ui_handler_remote_) {
+    ui_handler_remote_.get()->OnSiteBlockInfoChanged(site_block_info_.Clone());
+  }
+}
+
 void ShieldsPanelDataHandler::OnTabStripModelChanged(
     TabStripModel* tab_strip_model,
     const TabStripModelChange& change,
diff --git a/browser/ui/webui/brave_shields/shields_panel_data_handler.h b/browser/ui/webui/brave_shields/shields_panel_data_handler.h
index 4b07687d1642..04f919cecb04 100644
--- a/browser/ui/webui/brave_shields/shields_panel_data_handler.h
+++ b/browser/ui/webui/brave_shields/shields_panel_data_handler.h
@@ -20,6 +20,7 @@ class MojoBubbleWebUIController;
 using brave_shields::BraveShieldsDataController;
 using brave_shields::mojom::SiteBlockInfo;
 using brave_shields::mojom::SiteSettings;
+using favicon::FaviconDriver;
 
 class ShieldsPanelDataHandler : public brave_shields::mojom::DataHandler,
                                 public BraveShieldsDataController::Observer,
@@ -45,13 +46,16 @@ class ShieldsPanelDataHandler : public brave_shields::mojom::DataHandler,
   void SetIsNoScriptsEnabled(bool is_enabled) override;
   void SetHTTPSEverywhereEnabled(bool is_enabled) override;
   void SetBraveShieldsEnabled(bool is_enabled) override;
+  void OpenWebCompatWindow() override;
 
  private:
   BraveShieldsDataController* GetActiveShieldsDataController();
   void UpdateSiteBlockInfo();
 
-  // brave_shields::BraveShieldsDataController
+  // BraveShieldsDataController::Observer
   void OnResourcesChanged() override;
+  void OnFaviconUpdated() override;
+
   // TabStripModelObserver
   void OnTabStripModelChanged(
       TabStripModel* tab_strip_model,
diff --git a/browser/ui/webui/brave_shields/shields_panel_handler.cc b/browser/ui/webui/brave_shields/shields_panel_handler.cc
index 7da903f50f32..a637c39a7753 100644
--- a/browser/ui/webui/brave_shields/shields_panel_handler.cc
+++ b/browser/ui/webui/brave_shields/shields_panel_handler.cc
@@ -32,13 +32,3 @@ void ShieldsPanelHandler::CloseUI() {
     embedder->CloseUI();
   }
 }
-
-void ShieldsPanelHandler::OpenURL(const GURL& url) {
-  Browser* browser = chrome::FindBrowserWithWebContents(
-      webui_controller_->web_ui()->GetWebContents());
-
-  if (!browser)
-    return;
-
-  chrome::AddTabAt(browser, url, -1, true);
-}
diff --git a/browser/ui/webui/brave_shields/shields_panel_handler.h b/browser/ui/webui/brave_shields/shields_panel_handler.h
index 0690c64ef11a..8bbd6c1f8a3a 100644
--- a/browser/ui/webui/brave_shields/shields_panel_handler.h
+++ b/browser/ui/webui/brave_shields/shields_panel_handler.h
@@ -31,7 +31,6 @@ class ShieldsPanelHandler : public brave_shields::mojom::PanelHandler {
   // brave_shields::mojom::PanelHandler:
   void ShowUI() override;
   void CloseUI() override;
-  void OpenURL(const GURL& url) override;
 
  private:
   mojo::Receiver<brave_shields::mojom::PanelHandler> receiver_;
diff --git a/common/extensions/api/_api_features.json b/common/extensions/api/_api_features.json
index 539ea3d8df5e..7e72b1dc3dba 100644
--- a/common/extensions/api/_api_features.json
+++ b/common/extensions/api/_api_features.json
@@ -72,7 +72,8 @@
       "chrome://read-later.top-chrome/*",
       "chrome://tab-strip/*",
       "chrome://wallet-panel.top-chrome/*",
-      "chrome://wallet/*"
+      "chrome://wallet/*",
+      "chrome://brave-shields.top-chrome/*"
     ]
   }, {
     "channel": "stable",
diff --git a/components/brave_shields/common/brave_shields_panel.mojom b/components/brave_shields/common/brave_shields_panel.mojom
index 2b2a04386166..26991af69cf9 100644
--- a/components/brave_shields/common/brave_shields_panel.mojom
+++ b/components/brave_shields/common/brave_shields_panel.mojom
@@ -21,8 +21,6 @@ interface PanelHandler {
 
   // Notify the backend that the dialog should be closed.
   CloseUI();
-
-  OpenURL(url.mojom.Url url);
 };
 
 // WebUI-side handler for requests from the browser.
@@ -40,12 +38,14 @@ interface DataHandler {
   SetIsNoScriptsEnabled(bool is_enabled);
   SetHTTPSEverywhereEnabled(bool is_enabled);
   SetBraveShieldsEnabled(bool is_enabled);
+  OpenWebCompatWindow();
 };
 
 struct SiteBlockInfo {
   string host;
   int32 total_blocked_resources;
   bool is_shields_enabled;
+  url.mojom.Url favicon_url;
   array<url.mojom.Url> ads_list;
   array<url.mojom.Url> http_redirects_list;
   array<url.mojom.Url> js_list;
diff --git a/components/brave_shields/resources/panel/components/advanced-controls-content/index.tsx b/components/brave_shields/resources/panel/components/advanced-controls-content/index.tsx
index 292e741fde7b..038a96e7d67b 100644
--- a/components/brave_shields/resources/panel/components/advanced-controls-content/index.tsx
+++ b/components/brave_shields/resources/panel/components/advanced-controls-content/index.tsx
@@ -27,21 +27,29 @@ const fingerprintModeOptions = [
 ]
 
 function GlobalSettings () {
+  const onAdBlockListsClick = () => {
+    chrome.tabs.create({ url: 'chrome://adblock', active: true })
+  }
+
+  const onSettingsClick = () => {
+    chrome.tabs.create({ url: 'chrome://settings/shields', active: true })
+  }
+
   return (
     <S.FooterActionBox>
       <div>
         <button
-          onClick={() => getPanelBrowserAPI().panelHandler.openURL({ url: 'chrome://adblock' })}
+          onClick={onAdBlockListsClick}
         >
           <i>
-          <svg width="18" height="14" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fillRule="evenodd" clipRule="evenodd" d="M17.01 2.41H4.26a.709.709 0 0 1 0-1.418h12.75a.709.709 0 0 1 0 1.417ZM.717 11.616h1.416v1.417H.718v-1.417Zm0-3.541h1.416v1.416H.718V8.076Zm0-3.542h1.416v1.417H.718V4.534Zm0-3.542h1.416V2.41H.718V.992Zm3.541 3.542h9.917a.709.709 0 0 1 0 1.417H4.26a.709.709 0 0 1 0-1.417Zm0 3.542h12.75a.709.709 0 0 1 0 1.416H4.26a.709.709 0 0 1 0-1.416Zm0 3.541h9.917a.709.709 0 0 1 0 1.417H4.26a.709.709 0 0 1 0-1.417Z"/></svg>
+          <svg aria-hidden="true" width="18" height="14" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fillRule="evenodd" clipRule="evenodd" d="M17.01 2.41H4.26a.709.709 0 0 1 0-1.418h12.75a.709.709 0 0 1 0 1.417ZM.717 11.616h1.416v1.417H.718v-1.417Zm0-3.541h1.416v1.416H.718V8.076Zm0-3.542h1.416v1.417H.718V4.534Zm0-3.542h1.416V2.41H.718V.992Zm3.541 3.542h9.917a.709.709 0 0 1 0 1.417H4.26a.709.709 0 0 1 0-1.417Zm0 3.542h12.75a.709.709 0 0 1 0 1.416H4.26a.709.709 0 0 1 0-1.416Zm0 3.541h9.917a.709.709 0 0 1 0 1.417H4.26a.709.709 0 0 1 0-1.417Z"/></svg>
           </i>
           {getLocale('braveShieldsCustomizeAdblockLists')}
         </button>
         <button
-          onClick={() => getPanelBrowserAPI().panelHandler.openURL({ url: 'chrome://settings/shields' })}>
+          onClick={onSettingsClick}>
           <i>
-            <svg width="18" height="18" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fillRule="evenodd" clipRule="evenodd" d="M14.03 11.126a3.191 3.191 0 0 1 3.188 3.186A3.191 3.191 0 0 1 14.03 17.5a3.191 3.191 0 0 1-3.187-3.188 3.191 3.191 0 0 1 3.187-3.186Zm0 1.417c-.227 0-.443.046-.643.125l2.289 2.288c.078-.2.125-.416.125-.644 0-.976-.795-1.77-1.77-1.77Zm0 3.54c.228 0 .444-.046.644-.125l-2.29-2.29c-.078.2-.125.417-.125.644 0 .977.795 1.772 1.771 1.772Z"/><path d="M8.718.5C4.043.5.218 4.325.218 9s3.825 8.5 8.5 8.5h.354a.71.71 0 0 0 .708-.708c0-.355-.354-.638-.708-.638-.708-.92-1.558-2.267-2.054-3.966H8.93c.425 0 .709-.284.709-.709s-.284-.708-.709-.708H6.734c0-.142-.07-.284-.07-.425-.142-1.133-.071-2.054.07-2.975h3.896c.071.637.142 1.346.142 2.054 0 .425.283.708.708.708a.71.71 0 0 0 .709-.708c0-.708 0-1.417-.142-2.125h3.542c.141.496.212 1.063.212 1.63 0 .283 0 .566-.07.85-.072.353.212.708.637.778.354.071.708-.212.779-.637.07-.213.07-.567.07-.921 0-4.675-3.824-8.5-8.5-8.5ZM7.23 2.058c-.566.992-1.275 2.267-1.629 3.896H2.343c.92-1.983 2.762-3.4 4.887-3.896Zm0 13.884c-2.125-.496-3.896-1.913-4.816-3.825H5.6a11.962 11.962 0 0 0 1.63 3.825Zm-1.983-5.525c0 .07 0 .212.07.283h-3.47c-.142-.496-.213-1.133-.213-1.7s.071-1.133.213-1.63h3.471c-.142.922-.213 1.984-.071 3.047Zm3.33-4.463H7.088a12.229 12.229 0 0 1 1.629-3.47c.566.85 1.204 1.983 1.629 3.47h-1.77Zm6.516 0h-3.33c-.424-1.629-1.062-2.975-1.7-3.896 2.196.425 4.109 1.913 5.03 3.896Z"/></svg>
+            <svg aria-hidden="true" width="18" height="18" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fillRule="evenodd" clipRule="evenodd" d="M14.03 11.126a3.191 3.191 0 0 1 3.188 3.186A3.191 3.191 0 0 1 14.03 17.5a3.191 3.191 0 0 1-3.187-3.188 3.191 3.191 0 0 1 3.187-3.186Zm0 1.417c-.227 0-.443.046-.643.125l2.289 2.288c.078-.2.125-.416.125-.644 0-.976-.795-1.77-1.77-1.77Zm0 3.54c.228 0 .444-.046.644-.125l-2.29-2.29c-.078.2-.125.417-.125.644 0 .977.795 1.772 1.771 1.772Z"/><path d="M8.718.5C4.043.5.218 4.325.218 9s3.825 8.5 8.5 8.5h.354a.71.71 0 0 0 .708-.708c0-.355-.354-.638-.708-.638-.708-.92-1.558-2.267-2.054-3.966H8.93c.425 0 .709-.284.709-.709s-.284-.708-.709-.708H6.734c0-.142-.07-.284-.07-.425-.142-1.133-.071-2.054.07-2.975h3.896c.071.637.142 1.346.142 2.054 0 .425.283.708.708.708a.71.71 0 0 0 .709-.708c0-.708 0-1.417-.142-2.125h3.542c.141.496.212 1.063.212 1.63 0 .283 0 .566-.07.85-.072.353.212.708.637.778.354.071.708-.212.779-.637.07-.213.07-.567.07-.921 0-4.675-3.824-8.5-8.5-8.5ZM7.23 2.058c-.566.992-1.275 2.267-1.629 3.896H2.343c.92-1.983 2.762-3.4 4.887-3.896Zm0 13.884c-2.125-.496-3.896-1.913-4.816-3.825H5.6a11.962 11.962 0 0 0 1.63 3.825Zm-1.983-5.525c0 .07 0 .212.07.283h-3.47c-.142-.496-.213-1.133-.213-1.7s.071-1.133.213-1.63h3.471c-.142.922-.213 1.984-.071 3.047Zm3.33-4.463H7.088a12.229 12.229 0 0 1 1.629-3.47c.566.85 1.204 1.983 1.629 3.47h-1.77Zm6.516 0h-3.33c-.424-1.629-1.062-2.975-1.7-3.896 2.196.425 4.109 1.913 5.03 3.896Z"/></svg>
           </i>
           {getLocale('braveShieldsChangeDefaults')}
         </button>
@@ -97,7 +105,9 @@ function AdvancedControlsContent () {
             >
               {adBlockModeOptions.map(entry => {
                 return (
-                  <option key={entry.value }value={entry.value}>{entry.text}</option>
+                  <option key={entry.value} value={entry.value}>
+                    {entry.text}
+                  </option>
                 )
               })}
             </Select>
@@ -113,6 +123,7 @@ function AdvancedControlsContent () {
           <label>
             <span>{getLocale('braveShieldsConnectionsUpgraded')}</span>
             <Toggle
+              brand="shields"
               onChange={handleHTTPSEverywhereEnabledChange}
               isOn={siteSettings?.isHttpsEverywhereEnabled}
               size='sm'
@@ -130,6 +141,7 @@ function AdvancedControlsContent () {
           <label>
             <span>{getLocale('braveShieldsScriptsBlocked')}</span>
             <Toggle
+              brand="shields"
               onChange={handleIsNoScriptEnabledChange}
               isOn={siteSettings?.isNoscriptEnabled}
               size='sm'
diff --git a/components/brave_shields/resources/panel/components/advanced-controls-content/style.ts b/components/brave_shields/resources/panel/components/advanced-controls-content/style.ts
index fcca01657a77..860e23ad1b7a 100644
--- a/components/brave_shields/resources/panel/components/advanced-controls-content/style.ts
+++ b/components/brave_shields/resources/panel/components/advanced-controls-content/style.ts
@@ -5,7 +5,7 @@ export const SettingsBox = styled.div`
 `
 
 export const FooterActionBox = styled.div`
-  padding: 17px 22px;
+  padding: 0 22px 17px 22px;
   display: grid;
   grid-template-columns: 14px 1fr;
   grid-gap: 10px;
@@ -14,7 +14,7 @@ export const FooterActionBox = styled.div`
     grid-column: 2;
     display: flex;
     flex-direction: column;
-    grid-gap: inherit;
+    grid-gap: 20px;
   }
 
   button {
@@ -28,6 +28,7 @@ export const FooterActionBox = styled.div`
     text-decoration: none;
     display: flex;
     align-items: center;
+    cursor: pointer;
   }
   
   i {
diff --git a/components/brave_shields/resources/panel/components/main-panel/index.tsx b/components/brave_shields/resources/panel/components/main-panel/index.tsx
index dc400b8bd2ea..325b89052982 100644
--- a/components/brave_shields/resources/panel/components/main-panel/index.tsx
+++ b/components/brave_shields/resources/panel/components/main-panel/index.tsx
@@ -5,13 +5,12 @@ import Toggle from '../../../../../web-components/toggle'
 import AdvancedControlsContent from '../advanced-controls-content'
 import { getLocale, splitStringForTag } from '../../../../../common/locale'
 import DataContext from '../../state/context'
-import { useFavIconUrl } from '../../state/hooks'
 import getPanelBrowserAPI from '../../api/panel_browser_api'
+import Button from '$web-components/button'
 
 function MainPanel () {
   const [isExpanded, setIsExpanded] = React.useState(false)
   const { siteBlockInfo } = React.useContext(DataContext)
-  const { favIconUrl } = useFavIconUrl(siteBlockInfo?.host)
 
   const braveShieldsStatusText = splitStringForTag(siteBlockInfo?.isShieldsEnabled ? getLocale('braveShieldsUp') : getLocale('braveShieldsDown'))
   const braveShieldsBlockedNote = splitStringForTag(getLocale('braveShieldsBlockedNote'))
@@ -21,17 +20,31 @@ function MainPanel () {
     await getPanelBrowserAPI().dataHandler.setBraveShieldsEnabled(isOn)
   }
 
+  const handleReportSite = async () => {
+    await getPanelBrowserAPI().dataHandler.openWebCompatWindow()
+  }
+
+  const handleLearnMoreClick = () => {
+    chrome.tabs.create({ url: 'https://brave.com/privacy-features/', active: true })
+  }
+
+  const onSettingsClick = () => {
+    chrome.tabs.create({ url: 'chrome://settings/shields', active: true })
+  }
+
   const renderReportSiteOrFootnote = () => {
     if (!siteBlockInfo?.isShieldsEnabled) {
       return (
         <S.ReportSiteBox>
           <p>{getLocale('braveShieldsDownDesc')}</p>
-          <div>
+          <S.ReportSiteAction>
             <span>{getLocale('braveShieldsReportSiteDesc')}</span>
-            <S.ReportSiteButton>
+            <Button
+              onClick={handleReportSite}
+            >
               {getLocale('braveShieldsReportSite')}
-            </S.ReportSiteButton>
-          </div>
+            </Button>
+          </S.ReportSiteAction>
         </S.ReportSiteBox>
       )
     }
@@ -50,7 +63,7 @@ function MainPanel () {
       return (
         <S.AdvancedControlsButton
           type="button"
-          onClick={() => getPanelBrowserAPI().panelHandler.openURL({ url: 'chrome://settings/shields' })}
+          onClick={onSettingsClick}
         >
           <i className="icon-globe">
             <svg width="18" height="18" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fillRule="evenodd" clipRule="evenodd" d="M14.03 11.126a3.191 3.191 0 0 1 3.188 3.186A3.191 3.191 0 0 1 14.03 17.5a3.191 3.191 0 0 1-3.187-3.188 3.191 3.191 0 0 1 3.187-3.186Zm0 1.417c-.227 0-.443.046-.643.125l2.289 2.288c.078-.2.125-.416.125-.644 0-.976-.795-1.77-1.77-1.77Zm0 3.54c.228 0 .444-.046.644-.125l-2.29-2.29c-.078.2-.125.417-.125.644 0 .977.795 1.772 1.771 1.772Z"/><path d="M8.718.5C4.043.5.218 4.325.218 9s3.825 8.5 8.5 8.5h.354a.71.71 0 0 0 .708-.708c0-.355-.354-.638-.708-.638-.708-.92-1.558-2.267-2.054-3.966H8.93c.425 0 .709-.284.709-.709s-.284-.708-.709-.708H6.734c0-.142-.07-.284-.07-.425-.142-1.133-.071-2.054.07-2.975h3.896c.071.637.142 1.346.142 2.054 0 .425.283.708.708.708a.71.71 0 0 0 .709-.708c0-.708 0-1.417-.142-2.125h3.542c.141.496.212 1.063.212 1.63 0 .283 0 .566-.07.85-.072.353.212.708.637.778.354.071.708-.212.779-.637.07-.213.07-.567.07-.921 0-4.675-3.824-8.5-8.5-8.5ZM7.23 2.058c-.566.992-1.275 2.267-1.629 3.896H2.343c.92-1.983 2.762-3.4 4.887-3.896Zm0 13.884c-2.125-.496-3.896-1.913-4.816-3.825H5.6a11.962 11.962 0 0 0 1.63 3.825Zm-1.983-5.525c0 .07 0 .212.07.283h-3.47c-.142-.496-.213-1.133-.213-1.7s.071-1.133.213-1.63h3.471c-.142.922-.213 1.984-.071 3.047Zm3.33-4.463H7.088a12.229 12.229 0 0 1 1.629-3.47c.566.85 1.204 1.983 1.629 3.47h-1.77Zm6.516 0h-3.33c-.424-1.629-1.062-2.975-1.7-3.896 2.196.425 4.109 1.913 5.03 3.896Z"/></svg>
@@ -81,14 +94,14 @@ function MainPanel () {
       <S.HeaderBox>
       <S.SiteTitleBox>
         <S.FavIconBox>
-          <img src={favIconUrl} />
+          <img key={siteBlockInfo?.faviconUrl.url} src={siteBlockInfo?.faviconUrl.url} />
         </S.FavIconBox>
         <S.SiteTitle>{siteBlockInfo?.host}</S.SiteTitle>
       </S.SiteTitleBox>
       <S.CountBox>
         <S.BlockNote>
           {braveShieldsBlockedNote.beforeTag}
-          <a href="#">{braveShieldsBlockedNote.duringTag}</a>
+          <a href="#" onClick={handleLearnMoreClick}>{braveShieldsBlockedNote.duringTag}</a>
           {braveShieldsBlockedNote.afterTag}
         </S.BlockNote>
         <S.BlockCount>{siteBlockInfo?.totalBlockedResources}</S.BlockCount>
diff --git a/components/brave_shields/resources/panel/components/main-panel/style.ts b/components/brave_shields/resources/panel/components/main-panel/style.ts
index 81b7b8a3c4f2..b97fd176904a 100644
--- a/components/brave_shields/resources/panel/components/main-panel/style.ts
+++ b/components/brave_shields/resources/panel/components/main-panel/style.ts
@@ -57,6 +57,7 @@ export const SiteTitle = styled.h1`
   margin: 0;
   overflow: hidden;
   text-align: left;
+  // We truncate long site titles to the left
   direction: rtl;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -162,31 +163,16 @@ export const ReportSiteBox = styled.div`
     margin: 0 0 10px 0;
     color: ${(p) => p.theme.color.warningIcon};
   }
-
-  div {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    span {
-      flex: 1;
-      color: ${(p) => p.theme.color.text03};
-    }
-  }
 `
 
-export const ReportSiteButton = styled.button`
-  --border: 1px solid ${(p) => p.theme.color.divider01};
-  background-color: transparent;
-  border: var(--border);
-  border-radius: 48px;
-  font-weight: 600;
-  font-size: 13px;
-  color: ${(p) => p.theme.color.text01};
-  padding: 7px 12px;
-  
-  &:focus-visible {
-    --border: 1px solid ${(p) => p.theme.color.focusBorder};
+export const ReportSiteAction = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  span {
+    flex: 1;
+    color: ${(p) => p.theme.color.text03};
   }
 `
 
@@ -211,7 +197,7 @@ export const AdvancedControlsButton = styled.button`
   padding: 10px 17px;
   border: var(--border);
   display: grid;
-  grid-template-columns: 24px 1fr 24px;
+  grid-template-columns: 24px 1fr 18px;
   grid-gap: 10px;
   align-items: center;
   text-align: left;
diff --git a/components/brave_shields/resources/panel/components/tree-list/index.tsx b/components/brave_shields/resources/panel/components/tree-list/index.tsx
index aa581020f4b0..ac02b1a2320f 100644
--- a/components/brave_shields/resources/panel/components/tree-list/index.tsx
+++ b/components/brave_shields/resources/panel/components/tree-list/index.tsx
@@ -6,7 +6,7 @@ import { getLocale } from '../../../../../common/locale'
 import TreeNode from './tree-node'
 import { ViewType } from '../../state/component_types'
 import { Url } from 'gen/url/mojom/url.mojom.m.js'
-import { useFavIconUrl } from '../../state/hooks'
+import Button from '$web-components/button'
 
 interface Props {
   data: Url[]
@@ -14,9 +14,15 @@ interface Props {
   blockedCountTitle: string
 }
 
-const groupByOrigin = (data: Url[]) => {
+function groupByOrigin (data: Url[]) {
   const map: Map<string, string[]> = new Map()
 
+  const includesDupeOrigin = (searchOrigin: string) => {
+    const results = data.map(entry => new URL(entry.url).origin)
+      .filter(entry => entry.includes(searchOrigin))
+    return results.length > 1
+  }
+
   data.forEach(entry => {
     const url = new URL(entry.url)
     const origin = url.origin
@@ -27,7 +33,8 @@ const groupByOrigin = (data: Url[]) => {
       return // continue
     }
 
-    map.set(origin, [])
+    // If the origin's full url is the resource itself then we show the full url as parent
+    map.set(includesDupeOrigin(origin) ? origin : url.href.replace(/\/$/, ''), [])
   })
 
   return map
@@ -35,15 +42,14 @@ const groupByOrigin = (data: Url[]) => {
 
 function TreeList (props: Props) {
   const { siteBlockInfo, setViewType } = React.useContext(DataContext)
-  const mappedData = groupByOrigin(props.data)
-  const { favIconUrl } = useFavIconUrl(siteBlockInfo?.host)
+  const mappedData = React.useMemo(() => groupByOrigin(props.data), [props.data])
 
   return (
     <S.Box>
       <S.HeaderBox>
         <S.SiteTitleBox>
           <S.FavIconBox>
-            <img src={favIconUrl} />
+            <img key={siteBlockInfo?.faviconUrl.url} src={siteBlockInfo?.faviconUrl.url} />
           </S.FavIconBox>
           <S.SiteTitle>{siteBlockInfo?.host}</S.SiteTitle>
         </S.SiteTitleBox>
@@ -64,14 +70,13 @@ function TreeList (props: Props) {
         </div>
       </S.TreeBox>
       <S.Footer>
-        <S.BackButton
-          type="button"
+        <Button
           aria-label="Back to previous screen"
           onClick={() => setViewType?.(ViewType.Main)}
         >
           <svg fill="currentColor" viewBox="0 0 32 32" aria-hidden="true"><path d="M28 15H6.28l4.85-5.25a1 1 0 0 0-.05-1.42 1 1 0 0 0-1.41.06l-6.4 6.93a.7.7 0 0 0-.1.16.75.75 0 0 0-.09.15 1 1 0 0 0 0 .74.75.75 0 0 0 .09.15.7.7 0 0 0 .1.16l6.4 6.93a1 1 0 0 0 1.41.06 1 1 0 0 0 .05-1.42L6.28 17H28a1 1 0 0 0 0-2z"/></svg>
           <span>{getLocale('braveShields').replace('Brave ', '').trim()}</span>
-        </S.BackButton>
+        </Button>
       </S.Footer>
     </S.Box>
   )
diff --git a/components/brave_shields/resources/panel/components/tree-list/style.ts b/components/brave_shields/resources/panel/components/tree-list/style.ts
index f8241aa5dc77..0c377142277a 100644
--- a/components/brave_shields/resources/panel/components/tree-list/style.ts
+++ b/components/brave_shields/resources/panel/components/tree-list/style.ts
@@ -21,7 +21,7 @@ export const TreeBox = styled.section`
   background-color: ${(p) => p.theme.color.background02};
   padding: 10px 17px 10px 17px;
   height: calc(100% - 94px - 96px); /* subtract offset top from height of footer */
-  overflow-y: scroll;
+  overflow: auto;
   position: relative;
   z-index: 2;
 `
@@ -32,6 +32,22 @@ export const Footer = styled.section`
   bottom: 0;
   width: 100%;
   z-index: 2;
+
+  button {
+    width: 100%;
+
+    div {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+
+    svg {
+      width: 20px;
+      height: 20px;
+      margin-right: 8px;
+    }
+  }
 `
 
 export const SiteTitleBox = styled.div`
@@ -89,7 +105,7 @@ export const BackButton = styled.button`
 
 export const Grid = styled.div`
   display: grid;
-  grid-template-columns: 20px 2fr 1fr;
+  grid-template-columns: 20px 2fr 0.5fr;
   grid-gap: 5px;
   align-items: center;
   font-family: ${(p) => p.theme.fontFamily.heading};
diff --git a/components/brave_shields/resources/panel/components/tree-list/tree-node.tsx b/components/brave_shields/resources/panel/components/tree-list/tree-node.tsx
index 90c9158d2df1..aa278ca382e0 100644
--- a/components/brave_shields/resources/panel/components/tree-list/tree-node.tsx
+++ b/components/brave_shields/resources/panel/components/tree-list/tree-node.tsx
@@ -47,6 +47,7 @@ const ExpandToggleButton = styled.button`
   height: 14px;
   display: flex;
   align-items: center;
+  cursor: pointer;
 
   &:focus-visible {
     --border: 2px solid ${(p) => p.theme.color.focusBorder};
diff --git a/components/brave_shields/resources/panel/components/tree-list/url-element.tsx b/components/brave_shields/resources/panel/components/tree-list/url-element.tsx
index b2a73354f239..8159ebb24e04 100644
--- a/components/brave_shields/resources/panel/components/tree-list/url-element.tsx
+++ b/components/brave_shields/resources/panel/components/tree-list/url-element.tsx
@@ -25,7 +25,6 @@ const Box = styled.div<BoxProps>`
 
   ${p => p.isHost && css`
     direction: unset;
-    cursor: unset;
     margin-bottom: 12px;
   `}
 
diff --git a/components/brave_shields/resources/panel/state/hooks.ts b/components/brave_shields/resources/panel/state/hooks.ts
index 1bec959f9789..15fbb27a1f13 100644
--- a/components/brave_shields/resources/panel/state/hooks.ts
+++ b/components/brave_shields/resources/panel/state/hooks.ts
@@ -43,19 +43,3 @@ export function useSiteSettingsData () {
 
   return { siteSettings, getSiteSettings }
 }
-
-export function useFavIconUrl (url?: string) {
-  const [favIconUrl, setfavIconUrl] = React.useState<string>()
-
-  React.useEffect(() => {
-    if (!url) return
-    const faviconUrl = new URL('chrome://favicon2/')
-    faviconUrl.searchParams.set('size', '16')
-    faviconUrl.searchParams.set('scale_factor', '2x')
-    faviconUrl.searchParams.set('show_fallback_monogram', '')
-    faviconUrl.searchParams.set('page_url', `https://${url}`)
-    setfavIconUrl(faviconUrl.toString())
-  }, [url])
-
-  return { favIconUrl }
-}
diff --git a/components/brave_shields/resources/panel/stories/component-panel.tsx b/components/brave_shields/resources/panel/stories/component-panel.tsx
index baa28ade77df..080d83289d72 100644
--- a/components/brave_shields/resources/panel/stories/component-panel.tsx
+++ b/components/brave_shields/resources/panel/stories/component-panel.tsx
@@ -26,7 +26,9 @@ const LIST_JS = [
   { 'url': 'https://www.redditstatic.com/desktop2x/Governance~Reddit~Subreddit~reddit-components-BlankPost~reddit-components-ClassicPost~reddit-compone~3b56c92e.14312dc2a044d45449c9.js' },
   { 'url': 'https://www.redditstatic.com/desktop2x/ModListing~PostCreation~Reddit~StandalonePostPage~Subreddit.b725e7ecf5d621c30c53.js' },
   { 'url': 'https://www.redditstatic.com/desktop2x/PostCreation~Reddit~StandalonePostPage~SubredditTopContent~TopWeekPostsDiscoveryUnit~reddit-componen~2583c786.1cc84f65074a696c0941.js' },
-  { 'url': 'https://www.redditstatic.com/desktop2x/PostCreation~Reddit~StandalonePostPage~Subreddit~reddit-components-ClassicPost~reddit-components-Com~82e48dd3.85bb0a8c6be58f085676.js' }]
+  { 'url': 'https://www.redditstatic.com/desktop2x/PostCreation~Reddit~StandalonePostPage~Subreddit~reddit-components-ClassicPost~reddit-components-Com~82e48dd3.85bb0a8c6be58f085676.js' },
+  { 'url': 'https://api.github.com/_private/browser/stats' }
+]
 
 const LIST_ADS = [
   { url: 'ads.brave.com' },
@@ -52,7 +54,8 @@ export default {
           adsList: LIST_ADS,
           jsList: LIST_JS,
           httpRedirectsList: [],
-          fingerprintsList: []
+          fingerprintsList: [],
+          faviconUrl: { url: 'https://brave.com/static-assets/images/brave-favicon.png' }
         },
         siteSettings: {
           adBlockMode: AdBlockMode.ALLOW,
diff --git a/components/brave_shields/resources/panel/stories/locale.ts b/components/brave_shields/resources/panel/stories/locale.ts
index 1868c70fdfd1..e1fc698907a0 100644
--- a/components/brave_shields/resources/panel/stories/locale.ts
+++ b/components/brave_shields/resources/panel/stories/locale.ts
@@ -5,7 +5,7 @@ provideStrings({
   braveShieldsEnable: 'Enable Brave Shields',
   braveShieldsUp: 'Shields are UP $1for$2',
   braveShieldsDown: 'Shields are DOWN $1for$2',
-  braveShieldsBroken: 'If this site seems broken, try Shields down. $1Note: this may reduce Brave privacy protections.$2',
+  braveShieldsBroken: 'If this site seems broken, try Shields down. $1Note: this may reduce Brave\'s privacy protections.$2',
   braveShieldsBlockedNote: 'Trackers, ads, and more blocked $1Learn more$2',
   braveShieldsAdvancedCtrls: 'Advanced Controls',
   braveShieldSettingsDescription: 'Changing these settings might break sites.',
@@ -29,5 +29,5 @@ provideStrings({
   braveShieldsFingerprintingAllowAll: 'Allow all Fingerprinting',
   braveShieldsReportSite: 'Report site',
   braveShieldsReportSiteDesc: 'Tell us if the site wasn\'t working properly with Shields up.',
-  braveShieldsDownDesc: 'You are viewing this site without brave\'s privacy protection'
+  braveShieldsDownDesc: 'You are viewing this site without Brave\'s privacy protection'
 })
diff --git a/components/brave_shields/resources/panel/theme/shields-light.ts b/components/brave_shields/resources/panel/theme/shields-light.ts
index 3623e5a9a5d7..0c21ee97022d 100644
--- a/components/brave_shields/resources/panel/theme/shields-light.ts
+++ b/components/brave_shields/resources/panel/theme/shields-light.ts
@@ -12,7 +12,8 @@
    color: {
      ...defaultTheme.color,
      background03: '#F8F9FA',
-     text01: '#212529'
+     text01: '#212529',
+     warningIcon: '#EA3A0D'
    }
  }
 
diff --git a/components/resources/brave_shields_strings.grdp b/components/resources/brave_shields_strings.grdp
index b0b43a5eb4f8..5be4390aaf2f 100644
--- a/components/resources/brave_shields_strings.grdp
+++ b/components/resources/brave_shields_strings.grdp
@@ -18,7 +18,7 @@
 
   <message name="IDS_BRAVE_SHIELDS_BROKEN" desc="A footnote below the main Shields switch button.">
     If this site seems broken, try Shields down. 
-    <ph name="LINK_BEFORE">$1</ph>Note: this may reduce Brave privacy protections.<ph name="LINK_AFTER">$2</ph>
+    <ph name="LINK_BEFORE">$1</ph>Note: this may reduce Brave's privacy protections.<ph name="LINK_AFTER">$2</ph>
   </message>
 
   <message name="IDS_BRAVE_SHIELDS_BLOCKED_NOTE" desc="Description to convey trackers, advertisement and more are being blocked.">
@@ -114,6 +114,10 @@
   </message>
 
    <message name="IDS_BRAVE_SHIELDS_DOWN_DESC" desc="Tell users the site's Shield is turned off">
-    You are viewing this site without brave's privacy protection
+    You are viewing this site without Brave's privacy protection
+  </message>
+
+  <message name="IDS_BRAVE_SHIELDS_ICON_TOOLTIP" desc="The message shown on hover of the shields lion icon">
+    Brave Shields <ph name="NUMBER">$1</ph> Trackers, ads and more blocked
   </message>
 </grit-part>
diff --git a/components/web-components/select/style.ts b/components/web-components/select/style.ts
index ddecc34dd99d..059f8edfe8f8 100644
--- a/components/web-components/select/style.ts
+++ b/components/web-components/select/style.ts
@@ -23,9 +23,20 @@ export const Select = styled.select`
   color: ${(p) => p.theme.color.text01};
   background-color: ${(p) => p.theme.color.background01};
   border-radius: 4px;
-  border: 0;
+  border: 2px solid transparent;
   width: 100%;
   appearance: none;
+  transition: box-shadow 0.1s ease-in-out;
+
+  &:hover {
+    @media (prefers-color-scheme: dark) {
+      box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.36);
+    }
+
+    @media (prefers-color-scheme: light) {
+      box-shadow: 0px 1px 4px rgba(99, 105, 110, 0.2);
+    }
+  }
 
   &:focus-visible {
     outline: 0;
diff --git a/test/BUILD.gn b/test/BUILD.gn
index e03a4e00c05f..2075f2bc2da9 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -343,6 +343,7 @@ test("brave_unit_tests") {
     deps += [
       "//brave/app:brave_generated_resources_grit",
       "//brave/components/brave_shields/common:mojom",
+      "//components/favicon/content",
     ]
   }