diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 6864f3c3..b49d91df 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -39,7 +39,7 @@ fi
 polybar -r alpha & 				# Simple bar
 
 ## bspwm GENERAL CONFIGURATION
-bspc monitor -d			1 2 3 4 5 6 7 8 9 10
+bspc monitor -d			1 2 3 4 5 6 7 8
 
 bspc config border_width	4
 bspc config window_gap		10
diff --git a/.config/polybar/config b/.config/polybar/config
index df77dbc9..e4d41328 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -141,12 +141,10 @@ ws-icon-3 = 4;
 ws-icon-4 = 5;
 ws-icon-5 = 6;
 ws-icon-6 = 7;
-ws-icon-7 = 8;
-ws-icon-8 = 9;
-ws-icon-9 = 10;
+ws-icon-7 = 8;
 ws-icon-default = 
 
-label-focused = %name%
+label-focused = %icon%
 label-focused-padding = ${res/config.padding}
 label-focused-foreground = ${res/colors.background}
 label-focused-background = ${res/colors.secondary}
@@ -166,8 +164,8 @@ label-urgent-padding = ${self.label-focused-padding}
 label-urgent-foreground = ${res/colors.alert}
 label-urgent-background = ${res/colors.background}
 
-label-empty = 
-label-empty-padding = 0
+label-empty = ${self.label-focused}
+label-empty-padding = ${self.label-focused-padding}
 label-empty-foreground = ${res/colors.background-4}
 label-empty-background = ${res/colors.background}