@@ -32,7 +32,7 @@ $IS_DARK \
   && setenv BAT_THEME              "Catppuccin Mocha"
 setenv BOB_BIN                     "$HOME/.local/share/bob/nvim-bin"
 setenv CLICOLOR                    1
-setenv COMMAND_LABEL_SUBSTITUTIONS "nono-with-local-path=oc opencode=oc"
+setenv COMMAND_LABEL_SUBSTITUTIONS "nono-with-local-path=oc opencode=oc fish=󰈺 vim= nvim="
 setenv DISABLE_TELEMETRY           1
 setenv DBX_ASSEMBLE_DEFAULT        "$HOME/.config/distrobox/assemble.ini"
 setenv DBX_DEFAULT                 "f"
 
@@ -35,7 +35,7 @@ function __herdr_dynamic_title_preexec \
         if not set -q __herdr_dynamic_title_restore_label
             set -g __herdr_dynamic_title_restore_label shell
             if set -q SHELL
-                set -g __herdr_dynamic_title_restore_label (path basename -- "$SHELL")
+                set -g __herdr_dynamic_title_restore_label (_herdr_command_label (string join ' ' --  (path basename -- "$SHELL")))
             end
         end
 
 
@@ -28,9 +28,11 @@ function _herdr_command_label \
         switch $word
             case command builtin exec env sudo
                 continue
-            case nono nono-with-local-path nntd
+            case nono nono-with-local-path
                 set skip_nono_wrap true
                 continue
+            case nntd
+                continue
             case '*=*'
                 continue
             case '-*'