diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 9de9ecc5e5ac5d94cda1762e2a1c81bea5c10aad..ff7f0611c5a1279ebc0ee4dec62a5566fc03f0fc 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1011,7 +1011,6 @@ impl View for ProjectSearchBar {
                 )
                 .with_child(
                     Flex::row()
-                        // TODO kb better layout
                         .with_child(
                             Flex::row()
                                 .with_child(
diff --git a/crates/workspace/src/toolbar.rs b/crates/workspace/src/toolbar.rs
index c40c88e3a1f4334d606eb8d66f0211e17dab682c..9a0046290157365157b83c9eb544c07a4c003b7a 100644
--- a/crates/workspace/src/toolbar.rs
+++ b/crates/workspace/src/toolbar.rs
@@ -126,6 +126,7 @@ impl View for Toolbar {
 
         let container_style = theme.container;
         let height = theme.height * primary_items_row_count as f32;
+        let nav_button_height = theme.height;
         let button_style = theme.nav_button;
         let tooltip_style = cx.global::<Settings>().theme.tooltip.clone();
 
@@ -135,6 +136,7 @@ impl View for Toolbar {
                     .with_child(nav_button(
                         "icons/arrow_left_16.svg",
                         button_style,
+                        nav_button_height,
                         tooltip_style.clone(),
                         enable_go_backward,
                         spacing,
@@ -163,6 +165,7 @@ impl View for Toolbar {
                     .with_child(nav_button(
                         "icons/arrow_right_16.svg",
                         button_style,
+                        nav_button_height,
                         tooltip_style,
                         enable_go_forward,
                         spacing,
@@ -204,6 +207,7 @@ impl View for Toolbar {
 fn nav_button<A: Action, F: 'static + Fn(&mut Toolbar, &mut ViewContext<Toolbar>)>(
     svg_path: &'static str,
     style: theme::Interactive<theme::IconButton>,
+    nav_button_height: f32,
     tooltip_style: TooltipStyle,
     enabled: bool,
     spacing: f32,
@@ -227,8 +231,9 @@ fn nav_button<A: Action, F: 'static + Fn(&mut Toolbar, &mut ViewContext<Toolbar>
             .with_style(style.container)
             .constrained()
             .with_width(style.button_width)
-            .with_height(style.button_width)
+            .with_height(nav_button_height)
             .aligned()
+            .top()
     })
     .with_cursor_style(if enabled {
         CursorStyle::PointingHand