diff --git a/_machines/ares.yml b/_machines/ares.yml
index a2c5856..b956dd7 100644
--- a/_machines/ares.yml
+++ b/_machines/ares.yml
@@ -3,6 +3,8 @@ font_size_2: 12
 
 gpu: amd
 
+i3bar_icon_padding: " "
+
 users:
 - name: hannes
   vt: 1
diff --git a/_machines/mars.yml b/_machines/mars.yml
index 3304f2d..fbcf8da 100644
--- a/_machines/mars.yml
+++ b/_machines/mars.yml
@@ -1,6 +1,8 @@
 font_size_1: 12
 font_size_2: 9
 
+i3bar_icon_padding: ""
+
 users:
 - name: hannes-work
   group: hannes-work
diff --git a/_machines/neptune.yml b/_machines/neptune.yml
index b9b94e7..d89e445 100644
--- a/_machines/neptune.yml
+++ b/_machines/neptune.yml
@@ -1,6 +1,8 @@
 font_size_1: 12
 font_size_2: 9
 
+i3bar_icon_padding: ""
+
 users:
 - name: hannes-work
   group: hannes-work
diff --git a/dotfiles.yml b/dotfiles.yml
index e5c27c7..4aa4baf 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -29,6 +29,7 @@ dotfiles:
     template: true
   - from: i3/i3status-rust/config.toml
     to: .config/i3status-rust/config.toml
+    template: true
   - from: i3/i3status-rust/themes/native.toml
     to: .config/i3status-rust/themes/native.toml
   - from: i3/i3status-rust/icons/awesome.toml
diff --git a/i3/i3status-rust/config.toml b/i3/i3status-rust/config.toml.j2
similarity index 96%
rename from i3/i3status-rust/config.toml
rename to i3/i3status-rust/config.toml.j2
index 4d1debb..6af7bdf 100644
--- a/i3/i3status-rust/config.toml
+++ b/i3/i3status-rust/config.toml.j2
@@ -1,4 +1,4 @@
-icons_format = " {icon} "
+icons_format = "{{ machine.i3bar_icon_padding }}{icon}{{ machine.i3bar_icon_padding }}"
 
 [icons]
 icons = "awesome"