diff --git a/OtterGui b/OtterGui
index 0b5afffd..becacbca 160000
--- a/OtterGui
+++ b/OtterGui
@@ -1 +1 @@
-Subproject commit 0b5afffda19d3e16aec9e8682d18c8f11f67f1c6
+Subproject commit becacbca4f35595d16ff40dc9639cfa24be3461f
diff --git a/Penumbra.GameData b/Penumbra.GameData
index 29b71cf7..fed687b5 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit 29b71cf7b3cc68995d38f0954fa38c4b9500a81d
+Subproject commit fed687b536b7c709484db251b690b8821c5ef403
diff --git a/Penumbra/Services/StaticServiceManager.cs b/Penumbra/Services/StaticServiceManager.cs
index 146d7ee0..0c6648ba 100644
--- a/Penumbra/Services/StaticServiceManager.cs
+++ b/Penumbra/Services/StaticServiceManager.cs
@@ -149,7 +149,6 @@ public static class StaticServiceManager
     private static ServiceManager AddInterface(this ServiceManager services)
         => services.AddSingleton<FileDialogService>()
             .AddSingleton<TutorialService>()
-            .AddSingleton<IncognitoService>()
             .AddSingleton<PenumbraChangelog>()
             .AddSingleton<LaunchButton>()
             .AddSingleton<ConfigWindow>()
@@ -182,7 +181,6 @@ public static class StaticServiceManager
             .AddSingleton<ItemSwapTab>()
             .AddSingleton<ModMergeTab>()
             .AddSingleton<ChangedItemDrawer>()
-            .AddSingleton<ResourceTreeViewerFactory>()
             .AddSingleton(p => new Diagnostics(p));
 
     private static ServiceManager AddModEditor(this ServiceManager services)
diff --git a/Penumbra/UI/AdvancedWindow/ResourceTreeViewer.cs b/Penumbra/UI/AdvancedWindow/ResourceTreeViewer.cs
index 5f376b26..7315f136 100644
--- a/Penumbra/UI/AdvancedWindow/ResourceTreeViewer.cs
+++ b/Penumbra/UI/AdvancedWindow/ResourceTreeViewer.cs
@@ -158,7 +158,7 @@ public class ResourceTreeViewer
         ImGui.SetNextItemWidth(fieldWidth);
         filterChanged |= ImGui.InputTextWithHint("##NodeFilter", "Filter by Item/Part Name or Path...", ref _nodeFilter, 128);
         ImGui.SameLine(0, checkSpacing);
-        _incognito.DrawToggle();
+        _incognito.DrawToggle(ImGui.GetFrameHeightWithSpacing());
 
         if (filterChanged)
             _filterCache.Clear();
diff --git a/Penumbra/UI/AdvancedWindow/ResourceTreeViewerFactory.cs b/Penumbra/UI/AdvancedWindow/ResourceTreeViewerFactory.cs
index 91dab6cb..ea64c0bf 100644
--- a/Penumbra/UI/AdvancedWindow/ResourceTreeViewerFactory.cs
+++ b/Penumbra/UI/AdvancedWindow/ResourceTreeViewerFactory.cs
@@ -1,3 +1,4 @@
+using OtterGui.Services;
 using Penumbra.Interop.ResourceTree;
 
 namespace Penumbra.UI.AdvancedWindow;
