diff --git a/Dalamud.Injector/Dalamud.Injector.csproj b/Dalamud.Injector/Dalamud.Injector.csproj
index 125223bf4..cc518df7a 100644
--- a/Dalamud.Injector/Dalamud.Injector.csproj
+++ b/Dalamud.Injector/Dalamud.Injector.csproj
@@ -14,10 +14,10 @@
     </PropertyGroup>
     <PropertyGroup Label="Feature">
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <AssemblyVersion>5.2.3.6</AssemblyVersion>
-        <FileVersion>5.2.3.6</FileVersion>
+        <AssemblyVersion>5.2.3.7</AssemblyVersion>
+        <FileVersion>5.2.3.7</FileVersion>
         <Description>XIVLauncher addon injection</Description>
-        <Version>5.2.3.6</Version>
+        <Version>5.2.3.7</Version>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
         <DocumentationFile></DocumentationFile>
diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index f0c4df9fb..c6f76833d 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -15,9 +15,9 @@
     </PropertyGroup>
     <PropertyGroup Label="Feature">
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <AssemblyVersion>5.2.3.6</AssemblyVersion>
-        <Version>5.2.3.6</Version>
-        <FileVersion>5.2.3.6</FileVersion>
+        <AssemblyVersion>5.2.3.7</AssemblyVersion>
+        <Version>5.2.3.7</Version>
+        <FileVersion>5.2.3.7</FileVersion>
     </PropertyGroup>
     <ItemGroup Label="Resources">
         <None Include="$(SolutionDir)/Resources/**/*" CopyToOutputDirectory="PreserveNewest" Visible="false" />
diff --git a/Dalamud/Fools2021.cs b/Dalamud/Fools2021.cs
index a1d4a483a..33686609e 100644
--- a/Dalamud/Fools2021.cs
+++ b/Dalamud/Fools2021.cs
@@ -111,6 +111,7 @@ namespace Dalamud
             ImGui.Begin("Tippy AI debug");
 
             ImGui.Text("State: " + this.tippyState);
+            ImGui.Text("Logic: " + this.tippyLogicTimer.ElapsedMilliseconds);
 
             foreach (var tippyAnimData in this.tippyAnimDatas)
             {
@@ -135,7 +136,7 @@ namespace Dalamud
             if (ImGui.Button("SetNewTip"))
                 SetNewTip();
 
-            foreach (var lastGeneralTip in this.lastGeneralTips) {
+            foreach (var lastGeneralTip in this.lastTips) {
                 ImGui.Text(lastGeneralTip);
             }
 
@@ -344,7 +345,7 @@ namespace Dalamud
 
             switch (tippyState) {
                 case TippyState.Tips:
-                    if (this.tippyLogicTimer.ElapsedMilliseconds > 600000 && string.IsNullOrEmpty(this.tippyText)) // New tip every 10 minutes
+                    if (this.tippyLogicTimer.ElapsedMilliseconds > 900000 && string.IsNullOrEmpty(this.tippyText)) // New tip every 15 minutes
                         SetNewTip();
                     break;
                 case TippyState.Timeout:
@@ -372,7 +373,9 @@ namespace Dalamud
 
             ImGui.PushFont(InterfaceManager.FoolsFont);
 
-            if (!string.IsNullOrEmpty(this.tippyText) && !ShouldHide)
+            var shouldDraw = this.tippyAnim != TippyAnimState.Idle;
+
+            if (!string.IsNullOrEmpty(this.tippyText) && !ShouldHide && shouldDraw)
             {
                 DrawTextBox(this.tippyText);
             }
@@ -382,7 +385,7 @@ namespace Dalamud
             ImGui.SetCursorPosX(230);
             ImGui.SetCursorPosY(18 + 55);
 
-            if (!ShouldHide)
+            if (!ShouldHide && shouldDraw)
                 DrawTippyAnim();
 
             ImGui.End();
@@ -391,7 +394,7 @@ namespace Dalamud
 
             ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 0, 0, 1));
 
-            if (this.showTippyButton && !ShouldHide) {
+            if (this.showTippyButton && !ShouldHide && shouldDraw) {
                 ImGui.SetNextWindowPos(tippyPos + new Vector2(117, 117), ImGuiCond.Always);
                 ImGui.SetNextWindowSize(new Vector2(95, 40), ImGuiCond.Always);
                 //ImGui.SetNextWindowFocus();