diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs
index b5db5abddd..9eb285f0e7 100644
--- a/crates/collab_ui2/src/collab_titlebar_item.rs
+++ b/crates/collab_ui2/src/collab_titlebar_item.rs
@@ -111,6 +111,8 @@ impl Render for CollabTitlebarItem {
                     // TODO - Add player menu
                     .child(
                         div()
+                            .border()
+                            .border_color(gpui::red())
                             .id("project_owner_indicator")
                             .child(
                                 Button::new("player")
@@ -122,6 +124,8 @@ impl Render for CollabTitlebarItem {
                     // TODO - Add project menu
                     .child(
                         div()
+                            .border()
+                            .border_color(gpui::red())
                             .id("titlebar_project_menu_button")
                             .child(Button::new("project_name").variant(ButtonVariant::Ghost))
                             .tooltip(move |cx| Tooltip::text("Recent Projects", cx)),
@@ -129,6 +133,8 @@ impl Render for CollabTitlebarItem {
                     // TODO - Add git menu
                     .child(
                         div()
+                            .border()
+                            .border_color(gpui::red())
                             .id("titlebar_git_menu_button")
                             .child(
                                 Button::new("branch_name")
diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs
index 8e8a5bf544..1ab35384c9 100644
--- a/crates/ui2/src/components/icon_button.rs
+++ b/crates/ui2/src/components/icon_button.rs
@@ -37,7 +37,7 @@ impl RenderOnce for IconButton {
         };
 
         if self.selected {
-            bg_color = bg_hover_color;
+            bg_color = cx.theme().colors().element_selected;
         }
 
         let mut button = h_stack()
diff --git a/crates/workspace2/src/toolbar.rs b/crates/workspace2/src/toolbar.rs
index 99820581fb..616d70a5a5 100644
--- a/crates/workspace2/src/toolbar.rs
+++ b/crates/workspace2/src/toolbar.rs
@@ -1,6 +1,6 @@
 use crate::ItemHandle;
 use gpui::{
-    AnyView, Div, Entity, EntityId, EventEmitter, ParentElement as _, Render, Styled, View,
+    div, AnyView, Div, Entity, EntityId, EventEmitter, ParentElement as _, Render, Styled, View,
     ViewContext, WindowContext,
 };
 use theme2::ActiveTheme;
@@ -91,6 +91,8 @@ impl Render for Toolbar {
                     .child(
                         // Toolbar left side
                         h_stack()
+                            .border()
+                            .border_color(gpui::red())
                             .p_1()
                             .child(Button::new("crates"))
                             .child(Label::new("/").color(Color::Muted))
@@ -100,8 +102,18 @@ impl Render for Toolbar {
                     .child(
                         h_stack()
                             .p_1()
-                            .child(IconButton::new("buffer-search", Icon::MagnifyingGlass))
-                            .child(IconButton::new("inline-assist", Icon::MagicWand)),
+                            .child(
+                                div()
+                                    .border()
+                                    .border_color(gpui::red())
+                                    .child(IconButton::new("buffer-search", Icon::MagnifyingGlass)),
+                            )
+                            .child(
+                                div()
+                                    .border()
+                                    .border_color(gpui::red())
+                                    .child(IconButton::new("inline-assist", Icon::MagicWand)),
+                            ),
                     ),
             )
             .children(self.items.iter().map(|(child, _)| child.to_any()))