@@ -6,7 +7,7 @@ public class ResourceTreeViewerFactory(
     Configuration config,
     ResourceTreeFactory treeFactory,
     ChangedItemDrawer changedItemDrawer,
-    IncognitoService incognito)
+    IncognitoService incognito) : IService
 {
     public ResourceTreeViewer Create(int actionCapacity, Action onRefresh, Action<ResourceNode, Vector2> drawActions)
         => new(config, treeFactory, changedItemDrawer, incognito, actionCapacity, onRefresh, drawActions);
diff --git a/Penumbra/UI/IncognitoService.cs b/Penumbra/UI/IncognitoService.cs
index d4b1828f..d58ea1ec 100644
--- a/Penumbra/UI/IncognitoService.cs
+++ b/Penumbra/UI/IncognitoService.cs
@@ -1,29 +1,26 @@
-using Dalamud.Interface.Utility;
 using Dalamud.Interface;
-using ImGuiNET;
-using OtterGui;
 using Penumbra.UI.Classes;
 using OtterGui.Raii;
+using OtterGui.Services;
+using OtterGui.Text;
 
 namespace Penumbra.UI;
 
-public class IncognitoService(TutorialService tutorial)
+public class IncognitoService(TutorialService tutorial) : IService
 {
     public bool IncognitoMode;
 
-    public void DrawToggle(float? buttonWidth = null)
+    public void DrawToggle(float width)
     {
-        using var style = ImRaii.PushStyle(ImGuiStyleVar.FrameBorderSize, ImGuiHelpers.GlobalScale);
-        using var color = ImRaii.PushColor(ImGuiCol.Text, ColorId.FolderExpanded.Value())
-            .Push(ImGuiCol.Border, ColorId.FolderExpanded.Value());
-        if (ImGuiUtil.DrawDisabledButton(
-                $"{(IncognitoMode ? FontAwesomeIcon.Eye : FontAwesomeIcon.EyeSlash).ToIconString()}###IncognitoMode",
-                new Vector2(buttonWidth ?? ImGui.GetFrameHeightWithSpacing(), ImGui.GetFrameHeight()), string.Empty, false, true))
-            IncognitoMode = !IncognitoMode;
-        var hovered = ImGui.IsItemHovered();
+        var color = ColorId.FolderExpanded.Value();
+        using (ImRaii.PushFrameBorder(ImUtf8.GlobalScale, color))
+        {
+            var tt   = IncognitoMode ? "Toggle incognito mode off."u8 : "Toggle incognito mode on."u8;
+            var icon = IncognitoMode ? FontAwesomeIcon.EyeSlash : FontAwesomeIcon.Eye;
+            if (ImUtf8.IconButton(icon, tt, new Vector2(width, ImUtf8.FrameHeight), false, color))
+                IncognitoMode = !IncognitoMode;
+        }
+
         tutorial.OpenTutorial(BasicTutorialSteps.Incognito);
-        color.Pop(2);
-        if (hovered)
-            ImGui.SetTooltip(IncognitoMode ? "Toggle incognito mode off." : "Toggle incognito mode on.");
     }
 }
diff --git a/Penumbra/UI/ModsTab/Groups/ImcModGroupEditDrawer.cs b/Penumbra/UI/ModsTab/Groups/ImcModGroupEditDrawer.cs
index b10f123c..b129d275 100644
--- a/Penumbra/UI/ModsTab/Groups/ImcModGroupEditDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/ImcModGroupEditDrawer.cs
@@ -118,7 +118,7 @@ public readonly struct ImcModGroupEditDrawer(ModGroupEditDrawer editor, ImcModGr
             : validName
                 ? "Add a new option to this group."u8
                 : "Please enter a name for the new option."u8;
-        if (ImUtf8.IconButton(FontAwesomeIcon.Plus, tt, !validName || dis))
+        if (ImUtf8.IconButton(FontAwesomeIcon.Plus, tt, default, !validName || dis))
         {
             editor.ModManager.OptionEditor.ImcEditor.AddOption(group, cache, name);
             editor.NewOptionName = null;
diff --git a/Penumbra/UI/ModsTab/Groups/MultiModGroupEditDrawer.cs b/Penumbra/UI/ModsTab/Groups/MultiModGroupEditDrawer.cs
index e6701a03..f0275853 100644
--- a/Penumbra/UI/ModsTab/Groups/MultiModGroupEditDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/MultiModGroupEditDrawer.cs
@@ -54,7 +54,7 @@ public readonly struct MultiModGroupEditDrawer(ModGroupEditDrawer editor, MultiM
         var validName = name.Length > 0;
         if (ImUtf8.IconButton(FontAwesomeIcon.Plus, validName
                 ? "Add a new option to this group."u8
-                : "Please enter a name for the new option."u8, !validName))
+                : "Please enter a name for the new option."u8, default, !validName))
         {
             editor.ModManager.OptionEditor.MultiEditor.AddOption(group, name);
             editor.NewOptionName = null;
diff --git a/Penumbra/UI/ModsTab/Groups/SingleModGroupEditDrawer.cs b/Penumbra/UI/ModsTab/Groups/SingleModGroupEditDrawer.cs
index 75fbc63a..be2dbd73 100644
--- a/Penumbra/UI/ModsTab/Groups/SingleModGroupEditDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/SingleModGroupEditDrawer.cs
@@ -59,7 +59,7 @@ public readonly struct SingleModGroupEditDrawer(ModGroupEditDrawer editor, Singl
         var validName = name.Length > 0;
         if (ImUtf8.IconButton(FontAwesomeIcon.Plus, validName
                 ? "Add a new option to this group."u8
-                : "Please enter a name for the new option."u8, !validName))
+                : "Please enter a name for the new option."u8, default, !validName))
         {
             editor.ModManager.OptionEditor.SingleEditor.AddOption(group, name);
             editor.NewOptionName = null;