diff --git a/i3/.config/i3/app-icons.json b/i3/.config/i3/app-icons.json
new file mode 100644
index 0000000..5991aec
--- /dev/null
+++ b/i3/.config/i3/app-icons.json
@@ -0,0 +1,10 @@
+{
+    "firefox": "firefox",
+    "qutebrowser": "globe",
+    "kitty": "terminal",
+    "emacs": "edit",
+    "nautilus": "folder-open",
+    "ripcord": "comment",
+    "calibre": "book",
+    "evince": "file-pdf"
+}
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 2e6eb78..3d39176 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -106,42 +106,30 @@ bindsym $mod+a focus parent
 # focus the child container
 bindsym $mod+d focus child
 
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-set $ws1 1
-set $ws2 2
-set $ws3 3
-set $ws4 4
-set $ws5 5
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
 # switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
+#
+bindsym $mod+1 workspace number 1
+bindsym $mod+2 workspace number 2
+bindsym $mod+3 workspace number 3
+bindsym $mod+4 workspace number 4
+bindsym $mod+5 workspace number 5
+bindsym $mod+6 workspace number 6
+bindsym $mod+7 workspace number 7
+bindsym $mod+8 workspace number 8
+bindsym $mod+9 workspace number 9
+bindsym $mod+0 workspace number 10
 
 # move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10; workspace $ws10
+bindsym $mod+Shift+1 move container to workspace number 1
+bindsym $mod+Shift+2 move container to workspace number 2
+bindsym $mod+Shift+3 move container to workspace number 3
+bindsym $mod+Shift+4 move container to workspace number 4
+bindsym $mod+Shift+5 move container to workspace number 5
+bindsym $mod+Shift+6 move container to workspace number 6
+bindsym $mod+Shift+7 move container to workspace number 7
+bindsym $mod+Shift+8 move container to workspace number 8
+bindsym $mod+Shift+9 move container to workspace number 9
+bindsym $mod+Shift+0 move container to workspace number 10
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -259,7 +247,14 @@ bindsym XF86Search exec ~/.config/i3/bright.sh 1 # decrease screen brightness
 
 bindsym XF86Explorer exec arandr
 
-assign [class="Emacs"] $ws1
-assign [class="qutebrowser"] $ws2
-assign [class="kitty"] $ws3
-assign [class="Ripcord"] $ws4
+assign [class="Emacs"] number 1
+assign [class="qutebrowser"] number 2
+assign [class="kitty"] number 3
+assign [class="Ripcord"] number 4
+assign [class="Firefox"] number 4
+assign [class="calibre"] number 5
+assign [class="evince"] number 5
+
+
+# Add names to workspaces
+exec_always --no-startup-id exec i3-workspace-names-daemon