diff --git a/Penumbra/UI/AdvancedWindow/ModEditWindow.Meta.cs b/Penumbra/UI/AdvancedWindow/ModEditWindow.Meta.cs
index 3f19da5e..aa3d9172 100644
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Meta.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Meta.cs
@@ -165,7 +165,7 @@ public partial class ModEditWindow
 
     private void AddFromClipboardButton()
     {
-        if (ImGui.Button("Add from Clipboard"))
+        if (ImUtf8.Button("Add from Clipboard"u8))
         {
             var clipboard = ImGuiUtil.GetClipboardText();
 
@@ -176,13 +176,13 @@ public partial class ModEditWindow
             }
         }
 
-        ImGuiUtil.HoverTooltip(
-            "Try to add meta manipulations currently stored in the clipboard to the current manipulations.\nOverwrites already existing manipulations.");
+        ImUtf8.HoverTooltip(
+            "Try to add meta manipulations currently stored in the clipboard to the current manipulations.\nOverwrites already existing manipulations."u8);
     }
 
     private void SetFromClipboardButton()
     {
-        if (ImGui.Button("Set from Clipboard"))
+        if (ImUtf8.Button("Set from Clipboard"u8))
         {
             var clipboard = ImGuiUtil.GetClipboardText();
             if (MetaApi.ConvertManips(clipboard, out var manips, out _))
@@ -192,7 +192,7 @@ public partial class ModEditWindow
             }
         }
 
-        ImGuiUtil.HoverTooltip(
-            "Try to set the current meta manipulations to the set currently stored in the clipboard.\nRemoves all other manipulations.");
+        ImUtf8.HoverTooltip(
+            "Try to set the current meta manipulations to the set currently stored in the clipboard.\nRemoves all other manipulations."u8);
     }
 }
diff --git a/Penumbra/UI/Tabs/Debug/ShapeInspector.cs b/Penumbra/UI/Tabs/Debug/ShapeInspector.cs
index 9290e52d..3180a212 100644
--- a/Penumbra/UI/Tabs/Debug/ShapeInspector.cs
+++ b/Penumbra/UI/Tabs/Debug/ShapeInspector.cs
@@ -159,7 +159,7 @@ public class ShapeInspector(ObjectManager objects, CollectionResolver resolver)
         if (!treeNode2)
             return;
 
-        using var table = ImUtf8.Table("##shapes"u8, 5, ImGuiTableFlags.RowBg);
+        using var table = ImUtf8.Table("##shapes"u8, 6, ImGuiTableFlags.RowBg);
         if (!table)
             return;
 
@@ -167,6 +167,7 @@ public class ShapeInspector(ObjectManager objects, CollectionResolver resolver)
         ImUtf8.TableSetupColumn("Slot"u8,    ImGuiTableColumnFlags.WidthFixed, 150 * ImUtf8.GlobalScale);
         ImUtf8.TableSetupColumn("Address"u8, ImGuiTableColumnFlags.WidthFixed, UiBuilder.MonoFont.GetCharAdvance('0') * 14);
         ImUtf8.TableSetupColumn("Mask"u8,    ImGuiTableColumnFlags.WidthFixed, UiBuilder.MonoFont.GetCharAdvance('0') * 8);
+        ImUtf8.TableSetupColumn("Count"u8,    ImGuiTableColumnFlags.WidthFixed, 30 * ImUtf8.GlobalScale);
         ImUtf8.TableSetupColumn("Shapes"u8,  ImGuiTableColumnFlags.WidthStretch);
 
         ImGui.TableHeadersRow();
@@ -184,6 +185,7 @@ public class ShapeInspector(ObjectManager objects, CollectionResolver resolver)
             {
                 var mask = model->EnabledShapeKeyIndexMask;
                 ImUtf8.DrawTableColumn($"{mask:X8}");
+                ImUtf8.DrawTableColumn($"{model->ModelResourceHandle->Shapes.Count}");
                 ImGui.TableNextColumn();
                 foreach (var (shape, idx) in model->ModelResourceHandle->Shapes)
                 {
@@ -200,6 +202,7 @@ public class ShapeInspector(ObjectManager objects, CollectionResolver resolver)
             {
                 ImGui.TableNextColumn();
                 ImGui.TableNextColumn();
+                ImGui.TableNextColumn();
             }
         }
     }
@@ -210,7 +213,7 @@ public class ShapeInspector(ObjectManager objects, CollectionResolver resolver)
         if (!treeNode2)
             return;
 
-        using var table = ImUtf8.Table("##attributes"u8, 5, ImGuiTableFlags.RowBg);
+        using var table = ImUtf8.Table("##attributes"u8, 6, ImGuiTableFlags.RowBg);
         if (!table)
             return;
 
@@ -218,6 +221,7 @@ public class ShapeInspector(ObjectManager objects, CollectionResolver resolver)
         ImUtf8.TableSetupColumn("Slot"u8,       ImGuiTableColumnFlags.WidthFixed, 150 * ImUtf8.GlobalScale);
         ImUtf8.TableSetupColumn("Address"u8,    ImGuiTableColumnFlags.WidthFixed, UiBuilder.MonoFont.GetCharAdvance('0') * 14);
         ImUtf8.TableSetupColumn("Mask"u8,       ImGuiTableColumnFlags.WidthFixed, UiBuilder.MonoFont.GetCharAdvance('0') * 8);
+        ImUtf8.TableSetupColumn("Count"u8,      ImGuiTableColumnFlags.WidthFixed, 30 * ImUtf8.GlobalScale);
         ImUtf8.TableSetupColumn("Attributes"u8, ImGuiTableColumnFlags.WidthStretch);
 
         ImGui.TableHeadersRow();
@@ -235,6 +239,7 @@ public class ShapeInspector(ObjectManager objects, CollectionResolver resolver)
             {
                 var mask = model->EnabledAttributeIndexMask;
                 ImUtf8.DrawTableColumn($"{mask:X8}");
+                ImUtf8.DrawTableColumn($"{model->ModelResourceHandle->Attributes.Count}");
                 ImGui.TableNextColumn();
                 foreach (var (attribute, idx) in model->ModelResourceHandle->Attributes)
                 {
@@ -251,6 +256,7 @@ public class ShapeInspector(ObjectManager objects, CollectionResolver resolver)
             {
                 ImGui.TableNextColumn();
                 ImGui.TableNextColumn();
+                ImGui.TableNextColumn();
             }
         }
     }