From cee7393e1e800146fa338765bb3e89c7781eb8c6 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 28 Jan 2026 11:33:48 -0800
Subject: [PATCH] address Pankaj's feedback

---
 src/cascadia/TerminalSettingsEditor/IconPicker.h           | 1 +
 .../TerminalSettingsEditor/NewTabMenuViewModel.cpp         | 7 +++----
 src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/IconPicker.h b/src/cascadia/TerminalSettingsEditor/IconPicker.h
index 353b3c3db8..69de013d5d 100644
--- a/src/cascadia/TerminalSettingsEditor/IconPicker.h
+++ b/src/cascadia/TerminalSettingsEditor/IconPicker.h
@@ -15,6 +15,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     public:
         IconPicker();
 
+        static constexpr std::wstring_view HideIconValue{ L"none" };
         static Windows::UI::Xaml::Controls::IconSource BuiltInIconConverter(const Windows::Foundation::IInspectable& iconVal);
         static Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> BuiltInIcons() noexcept;
         static Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconTypes() noexcept;
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
index 4e72273430..7d5b4eff96 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "NewTabMenuViewModel.h"
+#include "IconPicker.h"
 
 #include "NewTabMenuViewModel.g.cpp"
 #include "FolderTreeViewEntry.g.cpp"
@@ -22,8 +23,6 @@ using namespace winrt::Windows::UI::Xaml::Data;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    static constexpr std::wstring_view HideIconValue{ L"none" };
-
     static IObservableVector<Editor::NewTabMenuEntryViewModel> _ConvertToViewModelEntries(const IVector<Model::NewTabMenuEntry>& settingsModelEntries, const Model::CascadiaSettings& settings)
     {
         std::vector<Editor::NewTabMenuEntryViewModel> result{};
@@ -262,7 +261,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         if (_CurrentFolder && _CurrentFolder.Icon() != path)
         {
             _CurrentFolder.Icon(path);
-            _NotifyChanges(L"CurrentFolderIconPath", L"CurrentFolderIconPreview", L"UsingNoIcon");
+            _NotifyChanges(L"CurrentFolderIconPreview", L"CurrentFolderLocalizedIcon", L"CurrentFolderIconPath", L"CurrentFolderUsingNoIcon");
         }
     }
 
@@ -273,7 +272,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             return false;
         }
         const auto icon{ _CurrentFolder.Icon() };
-        return icon.empty() || icon == HideIconValue;
+        return icon.empty() || icon == IconPicker::HideIconValue;
     }
 
     Windows::Foundation::Collections::IObservableVector<Editor::NewTabMenuEntryViewModel> NewTabMenuViewModel::CurrentView() const
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
index 1553bde34a..661d077b7e 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
@@ -6,6 +6,7 @@
 #include "ProfileViewModel.g.cpp"
 #include "Appearances.h"
 #include "EnumEntry.h"
+#include "IconPicker.h"
 
 #include "../WinRTUtils/inc/Utils.h"
 #include "../../renderer/base/FontCache.h"
@@ -22,7 +23,6 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    static constexpr std::wstring_view HideIconValue{ L"none" };
     static Editor::Font fontObjectForDWriteFont(IDWriteFontFamily* family, const wchar_t* locale);
 
     Windows::Foundation::Collections::IObservableVector<Editor::Font> ProfileViewModel::_MonospaceFontList{ nullptr };
@@ -568,7 +568,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     bool ProfileViewModel::UsingNoIcon() const noexcept
     {
         const auto iconPath{ IconPath() };
-        return iconPath.empty() || iconPath == HideIconValue;
+        return iconPath.empty() || iconPath == IconPicker::HideIconValue;
     }
 
     hstring ProfileViewModel::BellStylePreview() const