diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh
index 7c68d679..624db57d 100644
--- a/config/p10k-classic.zsh
+++ b/config/p10k-classic.zsh
@@ -692,16 +692,12 @@ fi
   # Show battery in red when it's below this level and not connected to power supply.
   typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20
   typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160
-  # Show battery in green when it's charging.
-  typeset -g POWERLEVEL9K_BATTERY_CHARGING_FOREGROUND=70
-  # Show battery in yellow when not connected to power supply.
+  # Show battery in green when it's charging or fully charged.
+  typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=70
+  # Show battery in yellow when it's discharging.
   typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178
   # Battery pictograms going from low to high level of charge.
-  typeset -g POWERLEVEL9K_BATTERY_STAGES='▁▂▃▄▅▆▇'
-  # Display battery pictogram without background.
-  typeset -g POWERLEVEL9K_BATTERY_VISUAL_IDENTIFIER_EXPANSION='%k${P9K_VISUAL_IDENTIFIER}'
-  # Don't show battery when it's fully charged and connected to power supply.
-  typeset -g POWERLEVEL9K_BATTERY_CHARGED_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION=
+  typeset -g POWERLEVEL9K_BATTERY_STAGES=('%K{232}▁' '%K{232}▂' '%K{232}▃' '%K{232}▄' '%K{232}▅' '%K{232}▆' '%K{232}▇' '%K{232}█')
   # Don't show the remaining time to charge/discharge.
   typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false
 
diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh
index db57a11a..0d30ef42 100644
--- a/config/p10k-lean.zsh
+++ b/config/p10k-lean.zsh
@@ -672,16 +672,12 @@ fi
   # Show battery in red when it's below this level and not connected to power supply.
   typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20
   typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160
-  # Show battery in green when it's charging.
-  typeset -g POWERLEVEL9K_BATTERY_CHARGING_FOREGROUND=70
-  # Show battery in yellow when not connected to power supply.
+  # Show battery in green when it's charging or fully charged.
+  typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=70
+  # Show battery in yellow when it's discharging.
   typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178
   # Battery pictograms going from low to high level of charge.
-  typeset -g POWERLEVEL9K_BATTERY_STAGES='▁▂▃▄▅▆▇'
-  # Display battery pictogram on black background.
-  typeset -g POWERLEVEL9K_BATTERY_VISUAL_IDENTIFIER_EXPANSION='%K{232}${P9K_VISUAL_IDENTIFIER}%k'
-  # Don't show battery when it's fully charged and connected to power supply.
-  typeset -g POWERLEVEL9K_BATTERY_CHARGED_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION=
+  typeset -g POWERLEVEL9K_BATTERY_STAGES=('%K{232}▁' '%K{232}▂' '%K{232}▃' '%K{232}▄' '%K{232}▅' '%K{232}▆' '%K{232}▇' '%K{232}█')
   # Don't show the remaining time to charge/discharge.
   typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false
 
diff --git a/internal/wizard.zsh b/internal/wizard.zsh
index d8e251ce..7210a318 100755
--- a/internal/wizard.zsh
+++ b/internal/wizard.zsh
@@ -1227,9 +1227,13 @@ function generate_config() {
     uncomment 'typeset -g POWERLEVEL9K_VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION'
     uncomment 'typeset -g POWERLEVEL9K_ANACONDA_VISUAL_IDENTIFIER_EXPANSION'
     uncomment 'typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION'
-    sub VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION '🐍'
-    sub ANACONDA_VISUAL_IDENTIFIER_EXPANSION '🐍'
-    sub PYENV_VISUAL_IDENTIFIER_EXPANSION '🐍'
+    sub VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION "'🐍'"
+    sub ANACONDA_VISUAL_IDENTIFIER_EXPANSION "'🐍'"
+    sub PYENV_VISUAL_IDENTIFIER_EXPANSION "'🐍'"
+  fi
+
+  if [[ $POWERLEVEL9K_MODE == nerdfont-complete ]]; then
+    sub BATTERY_STAGES "\$'\uf58d\uf579\uf57a\uf57b\uf57c\uf57d\uf57e\uf57f\uf580\uf581\uf578'"
   fi
 
   if [[ $style == classic ]]; then