diff --git a/plugins/available/battery.plugin.bash b/plugins/available/battery.plugin.bash
index 9646b0e7..80ff5bdb 100644
--- a/plugins/available/battery.plugin.bash
+++ b/plugins/available/battery.plugin.bash
@@ -4,20 +4,12 @@ about-plugin 'display info about your battery charge level'
 ac_adapter_connected(){
   if command_exists acpi;
   then
-    acpi -a | grep "on-line"
-    if [[ "$?" -eq 0 ]]; then
-      return 1
-    else
-      return 0
-    fi
+    acpi -a | grep -q "on-line"
+    return $?
   elif command_exists ioreg;
   then
-    local IOREG_OUTPUT=$(ioreg -n AppleSmartBattery -r | grep '"ExternalConnected"' | awk -F'=' '{print $2}')
-    if [[ "$IOREG_OUTPUT" == *"Yes"* ]]; then
-      return 0
-    else
-      return 1
-    fi
+    ioreg -n AppleSmartBattery -r | grep -q '"ExternalConnected" = Yes'
+    return $?
   fi
 }
 
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index 68f7858c..c4833756 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -35,7 +35,7 @@ LAST_STATUS_THEME_PROMPT_COLOR=196
 
 CLOCK_THEME_PROMPT_COLOR=240
 
-BATTERY_AC_CHAR="⚡"
+BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
 BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
 BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
 BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
@@ -153,7 +153,7 @@ function __powerline_battery_prompt {
     else
       color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
     fi
-    ac_adapter_connected && battery_status="${BATTERY_AC_CHAR} ${battery_status}"
+    ac_adapter_connected && battery_status="${BATTERY_AC_CHAR}${battery_status}"
     echo "${battery_status}%|${color}"
   fi
 }