diff --git a/mise/config-test.toml b/mise/config-test.toml
index a5b0e05..3f4b4bd 100644
--- a/mise/config-test.toml
+++ b/mise/config-test.toml
@@ -14,7 +14,6 @@ zig = 'latest'
 
 ## NPM packages
 "npm:@anthropic-ai/claude-code" = "latest"
-"npm:@github/copilot" = "latest"
 "npm:@githubnext/github-copilot-cli" = "latest"
 "npm:@mermaid-js/mermaid-cli" = "latest"
 "npm:corepack" = "latest"
diff --git a/mise/config.toml b/mise/config.toml
index 195f2eb..ec431a0 100644
--- a/mise/config.toml
+++ b/mise/config.toml
@@ -15,7 +15,6 @@ zig = 'latest'
 
 ## NPM packages
 "npm:@anthropic-ai/claude-code" = "latest"
-"npm:@github/copilot" = "latest"
 "npm:@githubnext/github-copilot-cli" = "latest"
 "npm:@mermaid-js/mermaid-cli" = "latest"
 "npm:corepack" = "latest"
diff --git a/tmux/post-catppuccin.conf b/tmux/post-catppuccin.conf
index 48a881f..bb5f216 100644
--- a/tmux/post-catppuccin.conf
+++ b/tmux/post-catppuccin.conf
@@ -1,5 +1,6 @@
-# Custom battery module using battery_hearts - override the template to use #() at render time
-set -g @catppuccin_status_battery "#[fg=#{E:@thm_lavender}]#{@_ctp_connect_style}#{@catppuccin_status_left_separator}#[fg=#{E:@thm_crust},bg=#{E:@thm_lavender}]󰁹 #{@catppuccin_status_middle_separator}#[fg=#{E:@thm_red},bg=#{E:@catppuccin_status_module_text_bg}] #(battery_hearts)#[fg=#{E:@catppuccin_status_module_text_bg}]#{@_ctp_connect_style}#{@catppuccin_status_right_separator}"
+# Custom battery module using battery_hearts - conditionally show only if hearts are present
+set -g @battery_bar_content "#[fg=#{E:@thm_lavender}]#{@_ctp_connect_style}#{@catppuccin_status_left_separator}#[fg=#{E:@thm_crust},bg=#{E:@thm_lavender}]󰁹 #{@catppuccin_status_middle_separator}#[fg=#{E:@thm_red},bg=#{E:@catppuccin_status_module_text_bg}] #(battery_hearts)#[fg=#{E:@catppuccin_status_module_text_bg}]#{@_ctp_connect_style}#{@catppuccin_status_right_separator}"
+set -g @catppuccin_status_battery "#{?#(battery_hearts | xargs),#{E:@battery_bar_content},}"
 
 # Load outdated packages module if catppuccin is available
 if-shell '[ -f ~/.config/tmux/plugins/tmux/utils/status_module.conf ]' \
diff --git a/tmux/tmux-nerd-font-window-name.yml b/tmux/tmux-nerd-font-window-name.yml
index 78ea2ff..6f6813c 100644
--- a/tmux/tmux-nerd-font-window-name.yml
+++ b/tmux/tmux-nerd-font-window-name.yml
@@ -3,16 +3,5 @@ config:
   show-name: true
   icon-position: "left"
 icons:
-  bat: "󰭟"
-  btm: ""
-  console: "󰞷"
-  gitui: ""
-  gh: ""
-  gping: ""
-  jj: ""
-  lazygit: ""
-  lazyjj: ""
-  nvim: ""
+  copilot: ""
   mise: "󱌣"
-  tickrs: ""
-  unicorn: "󱗃"