diff --git a/public/ui/skills/warlock/searing_pain.png b/public/ui/skills/warlock/searing_pain.png
new file mode 100644
index 0000000..7f15748
Binary files /dev/null and b/public/ui/skills/warlock/searing_pain.png differ
diff --git a/public/ui/skills/warlock/shadow_bolt.png b/public/ui/skills/warlock/shadow_bolt.png
new file mode 100644
index 0000000..bb2ea58
Binary files /dev/null and b/public/ui/skills/warlock/shadow_bolt.png differ
diff --git a/public/ui/skills/warlock/shadowburn.png b/public/ui/skills/warlock/shadowburn.png
new file mode 100644
index 0000000..e36b456
Binary files /dev/null and b/public/ui/skills/warlock/shadowburn.png differ
diff --git a/public/ui/skills/warlock/summon_doomguard.png b/public/ui/skills/warlock/summon_doomguard.png
new file mode 100644
index 0000000..6e7a423
Binary files /dev/null and b/public/ui/skills/warlock/summon_doomguard.png differ
diff --git a/public/ui/skills/warlock/summon_felguard.png b/public/ui/skills/warlock/summon_felguard.png
new file mode 100644
index 0000000..35f4a74
Binary files /dev/null and b/public/ui/skills/warlock/summon_felguard.png differ
diff --git a/public/ui/skills/warlock/summon_felhunter.png b/public/ui/skills/warlock/summon_felhunter.png
new file mode 100644
index 0000000..8f73ebd
Binary files /dev/null and b/public/ui/skills/warlock/summon_felhunter.png differ
diff --git a/public/ui/skills/warlock/summon_imp.png b/public/ui/skills/warlock/summon_imp.png
new file mode 100644
index 0000000..94fcadf
Binary files /dev/null and b/public/ui/skills/warlock/summon_imp.png differ
diff --git a/public/ui/skills/warlock/summon_infernal.png b/public/ui/skills/warlock/summon_infernal.png
new file mode 100644
index 0000000..21f4a81
Binary files /dev/null and b/public/ui/skills/warlock/summon_infernal.png differ
diff --git a/public/ui/skills/warlock/summon_succubus.png b/public/ui/skills/warlock/summon_succubus.png
new file mode 100644
index 0000000..bbadab6
Binary files /dev/null and b/public/ui/skills/warlock/summon_succubus.png differ
diff --git a/public/ui/skills/warlock/summon_voidwalker.png b/public/ui/skills/warlock/summon_voidwalker.png
new file mode 100644
index 0000000..a395f6f
Binary files /dev/null and b/public/ui/skills/warlock/summon_voidwalker.png differ
diff --git a/public/ui/skills/warrior/battle_shout.png b/public/ui/skills/warrior/battle_shout.png
new file mode 100644
index 0000000..750a697
Binary files /dev/null and b/public/ui/skills/warrior/battle_shout.png differ
diff --git a/public/ui/skills/warrior/berserker_rage.png b/public/ui/skills/warrior/berserker_rage.png
new file mode 100644
index 0000000..dfa500e
Binary files /dev/null and b/public/ui/skills/warrior/berserker_rage.png differ
diff --git a/public/ui/skills/warrior/bloodrage.png b/public/ui/skills/warrior/bloodrage.png
new file mode 100644
index 0000000..5fb8a0a
Binary files /dev/null and b/public/ui/skills/warrior/bloodrage.png differ
diff --git a/public/ui/skills/warrior/bloodthirst.png b/public/ui/skills/warrior/bloodthirst.png
new file mode 100644
index 0000000..b9da2f6
Binary files /dev/null and b/public/ui/skills/warrior/bloodthirst.png differ
diff --git a/public/ui/skills/warrior/charge.png b/public/ui/skills/warrior/charge.png
new file mode 100644
index 0000000..f9ae465
Binary files /dev/null and b/public/ui/skills/warrior/charge.png differ
diff --git a/public/ui/skills/warrior/cleave.png b/public/ui/skills/warrior/cleave.png
new file mode 100644
index 0000000..9dcc22d
Binary files /dev/null and b/public/ui/skills/warrior/cleave.png differ
diff --git a/public/ui/skills/warrior/commanding_shout.png b/public/ui/skills/warrior/commanding_shout.png
new file mode 100644
index 0000000..cf105fe
Binary files /dev/null and b/public/ui/skills/warrior/commanding_shout.png differ
diff --git a/public/ui/skills/warrior/defensive_stance.png b/public/ui/skills/warrior/defensive_stance.png
new file mode 100644
index 0000000..7e2fd18
Binary files /dev/null and b/public/ui/skills/warrior/defensive_stance.png differ
diff --git a/public/ui/skills/warrior/demoralizing_shout.png b/public/ui/skills/warrior/demoralizing_shout.png
new file mode 100644
index 0000000..380dbb9
Binary files /dev/null and b/public/ui/skills/warrior/demoralizing_shout.png differ
diff --git a/public/ui/skills/warrior/execute.png b/public/ui/skills/warrior/execute.png
new file mode 100644
index 0000000..fe78c8a
Binary files /dev/null and b/public/ui/skills/warrior/execute.png differ
diff --git a/public/ui/skills/warrior/hamstring.png b/public/ui/skills/warrior/hamstring.png
new file mode 100644
index 0000000..4a637ce
Binary files /dev/null and b/public/ui/skills/warrior/hamstring.png differ
diff --git a/public/ui/skills/warrior/heroic_strike.png b/public/ui/skills/warrior/heroic_strike.png
new file mode 100644
index 0000000..af6ab0a
Binary files /dev/null and b/public/ui/skills/warrior/heroic_strike.png differ
diff --git a/public/ui/skills/warrior/mapping.json b/public/ui/skills/warrior/mapping.json
new file mode 100644
index 0000000..104f515
--- /dev/null
+++ b/public/ui/skills/warrior/mapping.json
@@ -0,0 +1,139 @@
+{
+  "class": "warrior",
+  "license": "CraftPix premium (royalty-free commercial). Icons Purchased by Levy Street Account - callum@levystreet.com",
+  "iconSize": 128,
+  "sourcePacks": [
+    "tmp/asset_src/warrior-skill-icons",
+    "tmp/asset_src/berserker-skill-icons (fallback for rage/fury)"
+  ],
+  "runtimeDir": "public/ui/skills/warrior",
+  "abilities": [
+    {
+      "abilityId": "heroic_strike",
+      "sourcePack": "warrior",
+      "sourceFile": "3.png",
+      "output": "heroic_strike.png"
+    },
+    {
+      "abilityId": "battle_shout",
+      "sourcePack": "warrior",
+      "sourceFile": "43.png",
+      "output": "battle_shout.png"
+    },
+    {
+      "abilityId": "commanding_shout",
+      "sourcePack": "berserker",
+      "sourceFile": "48.png",
+      "output": "commanding_shout.png"
+    },
+    {
+      "abilityId": "charge",
+      "sourcePack": "berserker",
+      "sourceFile": "27.png",
+      "output": "charge.png"
+    },
+    {
+      "abilityId": "rend",
+      "sourcePack": "berserker",
+      "sourceFile": "44.png",
+      "output": "rend.png"
+    },
+    {
+      "abilityId": "thunder_clap",
+      "sourcePack": "warrior",
+      "sourceFile": "7.png",
+      "output": "thunder_clap.png"
+    },
+    {
+      "abilityId": "hamstring",
+      "sourcePack": "warrior",
+      "sourceFile": "33.png",
+      "output": "hamstring.png"
+    },
+    {
+      "abilityId": "bloodrage",
+      "sourcePack": "berserker",
+      "sourceFile": "1.png",
+      "output": "bloodrage.png"
+    },
+    {
+      "abilityId": "overpower",
+      "sourcePack": "berserker",
+      "sourceFile": "12.png",
+      "output": "overpower.png"
+    },
+    {
+      "abilityId": "execute",
+      "sourcePack": "berserker",
+      "sourceFile": "35.png",
+      "output": "execute.png"
+    },
+    {
+      "abilityId": "slam",
+      "sourcePack": "warrior",
+      "sourceFile": "4.png",
+      "output": "slam.png"
+    },
+    {
+      "abilityId": "cleave",
+      "sourcePack": "warrior",
+      "sourceFile": "1.png",
+      "output": "cleave.png"
+    },
+    {
+      "abilityId": "defensive_stance",
+      "sourcePack": "warrior",
+      "sourceFile": "9.png",
+      "output": "defensive_stance.png"
+    },
+    {
+      "abilityId": "demoralizing_shout",
+      "sourcePack": "warrior",
+      "sourceFile": "36.png",
+      "output": "demoralizing_shout.png"
+    },
+    {
+      "abilityId": "sunder_armor",
+      "sourcePack": "berserker",
+      "sourceFile": "8.png",
+      "output": "sunder_armor.png"
+    },
+    {
+      "abilityId": "mortal_strike",
+      "sourcePack": "warrior",
+      "sourceFile": "21.png",
+      "output": "mortal_strike.png"
+    },
+    {
+      "abilityId": "bloodthirst",
+      "sourcePack": "berserker",
+      "sourceFile": "34.png",
+      "output": "bloodthirst.png"
+    },
+    {
+      "abilityId": "shield_slam",
+      "sourcePack": "berserker",
+      "sourceFile": "25.png",
+      "output": "shield_slam.png"
+    },
+    {
+      "abilityId": "whirlwind",
+      "sourcePack": "warrior",
+      "sourceFile": "13.png",
+      "output": "whirlwind.png"
+    },
+    {
+      "abilityId": "berserker_rage",
+      "sourcePack": "berserker",
+      "sourceFile": "47.png",
+      "output": "berserker_rage.png"
+    },
+    {
+      "abilityId": "taunt",
+      "sourcePack": "generic-skill100",
+      "sourceFile": "skill icon 37.png",
+      "output": "taunt.png"
+    }
+  ],
+  "deferredStayProcedural": {}
+}
\ No newline at end of file
diff --git a/public/ui/skills/warrior/mortal_strike.png b/public/ui/skills/warrior/mortal_strike.png
new file mode 100644
index 0000000..7e7a0de
Binary files /dev/null and b/public/ui/skills/warrior/mortal_strike.png differ
diff --git a/public/ui/skills/warrior/overpower.png b/public/ui/skills/warrior/overpower.png
new file mode 100644
index 0000000..1aa7fff
Binary files /dev/null and b/public/ui/skills/warrior/overpower.png differ
diff --git a/public/ui/skills/warrior/rend.png b/public/ui/skills/warrior/rend.png
new file mode 100644
index 0000000..88508b8
Binary files /dev/null and b/public/ui/skills/warrior/rend.png differ
diff --git a/public/ui/skills/warrior/shield_slam.png b/public/ui/skills/warrior/shield_slam.png
new file mode 100644
index 0000000..4889977
Binary files /dev/null and b/public/ui/skills/warrior/shield_slam.png differ
diff --git a/public/ui/skills/warrior/slam.png b/public/ui/skills/warrior/slam.png
new file mode 100644
index 0000000..679eff1
Binary files /dev/null and b/public/ui/skills/warrior/slam.png differ
diff --git a/public/ui/skills/warrior/sunder_armor.png b/public/ui/skills/warrior/sunder_armor.png
new file mode 100644
index 0000000..d9a4097
Binary files /dev/null and b/public/ui/skills/warrior/sunder_armor.png differ
diff --git a/public/ui/skills/warrior/taunt.png b/public/ui/skills/warrior/taunt.png
new file mode 100644
index 0000000..6d150b3
Binary files /dev/null and b/public/ui/skills/warrior/taunt.png differ
diff --git a/public/ui/skills/warrior/thunder_clap.png b/public/ui/skills/warrior/thunder_clap.png
new file mode 100644
index 0000000..89a3769
Binary files /dev/null and b/public/ui/skills/warrior/thunder_clap.png differ
diff --git a/public/ui/skills/warrior/whirlwind.png b/public/ui/skills/warrior/whirlwind.png
new file mode 100644
index 0000000..4eea0c0
Binary files /dev/null and b/public/ui/skills/warrior/whirlwind.png differ