diff --git a/AetherBags/Nodes/DragDropNode.cs b/AetherBags/Nodes/DragDropNode.cs
index 7eaf992..b7c6bba 100644
--- a/AetherBags/Nodes/DragDropNode.cs
+++ b/AetherBags/Nodes/DragDropNode.cs
@@ -151,28 +151,6 @@
                 }
             }
 
-            public override ReadOnlySeString? Tooltip {
-                get;
-                set {
-                    field = value;
-                    switch (value) {
-                        case { IsEmpty: false } when !TooltipRegistered:
-                            AddEvent(AtkEventType.DragDropRollOver, ShowTooltip);
-                            AddEvent(AtkEventType.DragDropRollOut, HideTooltip);
-
-                            TooltipRegistered = true;
-                            break;
-
-                        case null when TooltipRegistered:
-                            RemoveEvent(AtkEventType.DragDropRollOver, ShowTooltip);
-                            RemoveEvent(AtkEventType.DragDropRollOut, HideTooltip);
-
-                            TooltipRegistered = false;
-                            break;
-                    }
-                }
-            }
-
             private void DragDropInsertHandler(AtkEventListener* thisPtr, AtkEventType eventType, int eventParam, AtkEvent* atkEvent, AtkEventData* atkEventData) {
                 atkEvent->SetEventIsHandled();
 
diff --git a/AetherBags/Nodes/Input/TextInputWithHintNode.cs b/AetherBags/Nodes/Input/TextInputWithHintNode.cs
index 5b7af51..8d84ff2 100644
--- a/AetherBags/Nodes/Input/TextInputWithHintNode.cs
+++ b/AetherBags/Nodes/Input/TextInputWithHintNode.cs
@@ -20,7 +20,7 @@ public class TextInputWithHintNode : SimpleComponentNode {
             TexturePath = "ui/uld/CircleButtons.tex",
             TextureCoordinates = new Vector2(112.0f, 84.0f),
             TextureSize = new Vector2(28.0f, 28.0f),
-            Tooltip = new SeStringBuilder()
+            TextTooltip = new SeStringBuilder()
                 .Append("Supports Regex Search")
                 .AppendNewLine()
                 .Append("Start input with '$' to search by description")
diff --git a/AetherBags/Nodes/Inventory/InventoryCategoryNode.cs b/AetherBags/Nodes/Inventory/InventoryCategoryNode.cs
index bd332bb..a30c507 100644
--- a/AetherBags/Nodes/Inventory/InventoryCategoryNode.cs
+++ b/AetherBags/Nodes/Inventory/InventoryCategoryNode.cs
@@ -5,6 +5,7 @@ using AetherBags.Helpers;
 using AetherBags.Inventory;
 using AetherBags.Nodes.Layout;
 using FFXIVClientStructs.FFXIV.Client.Game;
+using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using KamiToolKit.Classes;
 using KamiToolKit.Nodes;
@@ -74,7 +75,7 @@ public class InventoryCategoryNode : SimpleComponentNode
 
             _categoryNameTextNode.String = _fullHeaderText;
             _categoryNameTextNode.TextColor = value.Category.Color;
-            _categoryNameTextNode.TooltipString = value.Category.Description;
+            _categoryNameTextNode.TextTooltip = value.Category.Description;
 
             UpdateItemGrid();
             RecalculateSize();
@@ -209,7 +210,7 @@ public class InventoryCategoryNode : SimpleComponentNode
             CreateInventoryDragDropNode);
     }
 
-    private InventoryDragDropNode CreateInventoryDragDropNode(ItemInfo data)
+    private unsafe InventoryDragDropNode CreateInventoryDragDropNode(ItemInfo data)
     {
         InventoryItem item = data.Item;
 
@@ -228,16 +229,18 @@ public class InventoryCategoryNode : SimpleComponentNode
             },
             IsClickable = true,
             OnEnd = _ => System.AddonInventoryWindow.ManualInventoryRefresh(),
-            OnPayloadAccepted = (n, p) => OnPayloadAccepted(n, p, data),
-            OnRollOver = n =>
+            OnPayloadAccepted = (node, payload) => OnPayloadAccepted(node, payload, data),
+            OnRollOver = node =>
             {
                 BeginHeaderHover();
-                n.ShowInventoryItemTooltip(item.Container, item.Slot);
+                node.ShowInventoryItemTooltip(item.Container, item.Slot);
             },
-            OnRollOut = n =>
+            OnRollOut = node =>
             {
                 EndHeaderHover();
-                n.HideTooltip();
+
+                ushort addonId = RaptureAtkUnitManager.Instance()->GetAddonByNode(node)->Id;
+                AtkStage.Instance()->TooltipManager.HideTooltip(addonId);
             },
             ItemInfo = data
         };
diff --git a/KamiToolKit b/KamiToolKit
index 6499c4c..9519b07 160000
--- a/KamiToolKit
+++ b/KamiToolKit
@@ -1 +1 @@
-Subproject commit 6499c4c309a912caf260f8d49e511738ed073209
+Subproject commit 9519b07c8db287ef75b7153a5e97c24574e800f2