diff --git a/data/resources/ui/window.blp b/data/resources/ui/window.blp
index ad6ef6c..7a06ec3 100644
--- a/data/resources/ui/window.blp
+++ b/data/resources/ui/window.blp
@@ -17,6 +17,8 @@ template $GeopardWindow: Adw.ApplicationWindow {
 
         Adw.ToastOverlay toast_overlay {
           Adw.ToolbarView toolbar_view {
+            top-bar-style: raised_border;
+            bottom-bar-style: raised_border;
             reveal-bottom-bars: false;
 
             [top]
@@ -164,10 +166,9 @@ template $GeopardWindow: Adw.ApplicationWindow {
               }
 
               [end]
-              Gtk.Button {
-                icon-name: "view-grid-symbolic";
+              Adw.TabButton {
+                view: tab_view;
                 action-name: "overview.open";
-                tooltip-text: _("View Open Tabs");
               }
 
               [end]