diff --git a/modules/battery b/modules/battery
index 901a66e..ba61912 100755
--- a/modules/battery
+++ b/modules/battery
@@ -4,10 +4,10 @@
 
 CHARGING_ICON=' '
 WARNING_ICON=' '
-BATTERY_FULL_ICON=' '
-BATTERY_2_ICON=' '
-BATTERY_3_ICON=' '
-BATTERY_4_ICON=' '
+BATTERY_FULL_ICON=''
+BATTERY_2_ICON=''
+BATTERY_3_ICON=''
+BATTERY_4_ICON=''
 
 FULL_AT=98
 
@@ -37,7 +37,7 @@ get_battery()
 			BAT_ICON=$BATTERY_2_ICON
 		fi
 	fi
-	echo "$ICON $BAT_ICON  $capacity%"
+	echo "$ICON$BAT_ICON  $capacity%"
 }
 
 get_battery
diff --git a/modules/cpuload b/modules/cpuload
index 44a8ff1..133a748 100755
--- a/modules/cpuload
+++ b/modules/cpuload
@@ -26,7 +26,7 @@ get_load()
   cpu_last=("${cpu_now[@]}")
   cpu_last_sum=$cpu_sum
 
-  echo "$PREFIX$cpu_usage%"
+  echo "$PREFIX $cpu_usage%"
 }
 
 get_load
diff --git a/modules/mpd b/modules/mpd
index 5db0d64..67c319f 100755
--- a/modules/mpd
+++ b/modules/mpd
@@ -5,20 +5,20 @@ PREFIX_PAUSE=' '
 
 get_mpd()
 {
-	current_song=$(mpc current)
+	current_song="$(mpc current)"
 
 	if [[ "$current_song" = "" ]]; then
 		exit 0
 	else
 		playpause=$(mpc | awk '/\[.*]/{split($0, a, " "); print a[1]}')
 		if [[ "$playpause" = "[playing]" ]]; then
-			current_song=$PREFIX_PLAY$current_song
+			current_song="$PREFIX_PLAY $current_song"
 		elif [[ "$playpause" = "[paused]" ]]; then
-			current_song=$PREFIX_PAUSE$current_song
+			current_song="$PREFIX_PAUSE $current_song"
 		fi
 	fi
 
-	echo $current_song
+	echo "$current_song"
 }
 
 get_mpd