diff --git a/styles/less/ux/tooltip/tooltip.less b/styles/less/ux/tooltip/tooltip.less
index 88f8e52d..0f85cb50 100644
--- a/styles/less/ux/tooltip/tooltip.less
+++ b/styles/less/ux/tooltip/tooltip.less
@@ -50,8 +50,10 @@ aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip) {
 
     .tags {
         display: flex;
-        gap: 10px;
+        gap: 5px 10px;
         padding-bottom: 16px;
+        flex-wrap: wrap;
+        justify-content: center;
 
         .tag {
             display: flex;
@@ -142,7 +144,7 @@ aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip) {
 }
 
 aside[role='tooltip'].locked-tooltip:has(div.daggerheart.dh-style.tooltip) {
-    box-shadow: 0 0 20px @golden-90;
+    box-shadow: 0 0 25px @golden-90;
 }
 
 .theme-light #tooltip:has(div.daggerheart.dh-style.tooltip),
@@ -151,7 +153,7 @@ aside[role='tooltip'].locked-tooltip:has(div.daggerheart.dh-style.tooltip) {
 }
 
 .theme-light aside[role='tooltip'].locked-tooltip:has(div.daggerheart.dh-style.tooltip) {
-    box-shadow: 0 0 20px @dark-blue-90;
+    box-shadow: 0 0 25px @dark-blue-90;
 }
 
 #tooltip,
diff --git a/templates/ui/tooltip/weapon.hbs b/templates/ui/tooltip/weapon.hbs
index 3c2a1407..67287b6a 100644
--- a/templates/ui/tooltip/weapon.hbs
+++ b/templates/ui/tooltip/weapon.hbs
@@ -1,40 +1,36 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip weapon">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
-
-    <div class="tooltip-information-section">
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.ITEMS.Weapon.weaponType"}}</label>
-            <div>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}{{/if}}</div>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    <div class="tags">
+        <div class="tag">
+            <span>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}{{/if}}</span>
         </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.burden"}}</label>
+        <div class="tag">
             {{#with (lookup config.GENERAL.burden item.system.burden) as | burden |}}
-                <div>{{localize burden.label}}</div>
+                <span>{{localize burden.label}}</span>
             {{/with}}
         </div>
         {{#if item.system.attack.roll.trait}}
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
+            <div class="tag">
                 {{#with (lookup config.ACTOR.abilities item.system.attack.roll.trait) as | trait |}}
-                    <div>{{localize trait.label}}</div>
+                    <span>{{localize trait.label}}</span>
                 {{/with}}
             </div>
         {{/if}}
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
+        <div class="tag">
             {{#with (lookup config.GENERAL.range item.system.attack.range) as | range |}}
-                <div>{{localize range.label}}</div>
+                <span>{{localize range.label}}</span>
             {{/with}}
         </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
-            <div>{{{damageFormula item.system.attack}}}</div>
-        </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.damageType"}}</label>
-            <div>{{{damageSymbols item.system.attack.damage.parts}}}</div>
+        <div class="tag">
+          <span>{{{damageFormula item.system.attack}}} {{{damageSymbols item.system.attack.damage.parts}}}</span>
         </div>
     </div>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
+
+    <p class="tooltip-hint">
+        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+    </p>
 </div>
\ No newline at end of file