diff --git a/crates/theme/src/lib.rs b/crates/theme/src/lib.rs
index 1a484c6db7720510e094fd33eb986251fd1b64a4..431937cc7e4ea3a01d63225a884e25b62c28c16f 100644
--- a/crates/theme/src/lib.rs
+++ b/crates/theme/src/lib.rs
@@ -42,6 +42,7 @@ pub struct Workspace {
 pub struct Titlebar {
     #[serde(flatten)]
     pub container: ContainerStyle,
+    pub height: f32,
     pub title: TextStyle,
     pub avatar_width: f32,
     pub offline_icon: OfflineIcon,
diff --git a/crates/workspace/src/lib.rs b/crates/workspace/src/lib.rs
index a9bcd8261992ebeefa0307ba545d105f8f7b41c8..0f636c23eb0648690d47d6badb05b4213e930d3e 100644
--- a/crates/workspace/src/lib.rs
+++ b/crates/workspace/src/lib.rs
@@ -984,7 +984,7 @@ impl Workspace {
             .with_style(theme.workspace.titlebar.container)
             .boxed(),
         )
-        .with_height(32.)
+        .with_height(theme.workspace.titlebar.height)
         .named("titlebar")
     }
 
diff --git a/crates/zed/assets/themes/_base.toml b/crates/zed/assets/themes/_base.toml
index dca2e0602898f6aa2cafeff0deea0429b597345b..40868262fb489a1d95e3762c3aa99a6590c3b6cf 100644
--- a/crates/zed/assets/themes/_base.toml
+++ b/crates/zed/assets/themes/_base.toml
@@ -6,9 +6,10 @@ background = "$surface.0"
 pane_divider = { width = 1, color = "$border.0" }
 
 [workspace.titlebar]
+height = 32
 border = { width = 1, bottom = true, color = "$border.0" }
 title = "$text.0"
-avatar_width = 20
+avatar_width = 18
 icon_color = "$text.2.color"
 avatar = { corner_radius = 10, border = { width = 1, color = "#00000088" } }
 outdated_warning = { extends = "$text.2", size = 13 }
@@ -46,7 +47,7 @@ background = "$surface.1"
 text = "$text.0"
 
 [workspace.sidebar]
-width = 32
+width = 30
 border = { right = true, width = 1, color = "$border.0" }
 
 [workspace.sidebar.resize_handle]
@@ -149,7 +150,7 @@ color = "$text.1.color"
 [contacts_panel]
 extends = "$panel"
 host_row_height = 28
-host_avatar = { corner_radius = 10, width = 20 }
+host_avatar = { corner_radius = 10, width = 18 }
 host_username = { extends = "$text.0", padding.left = 8 }
 tree_branch_width = 1
 tree_branch_color = "$surface.2"
@@ -157,7 +158,7 @@ tree_branch_color = "$surface.2"
 [contacts_panel.worktree]
 height = 24
 padding = { left = 8 }
-guest_avatar = { corner_radius = 8, width = 16 }
+guest_avatar = { corner_radius = 8, width = 14 }
 guest_avatar_spacing = 4
 
 [contacts_panel.worktree.name]