diff --git a/HSUI.csproj b/HSUI.csproj
index f8f10f7..6ed7bd0 100644
--- a/HSUI.csproj
+++ b/HSUI.csproj
@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.8.6</AssemblyVersion>
-		<FileVersion>1.0.8.6</FileVersion>
-		<InformationalVersion>1.0.8.6</InformationalVersion>
+		<AssemblyVersion>1.0.8.7</AssemblyVersion>
+		<FileVersion>1.0.8.7</FileVersion>
+		<InformationalVersion>1.0.8.7</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/HSUI.json b/HSUI.json
index 3339765..b2557d1 100644
--- a/HSUI.json
+++ b/HSUI.json
@@ -2,7 +2,7 @@
   "Author": "Knack117",
   "Name": "HSUI",
   "InternalName": "HSUI",
-  "AssemblyVersion": "1.0.8.6",
+  "AssemblyVersion": "1.0.8.7",
   "Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
   "ApplicableVersion": "any",
   "RepoUrl": "https://github.com/Knack117/HSUI",
diff --git a/changelog.md b/changelog.md
index 9b88239..fe49f55 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,6 @@
+# 1.0.8.7
+- **Hotbars**: Fixed Gearset/Job Gear Set icon clearing when the first equipment slot in the gearset changes — call LoadIconId() before reading slot IconId so the game populates the icon from the gearset (e.g. job icon).
+
 # 1.0.8.6
 - **Hotbars**: Fixed crafting action tooltips showing the action name instead of the full description — use CraftAction.Description directly instead of ActionTransient, which returns the name for crafting actions.
 
diff --git a/pluginmaster.json b/pluginmaster.json
index d7a3ebe..3c010a1 100644
--- a/pluginmaster.json
+++ b/pluginmaster.json
@@ -1,24 +1 @@
-[
-  {
-    "Author": "Knack117",
-    "Name": "HSUI",
-    "Punchline": "A modern HUD replacement built for customization.",
-    "Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
-    "Changelog": "1.0.8.2: Charge icons stay lit until all charges spent. 1.0.8.1: Do not grey out action icons until all charges spent.",
-    "InternalName": "HSUI",
-    "AssemblyVersion": "1.0.8.2",
-    "RepoUrl": "https://github.com/Knack117/HSUI",
-    "ApplicableVersion": "any",
-    "Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
-    "CategoryTags": ["UI"],
-    "DalamudApiLevel": 14,
-    "IconUrl": "https://raw.githubusercontent.com/Knack117/HSUI/main/Media/Images/icon.png",
-    "ImageUrls": [],
-    "DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
-    "IsHide": false,
-    "IsTestingExclusive": false,
-    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
-    "LastUpdate": "1770007214"
-  }
-]
+[{"Author":"Knack117","Name":"HSUI","Punchline":"A modern HUD replacement built for customization.","Description":"HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.","Changelog":"1.0.8.7: Fixed Gearset/Job Gear Set icon clearing when first equipment slot changes. 1.0.8.6: Crafting action tooltips now show full description instead of action name. 1.0.8.4: Alliance Frames 1 and 2 fix in raids; crafting action tooltips; Hide in duty no longer hides alliance frames. 1.0.8.3: Fix left-click staying broken after disable. 1.0.8.2: Charge icons stay lit until all charges spent.","InternalName":"HSUI","AssemblyVersion":"1.0.8.7","RepoUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI","ApplicableVersion":"any","Tags":["UI","HUD","Unit Frames","Nameplates","Party Frames","Hotbars"],"CategoryTags":["UI"],"DalamudApiLevel":14,"IconUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/raw/branch/main/Media/Images/icon.png","ImageUrls":[],"DownloadLinkInstall":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.7/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.7/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSUI/releases/download/v1.0.8.7/latest.zip","LastUpdate":"1739145600"}]