diff --git a/assets/themes/cave-dark.json b/assets/themes/cave-dark.json
index a60802ac65c91af8f3a310de6ca5c5d976740d64..4b53480c7956768c91cc36108d00c7eff2e43309 100644
--- a/assets/themes/cave-dark.json
+++ b/assets/themes/cave-dark.json
@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#26232a",
       "padding": {
diff --git a/assets/themes/cave-light.json b/assets/themes/cave-light.json
index b18509d2a961b8b799b34fea49d9de901f831f68..54e4e6eac841ba2dac9b98d6644dffa3b4a50ed2 100644
--- a/assets/themes/cave-light.json
+++ b/assets/themes/cave-light.json
@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#e2dfe7",
       "padding": {
diff --git a/assets/themes/dark.json b/assets/themes/dark.json
index 3a8b5cfa9f1480ac1f21da977de6191c2cd0912c..91b0e57ac2450859809467921baab4c0a4ac93d3 100644
--- a/assets/themes/dark.json
+++ b/assets/themes/dark.json
@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#2b2b2b",
       "padding": {
diff --git a/assets/themes/light.json b/assets/themes/light.json
index 80d755a4d90f97f624f8d6cb0118c56d0d9c01b6..b66a8fe9ec7fc33f9aa5dc7d40bc20317c5b3918 100644
--- a/assets/themes/light.json
+++ b/assets/themes/light.json
@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#eaeaea",
       "padding": {
diff --git a/assets/themes/solarized-dark.json b/assets/themes/solarized-dark.json
index f494774ebffdde944957fd50bcedc2962f7885d3..92d340a9b44a179742dc0972528a633bed58dfe2 100644
--- a/assets/themes/solarized-dark.json
+++ b/assets/themes/solarized-dark.json
@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#073642",
       "padding": {
diff --git a/assets/themes/solarized-light.json b/assets/themes/solarized-light.json
index 201d87bb9d7d1c2cd5955cade180ed1bde454873..ee5acf2712fed50742083c72340cf3769f360e96 100644
--- a/assets/themes/solarized-light.json
+++ b/assets/themes/solarized-light.json
@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#eee8d5",
       "padding": {
diff --git a/assets/themes/sulphurpool-dark.json b/assets/themes/sulphurpool-dark.json
index b79eb48b643225bce08d89762ec2811fd9c7e774..7ae3c8870313fd5a192392199aea94f100ed8814 100644
--- a/assets/themes/sulphurpool-dark.json
+++ b/assets/themes/sulphurpool-dark.json
@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#293256",
       "padding": {
diff --git a/assets/themes/sulphurpool-light.json b/assets/themes/sulphurpool-light.json
index 5e7fabc2868e892ff7d7507c37666afa7ea14237..69eb194e3ce57d4a23c0bb60e491607b65d3cc04 100644
--- a/assets/themes/sulphurpool-light.json
+++ b/assets/themes/sulphurpool-light.json
@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#dfe2f1",
       "padding": {
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index 45f7dcf5dbc3eb03eb794da2549ea7a1b92eb105..c0959a0e5e89b03fb972ecb0b1c431012f66878d 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -53,6 +53,7 @@ pub struct Titlebar {
     pub height: f32,
     pub title: TextStyle,
     pub avatar_width: f32,
+    pub avatar_margin: f32,
     pub avatar_ribbon: AvatarRibbon,
     pub offline_icon: OfflineIcon,
     pub share_icon: Interactive<ShareIcon>,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index f3fe7e3c028cb30ac2be2f1390c1db66eccd5319..d072c515503edb02ad6f52d9c55c87ca850d02d8 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1629,7 +1629,7 @@ impl Workspace {
             .constrained()
             .with_width(theme.workspace.titlebar.avatar_width)
             .contained()
-            .with_margin_left(2.)
+            .with_margin_left(theme.workspace.titlebar.avatar_margin)
             .boxed();
 
         if let Some(peer_id) = peer_id {
diff --git a/styles/src/styleTree/workspace.ts b/styles/src/styleTree/workspace.ts
index 0a9b55078b75a8cf4074bf8e8986cfb6f9d92abb..f74715ac0b928d3162a526e3b3ee18617e7efd37 100644
--- a/styles/src/styleTree/workspace.ts
+++ b/styles/src/styleTree/workspace.ts
@@ -61,6 +61,7 @@ export default function workspace(theme: Theme) {
     statusBar: statusBar(theme),
     titlebar: {
       avatarWidth: 18,
+      avatarMargin: 8,
       height: 33,
       background: backgroundColor(theme, 100),
       padding: {