diff --git a/assets/voxygen/element/icons/skilltree/buff_amount.png b/assets/voxygen/element/icons/skilltree/buff_amount.png
new file mode 100644
index 0000000000..c06a22db11
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_amount.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:560ecad7f5354d3028ddd757253649022fa6c4c5f7b88a41e60b878a36840365
+size 298
diff --git a/assets/voxygen/element/icons/skilltree/buff_combo.png b/assets/voxygen/element/icons/skilltree/buff_combo.png
new file mode 100644
index 0000000000..7f836b8bcf
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_combo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5618481d7bbb4b25a59354f053320ba072ca061ad79ea270412c7372a7d5a54f
+size 332
diff --git a/assets/voxygen/element/icons/skilltree/buff_cost.png b/assets/voxygen/element/icons/skilltree/buff_cost.png
new file mode 100644
index 0000000000..ca0ee312ad
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_cost.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:348ff43d6d2daf094fafc61e0ef9a9ece89c6839b61f1250518d429056ef4c05
+size 292
diff --git a/assets/voxygen/element/icons/skilltree/buff_damage.png b/assets/voxygen/element/icons/skilltree/buff_damage.png
new file mode 100644
index 0000000000..b38a29b120
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_damage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4edfc3135376422db82a995c3477c4fe1478c40379fc42d7f5c2837c4e844d1
+size 340
diff --git a/assets/voxygen/element/icons/skilltree/buff_distance.png b/assets/voxygen/element/icons/skilltree/buff_distance.png
new file mode 100644
index 0000000000..4011ce63a8
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_distance.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f0336dc6c78c954d739bd862bd9f90cbe0f0d04c8a12e330636265571ff44a8
+size 289
diff --git a/assets/voxygen/element/icons/skilltree/buff_energy_drain.png b/assets/voxygen/element/icons/skilltree/buff_energy_drain.png
new file mode 100644
index 0000000000..f745e299c7
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_energy_drain.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:782187ddd25eac0a0e2476b6247a726ddf88b569c8ec08b39b88d85b8765eb60
+size 320
diff --git a/assets/voxygen/element/icons/skilltree/buff_energy_regen.png b/assets/voxygen/element/icons/skilltree/buff_energy_regen.png
new file mode 100644
index 0000000000..9824cc66a2
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_energy_regen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ece8c4e1cc4db2b6ba752a3d7ee589b36b6560ce84081bd41b916a09f1462ba0
+size 325
diff --git a/assets/voxygen/element/icons/skilltree/buff_explosion.png b/assets/voxygen/element/icons/skilltree/buff_explosion.png
new file mode 100644
index 0000000000..aecba38caa
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_explosion.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3b55d90ee6b023e0600eda0ae54b02f38e058c5c6f265df7f04b34357a8c65c
+size 408
diff --git a/assets/voxygen/element/icons/skilltree/buff_heal.png b/assets/voxygen/element/icons/skilltree/buff_heal.png
new file mode 100644
index 0000000000..b779eca78c
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_heal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a2f91cf64d12b8253857a2d3e5e083ad239bd98f9ea48d78e17c1346b6d316e
+size 288
diff --git a/assets/voxygen/element/icons/skilltree/buff_helicopter.png b/assets/voxygen/element/icons/skilltree/buff_helicopter.png
new file mode 100644
index 0000000000..725f577d24
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_helicopter.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f878d24fb14d56c3cfb76ec63c142b22cdd7d04f5b845da41146b92de9986325
+size 363
diff --git a/assets/voxygen/element/icons/skilltree/buff_infinite.png b/assets/voxygen/element/icons/skilltree/buff_infinite.png
new file mode 100644
index 0000000000..4acaeb6726
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_infinite.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36c8785dbabde7b94c0d9fab6e954f66e42e7ab5f469ae92bf0caf62d26ee4b6
+size 299
diff --git a/assets/voxygen/element/icons/skilltree/buff_knockback.png b/assets/voxygen/element/icons/skilltree/buff_knockback.png
new file mode 100644
index 0000000000..559c061fae
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_knockback.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:070818d10fd9286632cab48cdaf9e863d299141850868b344ba0757f5922ba20
+size 334
diff --git a/assets/voxygen/element/icons/skilltree/buff_lifesteal.png b/assets/voxygen/element/icons/skilltree/buff_lifesteal.png
new file mode 100644
index 0000000000..0c8fc55bf6
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_lifesteal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c90b31888739efd4f4e66c9478d7a0181e2d24b653732d76c7e4bfe1843b7cf
+size 306
diff --git a/assets/voxygen/element/icons/skilltree/buff_projectile_speed.png b/assets/voxygen/element/icons/skilltree/buff_projectile_speed.png
new file mode 100644
index 0000000000..4aeb110597
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_projectile_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:043ffb4f43cf32bfbe57a56df1ae22cf68351421bbf22db7d403814bfd79df3f
+size 303
diff --git a/assets/voxygen/element/icons/skilltree/buff_radius.png b/assets/voxygen/element/icons/skilltree/buff_radius.png
new file mode 100644
index 0000000000..b2b965eece
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_radius.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c550efb4d7fc85a44f91ee0c54f069da10077313d11ee2ef9595dfadfb9e85b
+size 397
diff --git a/assets/voxygen/element/icons/skilltree/buff_speed.png b/assets/voxygen/element/icons/skilltree/buff_speed.png
new file mode 100644
index 0000000000..c55aefe0e6
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/buff_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7431f80539de5452ad7a828bb387bd72918126c6b75ae4344fc7af51f00f4b86
+size 289
diff --git a/assets/voxygen/element/icons/skilltree/debuff_amount.png b/assets/voxygen/element/icons/skilltree/debuff_amount.png
new file mode 100644
index 0000000000..f483baaaac
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_amount.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9ab075571b86226d551d57efa0e6ee13192c1c3c9744bf6efcc19f0c5fcb2ed
+size 308
diff --git a/assets/voxygen/element/icons/skilltree/debuff_combo.png b/assets/voxygen/element/icons/skilltree/debuff_combo.png
new file mode 100644
index 0000000000..adbea9aab2
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_combo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6f65c577babcdbd6a04f45dde4cb2e7b573b5bc1fc372926602bfbeee2cb9d7
+size 338
diff --git a/assets/voxygen/element/icons/skilltree/debuff_cost.png b/assets/voxygen/element/icons/skilltree/debuff_cost.png
new file mode 100644
index 0000000000..4300805c32
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_cost.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc8e3ff7c1f8d0a7a9c085420f223b06dff8beb02c36aee6f8cffbe2fb7d54b5
+size 295
diff --git a/assets/voxygen/element/icons/skilltree/debuff_damage.png b/assets/voxygen/element/icons/skilltree/debuff_damage.png
new file mode 100644
index 0000000000..172faa5b8d
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_damage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6885b0d3633bfd2a88a1a41d7393a54f1615f2d6ba4f46abdd9af55f83565d3
+size 345
diff --git a/assets/voxygen/element/icons/skilltree/debuff_distance.png b/assets/voxygen/element/icons/skilltree/debuff_distance.png
new file mode 100644
index 0000000000..ee517f3daf
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_distance.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d37960b44b0c53b1a6875d322776e17ad0ba82f265cbd4b1fa4ab3266c2b6f8
+size 297
diff --git a/assets/voxygen/element/icons/skilltree/debuff_energy_drain.png b/assets/voxygen/element/icons/skilltree/debuff_energy_drain.png
new file mode 100644
index 0000000000..7d934b76e5
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_energy_drain.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81d2b0dd11f859b453df142287de89ab296174310d0a1d4e07dbb9cda2c596ea
+size 330
diff --git a/assets/voxygen/element/icons/skilltree/debuff_energy_regen.png b/assets/voxygen/element/icons/skilltree/debuff_energy_regen.png
new file mode 100644
index 0000000000..f3ca71b227
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_energy_regen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bff01b8fe1ac22e0fb13267312a76aa754e75ffeaa8a11a8843fedfc6e64beb6
+size 332
diff --git a/assets/voxygen/element/icons/skilltree/debuff_explosion.png b/assets/voxygen/element/icons/skilltree/debuff_explosion.png
new file mode 100644
index 0000000000..831e1596dc
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_explosion.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8fb0d85efae3b6fec3064ad928a6a25fe5438e163259e1ea888e6a270e91344
+size 408
diff --git a/assets/voxygen/element/icons/skilltree/debuff_heal.png b/assets/voxygen/element/icons/skilltree/debuff_heal.png
new file mode 100644
index 0000000000..9f71395d01
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_heal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25f9a5841391364d80e35da1333ce9b89db513b7212132539d7db9c5d46d7dee
+size 295
diff --git a/assets/voxygen/element/icons/skilltree/debuff_helicopter.png b/assets/voxygen/element/icons/skilltree/debuff_helicopter.png
new file mode 100644
index 0000000000..ef4abd01cd
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_helicopter.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7d4ddb86bf396d0cdb8e9cd0e554556b2974335938e036fc580176413814feb
+size 365
diff --git a/assets/voxygen/element/icons/skilltree/debuff_infinite.png b/assets/voxygen/element/icons/skilltree/debuff_infinite.png
new file mode 100644
index 0000000000..70de9eab85
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_infinite.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f44aecd733922841b147cf171b2668c536688c8330ecb67c7f4459d25ab4cafc
+size 310
diff --git a/assets/voxygen/element/icons/skilltree/debuff_knockback.png b/assets/voxygen/element/icons/skilltree/debuff_knockback.png
new file mode 100644
index 0000000000..a538eff8d8
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_knockback.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3752ed30228f989fb0d10e57d8255093b4765b84b43b0887a69a0f729c674ae
+size 338
diff --git a/assets/voxygen/element/icons/skilltree/debuff_lifesteal.png b/assets/voxygen/element/icons/skilltree/debuff_lifesteal.png
new file mode 100644
index 0000000000..014d918045
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_lifesteal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fc4b185582b928254935958e9e49cc22079950b721433b390c94e1a8d56eec8
+size 311
diff --git a/assets/voxygen/element/icons/skilltree/debuff_projectile_speed.png b/assets/voxygen/element/icons/skilltree/debuff_projectile_speed.png
new file mode 100644
index 0000000000..8f2186f761
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_projectile_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ab2df3e83aa8bac74e1ea7be1bb79823737f3b42840db94005defbecf2331bf
+size 311
diff --git a/assets/voxygen/element/icons/skilltree/debuff_radius.png b/assets/voxygen/element/icons/skilltree/debuff_radius.png
new file mode 100644
index 0000000000..771e5bf609
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_radius.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:faab00e5f6d9a595c690422a8e073b90a7f188b25b986a6c2ae1ad7e94f1044b
+size 396
diff --git a/assets/voxygen/element/icons/skilltree/debuff_speed.png b/assets/voxygen/element/icons/skilltree/debuff_speed.png
new file mode 100644
index 0000000000..142950e098
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/debuff_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2f1729a26e6a11d8871ca73a71672a2d77ff9d002b5a713b6fcf5ce25e00721
+size 294
diff --git a/assets/voxygen/element/icons/skilltree/heal_amount.png b/assets/voxygen/element/icons/skilltree/heal_amount.png
new file mode 100644
index 0000000000..bf74888675
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_amount.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b57f1534cbfb7a36caf318c00fe6061b159486439b79087e345550d9ebb9fe07
+size 301
diff --git a/assets/voxygen/element/icons/skilltree/heal_combo.png b/assets/voxygen/element/icons/skilltree/heal_combo.png
new file mode 100644
index 0000000000..25bcaa3b52
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_combo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8793f02e7b9aaf3f9639273abb8a7172044219eed04520604bdef6a0cbaf9b4
+size 327
diff --git a/assets/voxygen/element/icons/skilltree/heal_cost.png b/assets/voxygen/element/icons/skilltree/heal_cost.png
new file mode 100644
index 0000000000..10af8f945c
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_cost.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b3b963c26e98657461b1a083c38c18dabdceac57c28141b70f9958fb56e2dd8
+size 286
diff --git a/assets/voxygen/element/icons/skilltree/heal_damage.png b/assets/voxygen/element/icons/skilltree/heal_damage.png
new file mode 100644
index 0000000000..372b85a875
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_damage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4547f604af9b4d939e63fed0d50b1ccf0d46d4d301ddc3b75ab1f2bdb021dba
+size 335
diff --git a/assets/voxygen/element/icons/skilltree/heal_distance.png b/assets/voxygen/element/icons/skilltree/heal_distance.png
new file mode 100644
index 0000000000..3fbc57069a
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_distance.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba032370b42ec2434f28d47554ae467491cdb7caad8a8cad90c7278ec5d02c14
+size 285
diff --git a/assets/voxygen/element/icons/skilltree/heal_energy_drain.png b/assets/voxygen/element/icons/skilltree/heal_energy_drain.png
new file mode 100644
index 0000000000..b7659b6a74
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_energy_drain.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d3d0c4730c26d6487780cd61ba13019eaaa0a2058e0b74ae13f309d68fcf327
+size 316
diff --git a/assets/voxygen/element/icons/skilltree/heal_energy_regen.png b/assets/voxygen/element/icons/skilltree/heal_energy_regen.png
new file mode 100644
index 0000000000..802c5faea9
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_energy_regen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef74f0b3021f9663b5226858738758d06d686b4a01a428a27604ea2a07061278
+size 320
diff --git a/assets/voxygen/element/icons/skilltree/heal_explosion.png b/assets/voxygen/element/icons/skilltree/heal_explosion.png
new file mode 100644
index 0000000000..217b1ebd21
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_explosion.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b00a34458d9301db660200d99ce62ec01f92d7ff3d2d4f4c5e0e3e482c15815d
+size 405
diff --git a/assets/voxygen/element/icons/skilltree/heal_heal.png b/assets/voxygen/element/icons/skilltree/heal_heal.png
new file mode 100644
index 0000000000..c5b60c0ca4
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_heal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f194752fbbbdb162c68689bde1fc82621d1e9af50bf003bcb5a86c9c72aba046
+size 286
diff --git a/assets/voxygen/element/icons/skilltree/heal_helicopter.png b/assets/voxygen/element/icons/skilltree/heal_helicopter.png
new file mode 100644
index 0000000000..f09f17ca53
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_helicopter.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c408e3df66b3d0e7f7df690372ee9a806c455c6be8157b5ed688f8a4982720fe
+size 362
diff --git a/assets/voxygen/element/icons/skilltree/heal_infinite.png b/assets/voxygen/element/icons/skilltree/heal_infinite.png
new file mode 100644
index 0000000000..7832b6d773
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_infinite.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2487369d22cf5ca009538b3dec5ea0d91ff599ef68b95cc5935c295d51e1011
+size 295
diff --git a/assets/voxygen/element/icons/skilltree/heal_knockback.png b/assets/voxygen/element/icons/skilltree/heal_knockback.png
new file mode 100644
index 0000000000..41d7d4b6ea
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_knockback.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fc87d28b3984c7ab66f5c1b7d6d2468e883d1462142c8ac1f5b691758186893
+size 321
diff --git a/assets/voxygen/element/icons/skilltree/heal_lifesteal.png b/assets/voxygen/element/icons/skilltree/heal_lifesteal.png
new file mode 100644
index 0000000000..576d1e1ae7
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_lifesteal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8c159fd47baa83acbed1560f71ee9326ec3a3b517f1aa2f7eb4e3c290dbd9a3
+size 307
diff --git a/assets/voxygen/element/icons/skilltree/heal_projectile_speed.png b/assets/voxygen/element/icons/skilltree/heal_projectile_speed.png
new file mode 100644
index 0000000000..ada6147d51
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_projectile_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36410a5f61343ed1b5ae46e64ec54ae22f26611bed9a35d2c04025cafc174819
+size 304
diff --git a/assets/voxygen/element/icons/skilltree/heal_radius.png b/assets/voxygen/element/icons/skilltree/heal_radius.png
new file mode 100644
index 0000000000..8d6b039209
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_radius.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ac45132975c4cd3a17140a28584993bb9dc423f56bc351dbef766f799360224
+size 387
diff --git a/assets/voxygen/element/icons/skilltree/heal_speed.png b/assets/voxygen/element/icons/skilltree/heal_speed.png
new file mode 100644
index 0000000000..80d09e80c5
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/heal_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7da12bd3996f515b27a5a03233c9b59050bf0b0c7cba2c6a30cdd03f81bb406f
+size 284
diff --git a/assets/voxygen/element/icons/skilltree/leap_cost.png b/assets/voxygen/element/icons/skilltree/leap_cost.png
deleted file mode 100644
index 920755fab8..0000000000
--- a/assets/voxygen/element/icons/skilltree/leap_cost.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca23a8c5d4fa849b9c7ab92b19cb60b1d87aaf7b52413113024fb05473d3938d
-size 809
diff --git a/assets/voxygen/element/icons/skilltree/leap_damage.png b/assets/voxygen/element/icons/skilltree/leap_damage.png
deleted file mode 100644
index feadf20c0f..0000000000
--- a/assets/voxygen/element/icons/skilltree/leap_damage.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61670df28e327ac7a38d38aa0bfca068952783a533a536606e19018817bac06e
-size 799
diff --git a/assets/voxygen/element/icons/skilltree/leap_distance.png b/assets/voxygen/element/icons/skilltree/leap_distance.png
deleted file mode 100644
index 5337c23b1f..0000000000
--- a/assets/voxygen/element/icons/skilltree/leap_distance.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d2f5fce74cbedd15c7afbb1d77c880ee57cd78dd79791d6ab8c9d1ebeef43f8b
-size 433
diff --git a/assets/voxygen/element/icons/skilltree/leap_knockback.png b/assets/voxygen/element/icons/skilltree/leap_knockback.png
deleted file mode 100644
index b24ec61511..0000000000
--- a/assets/voxygen/element/icons/skilltree/leap_knockback.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:320c1022eb23fd83a8b6df0eee53cf13a74d7ef5dce3b3b1c1f3c736002d3b1f
-size 425
diff --git a/assets/voxygen/element/icons/skilltree/leap_radius.png b/assets/voxygen/element/icons/skilltree/leap_radius.png
deleted file mode 100644
index d88baebaab..0000000000
--- a/assets/voxygen/element/icons/skilltree/leap_radius.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7dcdd362958e1701b59a44944fbcd10b93ab319b0036321996de674e7c0ae7ed
-size 451
diff --git a/assets/voxygen/element/icons/skilltree/magic_amount.png b/assets/voxygen/element/icons/skilltree/magic_amount.png
new file mode 100644
index 0000000000..4c0e32653c
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_amount.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:388929298d646aa6aec80501f745f2c71db9c0c26b2293726113ad0e8de049fa
+size 301
diff --git a/assets/voxygen/element/icons/skilltree/magic_combo.png b/assets/voxygen/element/icons/skilltree/magic_combo.png
new file mode 100644
index 0000000000..eddca0cbb1
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_combo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74efd7764ec7dddac89c7b2ba4936b1e5f4c409f290db51faf8ae00dd1907951
+size 330
diff --git a/assets/voxygen/element/icons/skilltree/magic_cost.png b/assets/voxygen/element/icons/skilltree/magic_cost.png
new file mode 100644
index 0000000000..8fb67c9a8a
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_cost.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:427c49c962f3c81b33021d1185cce7e64c0f787acf384086b428d1579b97a26f
+size 291
diff --git a/assets/voxygen/element/icons/skilltree/magic_damage.png b/assets/voxygen/element/icons/skilltree/magic_damage.png
new file mode 100644
index 0000000000..410189a8cd
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_damage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:451e50e7f594e22dd443c4b9207afe8f4e425204abe5d793d08f13fdcc81713a
+size 343
diff --git a/assets/voxygen/element/icons/skilltree/magic_distance.png b/assets/voxygen/element/icons/skilltree/magic_distance.png
new file mode 100644
index 0000000000..64537fc179
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_distance.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c77c84280b9b54930a0129a8da8a69e6948df33daa61a1ccfbb875f744329f6b
+size 290
diff --git a/assets/voxygen/element/icons/skilltree/magic_energy_drain.png b/assets/voxygen/element/icons/skilltree/magic_energy_drain.png
new file mode 100644
index 0000000000..4c6133b873
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_energy_drain.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a791e9936ecdd1302aab2f6bc495f3a63c185d1c2507f7e5dad89dda4e728db4
+size 319
diff --git a/assets/voxygen/element/icons/skilltree/magic_energy_regen.png b/assets/voxygen/element/icons/skilltree/magic_energy_regen.png
new file mode 100644
index 0000000000..638db11e2c
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_energy_regen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f13451f6212e5d3b3008346ed4be325e17be821f800653bbd8f843f57f9a51f
+size 325
diff --git a/assets/voxygen/element/icons/skilltree/magic_explosion.png b/assets/voxygen/element/icons/skilltree/magic_explosion.png
new file mode 100644
index 0000000000..c99325b80e
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_explosion.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d04ebaa63c7b747af6f2e492548f2fb46cf7cdcf5cbe42410daaaba1649b6387
+size 396
diff --git a/assets/voxygen/element/icons/skilltree/magic_heal.png b/assets/voxygen/element/icons/skilltree/magic_heal.png
new file mode 100644
index 0000000000..b18fcb2269
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_heal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bea66758d59e7a6941f201cb87917739648db6313dd4900d8a9473b45c973ba9
+size 291
diff --git a/assets/voxygen/element/icons/skilltree/magic_helicopter.png b/assets/voxygen/element/icons/skilltree/magic_helicopter.png
new file mode 100644
index 0000000000..1c6f1ebddc
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_helicopter.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d26e04ee1f6a6da73b6cc801fd8f55fcc6398ec1169a645226cb1bbada785ed
+size 363
diff --git a/assets/voxygen/element/icons/skilltree/magic_infinite.png b/assets/voxygen/element/icons/skilltree/magic_infinite.png
new file mode 100644
index 0000000000..6139b6a104
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_infinite.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4584cc0328b37efd73b4ae8a2eea016009aaab84f9aef93d183f3fb85bf9e059
+size 303
diff --git a/assets/voxygen/element/icons/skilltree/magic_knockback.png b/assets/voxygen/element/icons/skilltree/magic_knockback.png
new file mode 100644
index 0000000000..21bfcb62b2
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_knockback.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abe4ee72f674cd00ab01de0e8f1e23845c5264ac49923563cbed12e7039d9e8f
+size 334
diff --git a/assets/voxygen/element/icons/skilltree/magic_lifesteal.png b/assets/voxygen/element/icons/skilltree/magic_lifesteal.png
new file mode 100644
index 0000000000..c507d2dfb8
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_lifesteal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dff80f059e2a76420542acd52b0a7dd389e699c5d2a6be223a5a641681facdcf
+size 306
diff --git a/assets/voxygen/element/icons/skilltree/magic_projectile_speed.png b/assets/voxygen/element/icons/skilltree/magic_projectile_speed.png
new file mode 100644
index 0000000000..2dc8a3c6ce
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_projectile_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92b52cf14089d03619a9a531642f0c7487e347a72057702f4aa48a9f687bad12
+size 305
diff --git a/assets/voxygen/element/icons/skilltree/magic_radius.png b/assets/voxygen/element/icons/skilltree/magic_radius.png
new file mode 100644
index 0000000000..2cdcc55632
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_radius.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e6ce547ce4cad9460716b1fd109c7c00b2f320993102c584c97569f2de38432
+size 398
diff --git a/assets/voxygen/element/icons/skilltree/magic_speed.png b/assets/voxygen/element/icons/skilltree/magic_speed.png
new file mode 100644
index 0000000000..8ec7fa3dac
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/magic_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e94ed022f458afd6d685e75479b74092b16daf539bbdeebde924fcfda0ba9334
+size 289
diff --git a/assets/voxygen/element/icons/skilltree/physical_amount.png b/assets/voxygen/element/icons/skilltree/physical_amount.png
new file mode 100644
index 0000000000..f29ea32443
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_amount.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0eaa08baadbcb7c99e7887b1b67a3a4c0dd354641ac2b4db805105c24abc0881
+size 308
diff --git a/assets/voxygen/element/icons/skilltree/physical_combo.png b/assets/voxygen/element/icons/skilltree/physical_combo.png
new file mode 100644
index 0000000000..7d93251be9
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_combo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b2dac526d5c9f1a33635af589d4db5d034063f34798b11f5abb7bdd94598b1b
+size 338
diff --git a/assets/voxygen/element/icons/skilltree/physical_cost.png b/assets/voxygen/element/icons/skilltree/physical_cost.png
new file mode 100644
index 0000000000..d79a9a8c6b
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_cost.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8c2fac64cb99cbc3858b84532d6953f18c9ed877d974529e79a7173e8a0472e
+size 296
diff --git a/assets/voxygen/element/icons/skilltree/physical_damage.png b/assets/voxygen/element/icons/skilltree/physical_damage.png
new file mode 100644
index 0000000000..c205e2ff90
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_damage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc7b5b348791db5f32c2f617472157b06f48c24de697e1243c8128ecea6a913e
+size 344
diff --git a/assets/voxygen/element/icons/skilltree/physical_distance.png b/assets/voxygen/element/icons/skilltree/physical_distance.png
new file mode 100644
index 0000000000..1d61eff254
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_distance.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c97fd2472fe5a50bd8e55dcc9e2199074bf8313dbac2b7845589f1b572b3af0c
+size 298
diff --git a/assets/voxygen/element/icons/skilltree/physical_energy_drain.png b/assets/voxygen/element/icons/skilltree/physical_energy_drain.png
new file mode 100644
index 0000000000..be309c29db
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_energy_drain.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f6c7990b1f718d72ebea1d0eb5fd5758306f40d88615865b11218c5dcffb227
+size 332
diff --git a/assets/voxygen/element/icons/skilltree/physical_energy_regen.png b/assets/voxygen/element/icons/skilltree/physical_energy_regen.png
new file mode 100644
index 0000000000..dedeef0c80
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_energy_regen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71e08dd8af8742a711bfacaf92814d374cbf4005f1b45f94ca85b6bab56e4bd0
+size 331
diff --git a/assets/voxygen/element/icons/skilltree/physical_explosion.png b/assets/voxygen/element/icons/skilltree/physical_explosion.png
new file mode 100644
index 0000000000..930474c99b
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_explosion.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b6e87dc07b61603a733a488e005079de9865a8721b5215a73281790f186d4b2
+size 406
diff --git a/assets/voxygen/element/icons/skilltree/physical_heal.png b/assets/voxygen/element/icons/skilltree/physical_heal.png
new file mode 100644
index 0000000000..f67b78f22a
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_heal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4295ff54496a1296c667343adb750b62d35d3bb9fabe5898920e864ca86f395a
+size 296
diff --git a/assets/voxygen/element/icons/skilltree/physical_helicopter.png b/assets/voxygen/element/icons/skilltree/physical_helicopter.png
new file mode 100644
index 0000000000..f36b77d037
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_helicopter.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:480fdbcab5b5f35a907ce79f35099b836a79e6c4b8ee90d3ac51057cd1fdc75d
+size 369
diff --git a/assets/voxygen/element/icons/skilltree/physical_infinite.png b/assets/voxygen/element/icons/skilltree/physical_infinite.png
new file mode 100644
index 0000000000..765e6fc03f
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_infinite.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fab9a5c1298114e42af5678e6715a5488a4b57ef0769d42eed8d6d1a998f7933
+size 307
diff --git a/assets/voxygen/element/icons/skilltree/physical_knockback.png b/assets/voxygen/element/icons/skilltree/physical_knockback.png
new file mode 100644
index 0000000000..9d47d15576
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_knockback.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:babf8cdc7450389a6ed1be21af85a7b8bcd3823f96bcf553537d1c8e762054be
+size 341
diff --git a/assets/voxygen/element/icons/skilltree/physical_lifesteal.png b/assets/voxygen/element/icons/skilltree/physical_lifesteal.png
new file mode 100644
index 0000000000..9cc157192f
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_lifesteal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9daf4c40662c99a368a7e09bed348341071dcbfdafd64ca2b3fd1e36dcbb1299
+size 311
diff --git a/assets/voxygen/element/icons/skilltree/physical_projectile_speed.png b/assets/voxygen/element/icons/skilltree/physical_projectile_speed.png
new file mode 100644
index 0000000000..d1470a16cb
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_projectile_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efdaea20dfd71b070c7b94d6cdcf6c6caf1928ce6e696bad0f2152dcc464e503
+size 313
diff --git a/assets/voxygen/element/icons/skilltree/physical_radius.png b/assets/voxygen/element/icons/skilltree/physical_radius.png
new file mode 100644
index 0000000000..1d74afe91d
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_radius.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58d310a4137991ee654e75bef8337ae45844a606d75237070fc52a7ea699b400
+size 398
diff --git a/assets/voxygen/element/icons/skilltree/physical_speed.png b/assets/voxygen/element/icons/skilltree/physical_speed.png
new file mode 100644
index 0000000000..69dd83c614
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/physical_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b087c62b116593248f3413462cdc03dbdde0c7b40ccd9c1f16f05e889d328cc
+size 291
diff --git a/assets/voxygen/element/icons/skilltree/skill_dodge.png b/assets/voxygen/element/icons/skilltree/skill_dodge.png
new file mode 100644
index 0000000000..f784c4553f
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/skill_dodge.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ca6538f2e738f457e809cae7870e87b260851d6211304bd193fddcf8e923a5b
+size 511
diff --git a/assets/voxygen/element/icons/skilltree/spin_amount.png b/assets/voxygen/element/icons/skilltree/spin_amount.png
deleted file mode 100644
index 99c8447ab5..0000000000
--- a/assets/voxygen/element/icons/skilltree/spin_amount.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8304d36d48b4462874ed57047dace068b5a438f8c40a10f51c53474f85bb4abd
-size 371
diff --git a/assets/voxygen/element/icons/skilltree/spin_cost.png b/assets/voxygen/element/icons/skilltree/spin_cost.png
deleted file mode 100644
index 2430903f0e..0000000000
--- a/assets/voxygen/element/icons/skilltree/spin_cost.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:579632e333ff576c782228d34f729582c07ac1da1bc9017931827c8b0f334ae0
-size 358
diff --git a/assets/voxygen/element/icons/skilltree/spin_damage.png b/assets/voxygen/element/icons/skilltree/spin_damage.png
deleted file mode 100644
index e3b8455330..0000000000
--- a/assets/voxygen/element/icons/skilltree/spin_damage.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae3f6725a84f04bfbd35c7eacd024a0c079afd9ee44cd173fada35d9b119c5b7
-size 355
diff --git a/assets/voxygen/element/icons/skilltree/spin_helicopter.png b/assets/voxygen/element/icons/skilltree/spin_helicopter.png
deleted file mode 100644
index 3e146736f5..0000000000
--- a/assets/voxygen/element/icons/skilltree/spin_helicopter.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:864b8f2ff0a07eee28ab688b21276a35a9da00df56e4663b663925a3def0c42c
-size 359
diff --git a/assets/voxygen/element/icons/skilltree/spin_infinite.png b/assets/voxygen/element/icons/skilltree/spin_infinite.png
deleted file mode 100644
index 83e73cb431..0000000000
--- a/assets/voxygen/element/icons/skilltree/spin_infinite.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a600bd081a4e6147d6d2174a0e93fd9139f368293ebddfcfba607c01fa6a350
-size 360
diff --git a/assets/voxygen/element/icons/skilltree/spin_speed.png b/assets/voxygen/element/icons/skilltree/spin_speed.png
deleted file mode 100644
index b443c6a4aa..0000000000
--- a/assets/voxygen/element/icons/skilltree/spin_speed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f790af04f3cbbbb196fc0357377aa8f88152a8a7d8e5d3df049703ea542fb68
-size 354
diff --git a/assets/voxygen/element/icons/skilltree/utility_amount.png b/assets/voxygen/element/icons/skilltree/utility_amount.png
new file mode 100644
index 0000000000..bb6f5e377b
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_amount.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daf64776b89ecd755d6429cfc96f2e2f6881aa0d2bac86cd2a2ed6ec1ab9bd17
+size 297
diff --git a/assets/voxygen/element/icons/skilltree/utility_combo.png b/assets/voxygen/element/icons/skilltree/utility_combo.png
new file mode 100644
index 0000000000..9e00058020
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_combo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3da7401d5c3d76c66f1fa1fc2a1be4ab9c4a5e19b1ccd7840e7ea98597018e2
+size 320
diff --git a/assets/voxygen/element/icons/skilltree/utility_cost.png b/assets/voxygen/element/icons/skilltree/utility_cost.png
new file mode 100644
index 0000000000..9772cd806f
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_cost.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09bc3eacaf46c10f4ee853b3fc36d8a23021578607fb9c3857f0c0a4772948fa
+size 284
diff --git a/assets/voxygen/element/icons/skilltree/utility_damage.png b/assets/voxygen/element/icons/skilltree/utility_damage.png
new file mode 100644
index 0000000000..6bc76fd9c9
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_damage.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ca69ae117b9e3cb9a9e72f80caa0acd1cdd822ddc44bb77147daa79224a213d
+size 333
diff --git a/assets/voxygen/element/icons/skilltree/utility_distance.png b/assets/voxygen/element/icons/skilltree/utility_distance.png
new file mode 100644
index 0000000000..548c4d5bbc
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_distance.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:919bc75c91a3e50986cc3a89d7a1bee07ab45fbd9a23e1e3c2e2d98818d57d7d
+size 284
diff --git a/assets/voxygen/element/icons/skilltree/utility_energy_drain.png b/assets/voxygen/element/icons/skilltree/utility_energy_drain.png
new file mode 100644
index 0000000000..b9419d5c46
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_energy_drain.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b47198e5bf084db70efc72709752d280162b6980dfd59ad0ad0e1d77eb47f459
+size 316
diff --git a/assets/voxygen/element/icons/skilltree/utility_energy_regen.png b/assets/voxygen/element/icons/skilltree/utility_energy_regen.png
new file mode 100644
index 0000000000..1da6d514e4
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_energy_regen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abb482b01f1712bb202c2d0869b2d42cb0c3f2f347a9838d9d9dabac2f9fb373
+size 320
diff --git a/assets/voxygen/element/icons/skilltree/utility_explosion.png b/assets/voxygen/element/icons/skilltree/utility_explosion.png
new file mode 100644
index 0000000000..0d8619f4a8
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_explosion.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:294546880465b5472b259b513ee11b65292e2835d32981a84dcd124286236fcb
+size 402
diff --git a/assets/voxygen/element/icons/skilltree/utility_heal.png b/assets/voxygen/element/icons/skilltree/utility_heal.png
new file mode 100644
index 0000000000..91c176d082
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_heal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40101e8471b4b966970e1629187bb94b7abd834268d7cc26c4cf48c63c4a8cb5
+size 287
diff --git a/assets/voxygen/element/icons/skilltree/utility_helicopter.png b/assets/voxygen/element/icons/skilltree/utility_helicopter.png
new file mode 100644
index 0000000000..c440939816
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_helicopter.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cc5890215bc67e3837a34ba1861abe197c3df41ae8ec33dc2cd129d215f5a19
+size 356
diff --git a/assets/voxygen/element/icons/skilltree/utility_infinite.png b/assets/voxygen/element/icons/skilltree/utility_infinite.png
new file mode 100644
index 0000000000..b9568e064c
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_infinite.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8efd271f3ebeaeda6cdb008958ecaa3e641fb081adddccfdda14726f000bb003
+size 296
diff --git a/assets/voxygen/element/icons/skilltree/utility_knockback.png b/assets/voxygen/element/icons/skilltree/utility_knockback.png
new file mode 100644
index 0000000000..292d505ff2
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_knockback.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17b2c3faa968112c4ab59b3899c200d23fff6ad905e63382546de0b369b76315
+size 326
diff --git a/assets/voxygen/element/icons/skilltree/utility_lifesteal.png b/assets/voxygen/element/icons/skilltree/utility_lifesteal.png
new file mode 100644
index 0000000000..91f397da03
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_lifesteal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55bb6e0b0034a6a2b25bb18a4eafa7d37e20c4de3f557ba09e8156dc3fc11414
+size 302
diff --git a/assets/voxygen/element/icons/skilltree/utility_projectile_speed.png b/assets/voxygen/element/icons/skilltree/utility_projectile_speed.png
new file mode 100644
index 0000000000..5900eb9131
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_projectile_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cb6c59454da949fef60b567991149f7980b2df5a908fbf71e8ddf2e3481b61a
+size 298
diff --git a/assets/voxygen/element/icons/skilltree/utility_radius.png b/assets/voxygen/element/icons/skilltree/utility_radius.png
new file mode 100644
index 0000000000..7d87da4a11
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_radius.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1623db5dfdfbcb474987660af523f99823d52ee129685e0a2dfa8767459fbf4d
+size 382
diff --git a/assets/voxygen/element/icons/skilltree/utility_speed.png b/assets/voxygen/element/icons/skilltree/utility_speed.png
new file mode 100644
index 0000000000..b7abdf0aee
--- /dev/null
+++ b/assets/voxygen/element/icons/skilltree/utility_speed.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c727c5bde9001b42015dd8b034faddafd6e87d52275ce13dc1d579d45a58a398
+size 281
diff --git a/assets/voxygen/i18n/en/skills.ron b/assets/voxygen/i18n/en/skills.ron
index 8aadd97b31..b9b6f8a3a1 100644
--- a/assets/voxygen/i18n/en/skills.ron
+++ b/assets/voxygen/i18n/en/skills.ron
@@ -34,6 +34,8 @@
         "hud.skill.roll_dur_title": "Rolling Duration",
         "hud.skill.roll_dur": "Roll for 20% more time{SP}",
         // Sceptre
+        "hud.skill.sc_healbomb_title" : "Heal Bomb",
+        "hud.skill.sc_healbomb" : "Killing with kindness",
         "hud.skill.sc_projectile_speed_title": "Projectile Speed",
         "hud.skill.sc_projectile_speed": "Projectile threw 25% faster{SP}",
         "hud.skill.sc_energy_cost_title" : "Energy Cost",
@@ -52,6 +54,8 @@
         "hud.skill.sc_range" : "Longer beam, by 20%{SP}",
         "hud.skill.sc_energy_regen_title" : "Energy Regen",
         "hud.skill.sc_energy_regen" : "Increases energy regen from dealing damage by 10%{SP}",
+        "hud.skill.sc_beam_title" : "Heal Beam",
+        "hud.skill.sc_beam" : "Heal your party, but unheal the enemies",
         "hud.skill.sc_beam_damage_title" : "Beam Damage",
         "hud.skill.sc_beam_damage" : "Increases damage from the beam by 25%{SP}",
         "hud.skill.sc_beam_heal_title" : "Beam Heal",
@@ -67,6 +71,8 @@
         "hud.skill.st_shockwave_damage" : "Increases the damage done by 30%{SP}",
         "hud.skill.st_shockwave_unlock_title" : "Shockwave Unlock",
         "hud.skill.st_shockwave_unlock" : "Unlocks the ability to throw enemies away using fire{SP}",
+        "hud.skill.st_flamethrower_title" : "Flamethrower",
+        "hud.skill.st_flamethrower" : "Throws fire, cook'em all",
         "hud.skill.st_flame_velocity_title" : "Flame Velocity",
         "hud.skill.st_flame_velocity" : "Gets the fire there faster, 25% faster{SP}",
         "hud.skill.st_flamethrower_range_title" : "Flamethrower Range",
@@ -79,6 +85,8 @@
         "hud.skill.st_explosion_radius" : "Bigger is better, increases explosion radius by 10%{SP}",
         "hud.skill.st_stamina_regen_title" : "Stamina Regen",
         "hud.skill.st_stamina_regen" : "Increases stamina gain by 20%{SP}",
+        "hud.skill.st_fireball_title" : "Fireball",
+        "hud.skill.st_fireball" : "Play fetch with the enemies",
         "hud.skill.st_damage_title" : "Damage",
         "hud.skill.st_damage" : "Increases damage by 20%{SP}",
         "hud.skill.st_explosion_title" : "Explosion",
@@ -96,6 +104,8 @@
         "hud.skill.bow_repeater_damage" : "Increases the damage done by 40%{SP}",
         "hud.skill.bow_repeater_unlock_title" : "Repeater Unlock",
         "hud.skill.bow_repeater_unlock" : "Unlocks the ability to leap in the air and shoot a barrage of arrows{SP}",
+        "hud.skill.bow_charged_title" : "Charged Shoot",
+        "hud.skill.bow_charged" : "Because you waited longer",
         "hud.skill.bow_charged_knockback_title" : "Charged Knockback",
         "hud.skill.bow_charged_knockback" : "Knock enemies further back by 25%{SP}",
         "hud.skill.bow_charged_move_speed_title" : "Charged Move Speed",
@@ -110,6 +120,8 @@
         "hud.skill.bow_charged_damage" : "Increases damage by 20%{SP}",
         "hud.skill.bow_energy_regen_title" : "Energy Regen",
         "hud.skill.bow_energy_regen" : "Increases stamina gain by 40%{SP}",
+        "hud.skill.bow_title" : "Arrow Shoot",
+        "hud.skill.bow" : "Infinite quiver included, not suitable for children",
         "hud.skill.bow_damage_title" : "Damage",
         "hud.skill.bow_damage" : "Increases damage by 25%{SP}",
         // Hammer
@@ -125,6 +137,8 @@
         "hud.skill.hmr_leap_damage" : "Increases damage of leap by 40%{SP}",
         "hud.skill.hmr_unlock_leap_title" : "Unlock Leap",
         "hud.skill.hmr_unlock_leap" : "Unlocks a leap{SP}",
+        "hud.skill.hmr_charged_melee_title" : "Charged Melee",
+        "hud.skill.hmr_charged_melee" : "Melee but with charge",
         "hud.skill.hmr_charged_rate_title" : "Charge Rate",
         "hud.skill.hmr_charged_rate" : "Increases the rate that you charge the swing by 25%{SP}",
         "hud.skill.hmr_charged_melee_nrg_drain_title" : "Charged Melee Energy Drain",
@@ -133,6 +147,8 @@
         "hud.skill.hmr_charged_melee_damage" : "Increases the damage of the charged swing by 25%{SP}",
         "hud.skill.hmr_charged_melee_knockback_title" : "Charged Melee Knockback",
         "hud.skill.hmr_charged_melee_knockback" : "Massively increases throw potential of swing by 50%{SP}",
+        "hud.skill.hmr_single_strike_title" : "Single Strike",
+        "hud.skill.hmr_single_strike" : "As single as you are",
         "hud.skill.hmr_single_strike_regen_title" : "Single Strike Regen",
         "hud.skill.hmr_single_strike_regen" : "Increases stamina gain with each successive strike{SP}",
         "hud.skill.hmr_single_strike_speed_title" : "Single Strike Speed",
@@ -143,6 +159,8 @@
         "hud.skill.hmr_single_strike_knockback" : "Increase throw potential of swings by 50%{SP}",
         "hud.skill." : "",
         // Sword
+        "hud.skill.sw_trip_str_title": "Triple Strike",
+        "hud.skill.sw_trip_str": "Strike, up to three times",
         "hud.skill.sw_trip_str_combo_title": "Triple Strike Combo",
         "hud.skill.sw_trip_str_combo": "Unlocks combo scaling on triple strike{SP}",
         "hud.skill.sw_trip_str_dmg_title": "Triple Strike Damage",
@@ -151,6 +169,8 @@
         "hud.skill.sw_trip_str_sp": "Increases attack speed gained by each successive strike{SP}",
         "hud.skill.sw_trip_str_reg_title": "Triple Strike Regen",
         "hud.skill.sw_trip_str_reg": "Increases stamina gain on each successive strike{SP}",
+        "hud.skill.sw_dash_title": "Dash",
+        "hud.skill.sw_dash": "Pin through your enemies",
         "hud.skill.sw_dash_dmg_title": "Dash Damage",
         "hud.skill.sw_dash_dmg":  "Increases initial damage of the dash by 20%{SP}",
         "hud.skill.sw_dash_drain_title": "Dash Drain",
@@ -175,6 +195,9 @@
         "hud.skill.sw_spin_spins": "Increases the number of times you can spin{SP}",
         "hud.skill.sw_interrupt_title": "Interrupting Attacks",
         "hud.skill.sw_interrupt": "Allows you to immediately cancel an attack with another attack{SP}",
+        // Axe
+        "hud.skill.axe_double_strike_title": "Double Strike",
+        "hud.skill.axe_double_strike": "Chop down those villains",
         "hud.skill.axe_double_strike_combo_title": "Double Strike Combo",
         "hud.skill.axe_double_strike_combo": "Unlocks a second strike{SP}",
         "hud.skill.axe_double_strike_damage_title": "Double Strike Damage",
@@ -183,6 +206,8 @@
         "hud.skill.axe_double_strike_speed": "Increases the attack speed with each successive strike{SP}",
         "hud.skill.axe_double_strike_regen_title": "Double Strike Regen",
         "hud.skill.axe_double_strike_regen": "Increases stamina gain with each successive strike{SP}",
+        "hud.skill.axe_spin_title": "Axe Spin",
+        "hud.skill.axe_spin": "You spin it right round ...",
         "hud.skill.axe_infinite_axe_spin_title": "Infinite Axe Spin",
         "hud.skill.axe_infinite_axe_spin": "Spin for as long as you have energy{SP}",
         "hud.skill.axe_spin_damage_title": "Spin Damage",
diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs
index 3f3f8027a6..9547fd9d67 100644
--- a/voxygen/src/hud/diary.rs
+++ b/voxygen/src/hud/diary.rs
@@ -53,12 +53,14 @@ widget_ids! {
         skill_sword_combo_1,
         skill_sword_combo_2,
         skill_sword_combo_3,
+        skill_sword_combo_4,
         skill_sword_dash_0,
         skill_sword_dash_1,
         skill_sword_dash_2,
         skill_sword_dash_3,
         skill_sword_dash_4,
         skill_sword_dash_5,
+        skill_sword_dash_6,
         skill_sword_spin_0,
         skill_sword_spin_1,
         skill_sword_spin_2,
@@ -70,11 +72,13 @@ widget_ids! {
         skill_axe_combo_1,
         skill_axe_combo_2,
         skill_axe_combo_3,
+        skill_axe_combo_4,
         skill_axe_spin_0,
         skill_axe_spin_1,
         skill_axe_spin_2,
         skill_axe_spin_3,
         skill_axe_spin_4,
+        skill_axe_spin_5,
         skill_axe_leap_0,
         skill_axe_leap_1,
         skill_axe_leap_2,
@@ -85,10 +89,12 @@ widget_ids! {
         skill_hammer_combo_1,
         skill_hammer_combo_2,
         skill_hammer_combo_3,
+        skill_hammer_combo_4,
         skill_hammer_charged_0,
         skill_hammer_charged_1,
         skill_hammer_charged_2,
         skill_hammer_charged_3,
+        skill_hammer_charged_4,
         skill_hammer_leap_0,
         skill_hammer_leap_1,
         skill_hammer_leap_2,
@@ -98,12 +104,14 @@ widget_ids! {
         bow_render,
         skill_bow_basic_0,
         skill_bow_basic_1,
+        skill_bow_basic_2,
         skill_bow_charged_0,
         skill_bow_charged_1,
         skill_bow_charged_2,
         skill_bow_charged_3,
         skill_bow_charged_4,
         skill_bow_charged_5,
+        skill_bow_charged_6,
         skill_bow_repeater_0,
         skill_bow_repeater_1,
         skill_bow_repeater_2,
@@ -115,10 +123,12 @@ widget_ids! {
         skill_staff_basic_1,
         skill_staff_basic_2,
         skill_staff_basic_3,
+        skill_staff_basic_4,
         skill_staff_beam_0,
         skill_staff_beam_1,
         skill_staff_beam_2,
         skill_staff_beam_3,
+        skill_staff_beam_4,
         skill_staff_shockwave_0,
         skill_staff_shockwave_1,
         skill_staff_shockwave_2,
@@ -131,11 +141,13 @@ widget_ids! {
         skill_sceptre_beam_3,
         skill_sceptre_beam_4,
         skill_sceptre_beam_5,
+        skill_sceptre_beam_6,
         skill_sceptre_bomb_0,
         skill_sceptre_bomb_1,
         skill_sceptre_bomb_2,
         skill_sceptre_bomb_3,
         skill_sceptre_bomb_4,
+        skill_sceptre_bomb_5,
         general_combat_render_0,
         general_combat_render_1,
         skill_general_stat_0,
@@ -518,22 +530,22 @@ impl<'a> Widget for Diary<'a> {
         // Maximum of 9 skills/8 indices
         let skills_top_l = match sel_tab {
             SelectedSkillTree::General => 2,
-            SelectedSkillTree::Weapon(ToolKind::Sword) => 4,
-            SelectedSkillTree::Weapon(ToolKind::Axe) => 4,
-            SelectedSkillTree::Weapon(ToolKind::Hammer) => 4,
-            SelectedSkillTree::Weapon(ToolKind::Bow) => 2,
-            SelectedSkillTree::Weapon(ToolKind::Staff) => 4,
-            SelectedSkillTree::Weapon(ToolKind::Sceptre) => 6,
+            SelectedSkillTree::Weapon(ToolKind::Sword) => 5,
+            SelectedSkillTree::Weapon(ToolKind::Axe) => 5,
+            SelectedSkillTree::Weapon(ToolKind::Hammer) => 5,
+            SelectedSkillTree::Weapon(ToolKind::Bow) => 3,
+            SelectedSkillTree::Weapon(ToolKind::Staff) => 5,
+            SelectedSkillTree::Weapon(ToolKind::Sceptre) => 7,
             _ => 0,
         };
         let skills_top_r = match sel_tab {
             SelectedSkillTree::General => 6,
-            SelectedSkillTree::Weapon(ToolKind::Sword) => 6,
-            SelectedSkillTree::Weapon(ToolKind::Axe) => 5,
-            SelectedSkillTree::Weapon(ToolKind::Hammer) => 4,
-            SelectedSkillTree::Weapon(ToolKind::Bow) => 6,
-            SelectedSkillTree::Weapon(ToolKind::Staff) => 4,
-            SelectedSkillTree::Weapon(ToolKind::Sceptre) => 5,
+            SelectedSkillTree::Weapon(ToolKind::Sword) => 7,
+            SelectedSkillTree::Weapon(ToolKind::Axe) => 6,
+            SelectedSkillTree::Weapon(ToolKind::Hammer) => 5,
+            SelectedSkillTree::Weapon(ToolKind::Bow) => 7,
+            SelectedSkillTree::Weapon(ToolKind::Staff) => 5,
+            SelectedSkillTree::Weapon(ToolKind::Sceptre) => 6,
             _ => 0,
         };
         let skills_bot_l = match sel_tab {
@@ -914,7 +926,7 @@ impl<'a> Widget for Diary<'a> {
                 // Bottom left skills
                 let skill = Skill::Roll(ImmuneMelee);
                 if create_skill_button(
-                    self.imgs.swords_crossed,
+                    self.imgs.skill_dodge_skill,
                     state.skills_bot_l[0],
                     &self.stats.skill_set,
                     skill,
@@ -940,7 +952,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Roll(Cost);
                 if create_skill_button(
-                    self.imgs.swords_crossed,
+                    self.imgs.utility_cost_skill,
                     state.skills_bot_l[1],
                     &self.stats.skill_set,
                     skill,
@@ -966,7 +978,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Roll(Strength);
                 if create_skill_button(
-                    self.imgs.swords_crossed,
+                    self.imgs.utility_speed_skill,
                     state.skills_bot_l[2],
                     &self.stats.skill_set,
                     skill,
@@ -992,7 +1004,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Roll(Duration);
                 if create_skill_button(
-                    self.imgs.swords_crossed,
+                    self.imgs.utility_amount_skill,
                     state.skills_bot_l[3],
                     &self.stats.skill_set,
                     skill,
@@ -1034,10 +1046,21 @@ impl<'a> Widget for Diary<'a> {
                 //        5 1 6
                 //        3 0 4
                 //        8 2 7
+                Button::image(self.imgs.twohsword_m1)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_l[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self.localized_strings.get("hud.skill.sw_trip_str_title"),
+                        &self.localized_strings.get("hud.skill.sw_trip_str"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_sword_combo_0, ui);
                 let skill = Skill::Sword(TsCombo);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_l[0],
+                    self.imgs.physical_combo_skill,
+                    state.skills_top_l[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1049,9 +1072,7 @@ impl<'a> Widget for Diary<'a> {
                         .localized_strings
                         .get("hud.skill.sw_trip_str_combo_title"),
                     &add_sp_cost_tooltip(
-                        &self
-                            .localized_strings
-                            .get("hud.skill.sw_trip_str_combo_title"),
+                        &self.localized_strings.get("hud.skill.sw_trip_str_combo"),
                         skill,
                         &self.stats.skill_set,
                         &self.localized_strings,
@@ -1059,15 +1080,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_combo_0, ui)
+                .set(state.skill_sword_combo_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sword(TsDamage);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_l[1],
+                    self.imgs.physical_damage_skill,
+                    state.skills_top_l[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1087,15 +1108,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_combo_1, ui)
+                .set(state.skill_sword_combo_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sword(TsSpeed);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_l[2],
+                    self.imgs.physical_speed_skill,
+                    state.skills_top_l[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1113,15 +1134,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_combo_2, ui)
+                .set(state.skill_sword_combo_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sword(TsRegen);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_l[3],
+                    self.imgs.physical_energy_regen_skill,
+                    state.skills_top_l[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1141,16 +1162,27 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_combo_3, ui)
+                .set(state.skill_sword_combo_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 // Top right skills
+                Button::image(self.imgs.twohsword_m2)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_r[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self.localized_strings.get("hud.skill.sw_dash_title"),
+                        &self.localized_strings.get("hud.skill.sw_dash"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_sword_dash_0, ui);
                 let skill = Skill::Sword(DDamage);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_r[0],
+                    self.imgs.physical_damage_skill,
+                    state.skills_top_r[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1168,15 +1200,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_dash_0, ui)
+                .set(state.skill_sword_dash_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sword(DDrain);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_r[1],
+                    self.imgs.physical_energy_drain_skill,
+                    state.skills_top_r[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1194,15 +1226,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_dash_1, ui)
+                .set(state.skill_sword_dash_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sword(DCost);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_r[2],
+                    self.imgs.physical_cost_skill,
+                    state.skills_top_r[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1220,15 +1252,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_dash_2, ui)
+                .set(state.skill_sword_dash_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sword(DSpeed);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_r[3],
+                    self.imgs.physical_speed_skill,
+                    state.skills_top_r[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1246,15 +1278,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_dash_3, ui)
+                .set(state.skill_sword_dash_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sword(DInfinite);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_r[4],
+                    self.imgs.physical_infinite_skill,
+                    state.skills_top_r[5],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1272,15 +1304,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_dash_4, ui)
+                .set(state.skill_sword_dash_5, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sword(DScaling);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
-                    state.skills_top_r[5],
+                    self.imgs.physical_amount_skill,
+                    state.skills_top_r[6],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1298,7 +1330,7 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sword_dash_5, ui)
+                .set(state.skill_sword_dash_6, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
@@ -1332,7 +1364,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Sword(SDamage);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
+                    self.imgs.physical_damage_skill,
                     state.skills_bot_l[1],
                     &self.stats.skill_set,
                     skill,
@@ -1358,7 +1390,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Sword(SSpeed);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
+                    self.imgs.physical_damage_skill,
                     state.skills_bot_l[2],
                     &self.stats.skill_set,
                     skill,
@@ -1384,7 +1416,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Sword(SCost);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
+                    self.imgs.physical_cost_skill,
                     state.skills_bot_l[3],
                     &self.stats.skill_set,
                     skill,
@@ -1410,7 +1442,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Sword(SSpins);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
+                    self.imgs.physical_amount_skill,
                     state.skills_bot_l[4],
                     &self.stats.skill_set,
                     skill,
@@ -1437,7 +1469,7 @@ impl<'a> Widget for Diary<'a> {
                 // Bottom right skills
                 let skill = Skill::Sword(InterruptingAttacks);
                 if create_skill_button(
-                    self.imgs.sword_whirlwind,
+                    self.imgs.physical_damage_skill,
                     state.skills_bot_r[0],
                     &self.stats.skill_set,
                     skill,
@@ -1479,10 +1511,23 @@ impl<'a> Widget for Diary<'a> {
                 //        5 1 6
                 //        3 0 4
                 //        8 2 7
+                Button::image(self.imgs.twohaxe_m1)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_l[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self
+                            .localized_strings
+                            .get("hud.skill.axe_double_strike_title"),
+                        &self.localized_strings.get("hud.skill.axe_double_strike"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_axe_combo_0, ui);
                 let skill = Skill::Axe(DsCombo);
                 if create_skill_button(
-                    self.imgs.axespin,
-                    state.skills_top_l[0],
+                    self.imgs.physical_combo_skill,
+                    state.skills_top_l[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1504,15 +1549,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_combo_0, ui)
+                .set(state.skill_axe_combo_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Axe(DsDamage);
                 if create_skill_button(
-                    self.imgs.axespin,
-                    state.skills_top_l[1],
+                    self.imgs.physical_damage_skill,
+                    state.skills_top_l[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1534,15 +1579,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_combo_1, ui)
+                .set(state.skill_axe_combo_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Axe(DsSpeed);
                 if create_skill_button(
-                    self.imgs.axespin,
-                    state.skills_top_l[2],
+                    self.imgs.physical_speed_skill,
+                    state.skills_top_l[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1564,15 +1609,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_combo_2, ui)
+                .set(state.skill_axe_combo_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Axe(DsRegen);
                 if create_skill_button(
-                    self.imgs.axespin,
-                    state.skills_top_l[3],
+                    self.imgs.physical_energy_regen_skill,
+                    state.skills_top_l[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1594,16 +1639,27 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_combo_3, ui)
+                .set(state.skill_axe_combo_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 // Top right skills
+                Button::image(self.imgs.axespin)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_r[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self.localized_strings.get("hud.skill.axe_spin_title"),
+                        &self.localized_strings.get("hud.skill.axe_spin"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_axe_spin_0, ui);
                 let skill = Skill::Axe(SInfinite);
                 if create_skill_button(
-                    self.imgs.spin_infinite_skill,
-                    state.skills_top_r[0],
+                    self.imgs.physical_infinite_skill,
+                    state.skills_top_r[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1625,15 +1681,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_spin_0, ui)
+                .set(state.skill_axe_spin_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Axe(SDamage);
                 if create_skill_button(
-                    self.imgs.spin_damage_skill,
-                    state.skills_top_r[1],
+                    self.imgs.physical_damage_skill,
+                    state.skills_top_r[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1653,15 +1709,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_spin_1, ui)
+                .set(state.skill_axe_spin_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Axe(SHelicopter);
                 if create_skill_button(
-                    self.imgs.spin_helicopter_skill,
-                    state.skills_top_r[2],
+                    self.imgs.physical_helicopter_skill,
+                    state.skills_top_r[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1681,15 +1737,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_spin_2, ui)
+                .set(state.skill_axe_spin_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Axe(SSpeed);
                 if create_skill_button(
-                    self.imgs.spin_speed_skill,
-                    state.skills_top_r[3],
+                    self.imgs.physical_speed_skill,
+                    state.skills_top_r[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1707,15 +1763,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_spin_3, ui)
+                .set(state.skill_axe_spin_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Axe(SCost);
                 if create_skill_button(
-                    self.imgs.spin_cost_skill,
-                    state.skills_top_r[4],
+                    self.imgs.physical_cost_skill,
+                    state.skills_top_r[5],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1733,7 +1789,7 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_axe_spin_4, ui)
+                .set(state.skill_axe_spin_5, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
@@ -1741,7 +1797,7 @@ impl<'a> Widget for Diary<'a> {
                 // Bottom left skills
                 let skill = Skill::Axe(UnlockLeap);
                 if create_skill_button(
-                    self.imgs.axespin,
+                    self.imgs.skill_axe_leap_slash,
                     state.skills_bot_l[0],
                     &self.stats.skill_set,
                     skill,
@@ -1769,7 +1825,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Axe(LDamage);
                 if create_skill_button(
-                    self.imgs.leap_damage_skill,
+                    self.imgs.physical_damage_skill,
                     state.skills_bot_l[1],
                     &self.stats.skill_set,
                     skill,
@@ -1797,7 +1853,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Axe(LKnockback);
                 if create_skill_button(
-                    self.imgs.leap_knockback_skill,
+                    self.imgs.physical_knockback_skill,
                     state.skills_bot_l[2],
                     &self.stats.skill_set,
                     skill,
@@ -1825,7 +1881,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Axe(LCost);
                 if create_skill_button(
-                    self.imgs.leap_cost_skill,
+                    self.imgs.physical_cost_skill,
                     state.skills_bot_l[3],
                     &self.stats.skill_set,
                     skill,
@@ -1851,7 +1907,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Axe(LDistance);
                 if create_skill_button(
-                    self.imgs.leap_distance_skill,
+                    self.imgs.physical_distance_skill,
                     state.skills_bot_l[4],
                     &self.stats.skill_set,
                     skill,
@@ -1895,10 +1951,23 @@ impl<'a> Widget for Diary<'a> {
                 //        5 1 6
                 //        3 0 4
                 //        8 2 7
+                Button::image(self.imgs.twohhammer_m1)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_l[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self
+                            .localized_strings
+                            .get("hud.skill.hmr_single_strike_title"),
+                        &self.localized_strings.get("hud.skill.hmr_single_strike"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_hammer_combo_0, ui);
                 let skill = Skill::Hammer(SsKnockback);
                 if create_skill_button(
-                    self.imgs.hammergolf,
-                    state.skills_top_l[0],
+                    self.imgs.physical_knockback_skill,
+                    state.skills_top_l[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1920,15 +1989,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_hammer_combo_0, ui)
+                .set(state.skill_hammer_combo_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Hammer(SsDamage);
                 if create_skill_button(
-                    self.imgs.hammergolf,
-                    state.skills_top_l[1],
+                    self.imgs.physical_damage_skill,
+                    state.skills_top_l[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1950,15 +2019,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_hammer_combo_1, ui)
+                .set(state.skill_hammer_combo_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Hammer(SsSpeed);
                 if create_skill_button(
-                    self.imgs.hammergolf,
-                    state.skills_top_l[2],
+                    self.imgs.physical_speed_skill,
+                    state.skills_top_l[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -1980,15 +2049,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_hammer_combo_2, ui)
+                .set(state.skill_hammer_combo_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Hammer(SsRegen);
                 if create_skill_button(
-                    self.imgs.hammergolf,
-                    state.skills_top_l[3],
+                    self.imgs.physical_energy_regen_skill,
+                    state.skills_top_l[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2010,16 +2079,29 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_hammer_combo_3, ui)
+                .set(state.skill_hammer_combo_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 // Top right skills
+                Button::image(self.imgs.hammergolf)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_r[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self
+                            .localized_strings
+                            .get("hud.skill.hmr_charged_melee_title"),
+                        &self.localized_strings.get("hud.skill.hmr_charged_melee"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_hammer_charged_0, ui);
                 let skill = Skill::Hammer(CKnockback);
                 if create_skill_button(
-                    self.imgs.hammergolf,
-                    state.skills_top_r[0],
+                    self.imgs.physical_knockback_skill,
+                    state.skills_top_r[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2041,15 +2123,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_hammer_charged_0, ui)
+                .set(state.skill_hammer_charged_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Hammer(CDamage);
                 if create_skill_button(
-                    self.imgs.hammergolf,
-                    state.skills_top_r[1],
+                    self.imgs.physical_damage_skill,
+                    state.skills_top_r[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2071,15 +2153,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_hammer_charged_1, ui)
+                .set(state.skill_hammer_charged_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Hammer(CDrain);
                 if create_skill_button(
-                    self.imgs.hammergolf,
-                    state.skills_top_r[2],
+                    self.imgs.physical_energy_drain_skill,
+                    state.skills_top_r[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2101,15 +2183,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_hammer_charged_2, ui)
+                .set(state.skill_hammer_charged_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Hammer(CSpeed);
                 if create_skill_button(
-                    self.imgs.hammergolf,
-                    state.skills_top_r[3],
+                    self.imgs.physical_amount_skill,
+                    state.skills_top_r[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2129,7 +2211,7 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_hammer_charged_3, ui)
+                .set(state.skill_hammer_charged_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
@@ -2137,7 +2219,7 @@ impl<'a> Widget for Diary<'a> {
                 // Bottom left skills
                 let skill = Skill::Hammer(UnlockLeap);
                 if create_skill_button(
-                    self.imgs.hammergolf,
+                    self.imgs.hammerleap,
                     state.skills_bot_l[0],
                     &self.stats.skill_set,
                     skill,
@@ -2165,7 +2247,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Hammer(LDamage);
                 if create_skill_button(
-                    self.imgs.hammergolf,
+                    self.imgs.physical_damage_skill,
                     state.skills_bot_l[1],
                     &self.stats.skill_set,
                     skill,
@@ -2193,7 +2275,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Hammer(LKnockback);
                 if create_skill_button(
-                    self.imgs.hammergolf,
+                    self.imgs.physical_knockback_skill,
                     state.skills_bot_l[2],
                     &self.stats.skill_set,
                     skill,
@@ -2221,7 +2303,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Hammer(LCost);
                 if create_skill_button(
-                    self.imgs.hammergolf,
+                    self.imgs.physical_cost_skill,
                     state.skills_bot_l[3],
                     &self.stats.skill_set,
                     skill,
@@ -2247,7 +2329,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Hammer(LDistance);
                 if create_skill_button(
-                    self.imgs.hammergolf,
+                    self.imgs.physical_distance_skill,
                     state.skills_bot_l[4],
                     &self.stats.skill_set,
                     skill,
@@ -2275,7 +2357,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Hammer(LRange);
                 if create_skill_button(
-                    self.imgs.hammer_leap_radius_skill,
+                    self.imgs.physical_radius_skill,
                     state.skills_bot_l[5],
                     &self.stats.skill_set,
                     skill,
@@ -2318,10 +2400,21 @@ impl<'a> Widget for Diary<'a> {
                 //        5 1 6
                 //        3 0 4
                 //        8 2 7
+                Button::image(self.imgs.bow_m1)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_l[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self.localized_strings.get("hud.skill.bow_title"),
+                        &self.localized_strings.get("hud.skill.bow"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_bow_basic_0, ui);
                 let skill = Skill::Bow(BDamage);
                 if create_skill_button(
-                    self.imgs.bow_m1,
-                    state.skills_top_l[0],
+                    self.imgs.physical_damage_skill,
+                    state.skills_top_l[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2339,15 +2432,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_bow_basic_0, ui)
+                .set(state.skill_bow_basic_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Bow(BRegen);
                 if create_skill_button(
-                    self.imgs.bow_m1,
-                    state.skills_top_l[1],
+                    self.imgs.physical_energy_regen_skill,
+                    state.skills_top_l[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2367,16 +2460,27 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_bow_basic_1, ui)
+                .set(state.skill_bow_basic_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 // Top right skills
+                Button::image(self.imgs.bow_m2)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_r[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self.localized_strings.get("hud.skill.bow_charged_title"),
+                        &self.localized_strings.get("hud.skill.bow_charged"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_bow_charged_0, ui);
                 let skill = Skill::Bow(CDamage);
                 if create_skill_button(
-                    self.imgs.bow_m1,
-                    state.skills_top_r[0],
+                    self.imgs.physical_damage_skill,
+                    state.skills_top_r[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2396,15 +2500,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_bow_charged_0, ui)
+                .set(state.skill_bow_charged_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Bow(CDrain);
                 if create_skill_button(
-                    self.imgs.bow_m1,
-                    state.skills_top_r[1],
+                    self.imgs.physical_energy_drain_skill,
+                    state.skills_top_r[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2424,15 +2528,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_bow_charged_1, ui)
+                .set(state.skill_bow_charged_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Bow(CProjSpeed);
                 if create_skill_button(
-                    self.imgs.bow_m1,
-                    state.skills_top_r[2],
+                    self.imgs.physical_projectile_speed_skill,
+                    state.skills_top_r[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2454,15 +2558,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_bow_charged_2, ui)
+                .set(state.skill_bow_charged_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Bow(CSpeed);
                 if create_skill_button(
-                    self.imgs.bow_m1,
-                    state.skills_top_r[3],
+                    self.imgs.physical_speed_skill,
+                    state.skills_top_r[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2482,15 +2586,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_bow_charged_3, ui)
+                .set(state.skill_bow_charged_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Bow(CMove);
                 if create_skill_button(
-                    self.imgs.bow_m1,
-                    state.skills_top_r[4],
+                    self.imgs.physical_speed_skill,
+                    state.skills_top_r[5],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2512,15 +2616,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_bow_charged_4, ui)
+                .set(state.skill_bow_charged_5, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Bow(CKnockback);
                 if create_skill_button(
-                    self.imgs.bow_m1,
-                    state.skills_top_r[5],
+                    self.imgs.physical_knockback_skill,
+                    state.skills_top_r[6],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2542,7 +2646,7 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_bow_charged_5, ui)
+                .set(state.skill_bow_charged_6, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
@@ -2550,7 +2654,7 @@ impl<'a> Widget for Diary<'a> {
                 // Bottom left skills
                 let skill = Skill::Bow(UnlockRepeater);
                 if create_skill_button(
-                    self.imgs.bow_m1,
+                    self.imgs.skill_bow_jump_burst,
                     state.skills_bot_l[0],
                     &self.stats.skill_set,
                     skill,
@@ -2578,7 +2682,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Bow(RDamage);
                 if create_skill_button(
-                    self.imgs.bow_m1,
+                    self.imgs.physical_damage_skill,
                     state.skills_bot_l[1],
                     &self.stats.skill_set,
                     skill,
@@ -2606,7 +2710,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Bow(RGlide);
                 if create_skill_button(
-                    self.imgs.bow_m1,
+                    self.imgs.physical_helicopter_skill,
                     state.skills_bot_l[2],
                     &self.stats.skill_set,
                     skill,
@@ -2634,7 +2738,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Bow(RCost);
                 if create_skill_button(
-                    self.imgs.bow_m1,
+                    self.imgs.physical_cost_skill,
                     state.skills_bot_l[3],
                     &self.stats.skill_set,
                     skill,
@@ -2662,7 +2766,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Bow(RArrows);
                 if create_skill_button(
-                    self.imgs.bow_m1,
+                    self.imgs.physical_amount_skill,
                     state.skills_bot_l[4],
                     &self.stats.skill_set,
                     skill,
@@ -2691,7 +2795,7 @@ impl<'a> Widget for Diary<'a> {
                 // Bottom right skills
                 let skill = Skill::Bow(ProjSpeed);
                 if create_skill_button(
-                    self.imgs.bow_m1,
+                    self.imgs.physical_projectile_speed_skill,
                     state.skills_bot_r[0],
                     &self.stats.skill_set,
                     skill,
@@ -2735,10 +2839,21 @@ impl<'a> Widget for Diary<'a> {
                 //        5 1 6
                 //        3 0 4
                 //        8 2 7
+                Button::image(self.imgs.fireball)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_l[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self.localized_strings.get("hud.skill.st_fireball_title"),
+                        &self.localized_strings.get("hud.skill.st_fireball"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_staff_basic_0, ui);
                 let skill = Skill::Staff(BExplosion);
                 if create_skill_button(
-                    self.imgs.fireball,
-                    state.skills_top_l[0],
+                    self.imgs.magic_explosion_skill,
+                    state.skills_top_l[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2756,15 +2871,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_staff_basic_0, ui)
+                .set(state.skill_staff_basic_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Staff(BDamage);
                 if create_skill_button(
-                    self.imgs.fireball,
-                    state.skills_top_l[1],
+                    self.imgs.magic_damage_skill,
+                    state.skills_top_l[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2782,15 +2897,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_staff_basic_1, ui)
+                .set(state.skill_staff_basic_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Staff(BRegen);
                 if create_skill_button(
-                    self.imgs.fireball,
-                    state.skills_top_l[2],
+                    self.imgs.magic_energy_regen_skill,
+                    state.skills_top_l[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2810,15 +2925,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_staff_basic_2, ui)
+                .set(state.skill_staff_basic_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Staff(BRadius);
                 if create_skill_button(
-                    self.imgs.fireball,
-                    state.skills_top_l[3],
+                    self.imgs.magic_radius_skill,
+                    state.skills_top_l[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2838,16 +2953,29 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_staff_basic_3, ui)
+                .set(state.skill_staff_basic_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 // Top right skills
+                Button::image(self.imgs.flamethrower)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_r[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self
+                            .localized_strings
+                            .get("hud.skill.st_flamethrower_title"),
+                        &self.localized_strings.get("hud.skill.st_flamethrower"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_staff_beam_0, ui);
                 let skill = Skill::Staff(FDamage);
                 if create_skill_button(
-                    self.imgs.fireball,
-                    state.skills_top_r[0],
+                    self.imgs.magic_damage_skill,
+                    state.skills_top_r[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2869,15 +2997,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_staff_beam_0, ui)
+                .set(state.skill_staff_beam_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Staff(FDrain);
                 if create_skill_button(
-                    self.imgs.fireball,
-                    state.skills_top_r[1],
+                    self.imgs.magic_energy_drain_skill,
+                    state.skills_top_r[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2897,15 +3025,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_staff_beam_1, ui)
+                .set(state.skill_staff_beam_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Staff(FRange);
                 if create_skill_button(
-                    self.imgs.fireball,
-                    state.skills_top_r[2],
+                    self.imgs.magic_radius_skill,
+                    state.skills_top_r[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2927,15 +3055,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_staff_beam_2, ui)
+                .set(state.skill_staff_beam_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Staff(FVelocity);
                 if create_skill_button(
-                    self.imgs.fireball,
-                    state.skills_top_r[3],
+                    self.imgs.magic_projectile_speed_skill,
+                    state.skills_top_r[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -2955,7 +3083,7 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_staff_beam_3, ui)
+                .set(state.skill_staff_beam_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
@@ -2963,7 +3091,7 @@ impl<'a> Widget for Diary<'a> {
                 // Bottom left skills
                 let skill = Skill::Staff(UnlockShockwave);
                 if create_skill_button(
-                    self.imgs.fireball,
+                    self.imgs.fire_aoe,
                     state.skills_bot_l[0],
                     &self.stats.skill_set,
                     skill,
@@ -2991,7 +3119,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Staff(SDamage);
                 if create_skill_button(
-                    self.imgs.fireball,
+                    self.imgs.magic_damage_skill,
                     state.skills_bot_l[1],
                     &self.stats.skill_set,
                     skill,
@@ -3019,7 +3147,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Staff(SKnockback);
                 if create_skill_button(
-                    self.imgs.fireball,
+                    self.imgs.magic_knockback_skill,
                     state.skills_bot_l[2],
                     &self.stats.skill_set,
                     skill,
@@ -3049,7 +3177,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Staff(SCost);
                 if create_skill_button(
-                    self.imgs.fireball,
+                    self.imgs.magic_cost_skill,
                     state.skills_bot_l[3],
                     &self.stats.skill_set,
                     skill,
@@ -3077,7 +3205,7 @@ impl<'a> Widget for Diary<'a> {
                 };
                 let skill = Skill::Staff(SRange);
                 if create_skill_button(
-                    self.imgs.fireball,
+                    self.imgs.magic_radius_skill,
                     state.skills_bot_l[4],
                     &self.stats.skill_set,
                     skill,
@@ -3121,10 +3249,21 @@ impl<'a> Widget for Diary<'a> {
                 //        5 1 6
                 //        3 0 4
                 //        8 2 7
+                Button::image(self.imgs.heal_0)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_l[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self.localized_strings.get("hud.skill.sc_beam_title"),
+                        &self.localized_strings.get("hud.skill.sc_beam"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_sceptre_beam_0, ui);
                 let skill = Skill::Sceptre(BHeal);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_l[0],
+                    self.imgs.heal_heal_skill,
+                    state.skills_top_l[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3142,15 +3281,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_beam_0, ui)
+                .set(state.skill_sceptre_beam_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(BDamage);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_l[1],
+                    self.imgs.heal_damage_skill,
+                    state.skills_top_l[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3168,15 +3307,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_beam_1, ui)
+                .set(state.skill_sceptre_beam_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(BRegen);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_l[2],
+                    self.imgs.heal_energy_regen_skill,
+                    state.skills_top_l[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3196,15 +3335,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_beam_2, ui)
+                .set(state.skill_sceptre_beam_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(BRange);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_l[3],
+                    self.imgs.heal_radius_skill,
+                    state.skills_top_l[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3222,15 +3361,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_beam_3, ui)
+                .set(state.skill_sceptre_beam_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(BLifesteal);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_l[4],
+                    self.imgs.heal_lifesteal_skill,
+                    state.skills_top_l[5],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3252,15 +3391,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_beam_4, ui)
+                .set(state.skill_sceptre_beam_5, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(BCost);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_l[5],
+                    self.imgs.heal_cost_skill,
+                    state.skills_top_l[6],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3278,16 +3417,27 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_beam_5, ui)
+                .set(state.skill_sceptre_beam_6, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
+                Button::image(self.imgs.heal_bomb)
+                    .w_h(74.0, 74.0)
+                    .mid_top_with_margin_on(state.skills_top_r[0], 3.0)
+                    .with_tooltip(
+                        self.tooltip_manager,
+                        &self.localized_strings.get("hud.skill.sc_healbomb_title"),
+                        &self.localized_strings.get("hud.skill.sc_healbomb"),
+                        &diary_tooltip,
+                        TEXT_COLOR,
+                    )
+                    .set(state.skill_sceptre_bomb_0, ui);
                 // Top right skills
                 let skill = Skill::Sceptre(PHeal);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_r[0],
+                    self.imgs.heal_heal_skill,
+                    state.skills_top_r[1],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3305,15 +3455,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_bomb_0, ui)
+                .set(state.skill_sceptre_bomb_1, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(PDamage);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_r[1],
+                    self.imgs.heal_damage_skill,
+                    state.skills_top_r[2],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3331,15 +3481,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_bomb_1, ui)
+                .set(state.skill_sceptre_bomb_2, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(PRadius);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_r[2],
+                    self.imgs.heal_radius_skill,
+                    state.skills_top_r[3],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3357,15 +3507,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_bomb_2, ui)
+                .set(state.skill_sceptre_bomb_3, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(PCost);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_r[3],
+                    self.imgs.heal_cost_skill,
+                    state.skills_top_r[4],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3383,15 +3533,15 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_bomb_3, ui)
+                .set(state.skill_sceptre_bomb_4, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
                 };
                 let skill = Skill::Sceptre(PProjSpeed);
                 if create_skill_button(
-                    self.imgs.heal_0,
-                    state.skills_top_r[4],
+                    self.imgs.heal_projectile_speed_skill,
+                    state.skills_top_r[5],
                     &self.stats.skill_set,
                     skill,
                     self.fonts,
@@ -3411,7 +3561,7 @@ impl<'a> Widget for Diary<'a> {
                     &diary_tooltip,
                     TEXT_COLOR,
                 )
-                .set(state.skill_sceptre_bomb_4, ui)
+                .set(state.skill_sceptre_bomb_5, ui)
                 .was_clicked()
                 {
                     events.push(Event::UnlockSkill(skill));
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index d7da861e52..1d4cc01cfc 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -180,19 +180,109 @@ image_ids! {
         unlock_sceptre_skill: "voxygen.element.icons.skilltree.unlock_sceptre",
         unlock_staff_skill0: "voxygen.element.icons.skilltree.unlock_staff-0",
         unlock_sword_skill: "voxygen.element.icons.skilltree.unlock_sword",
+        skill_dodge_skill: "voxygen.element.icons.skilltree.skill_dodge",
 
-        spin_infinite_skill: "voxygen.element.icons.skilltree.spin_infinite",
-        spin_damage_skill: "voxygen.element.icons.skilltree.spin_damage",
-        spin_helicopter_skill: "voxygen.element.icons.skilltree.spin_helicopter",
-        spin_speed_skill: "voxygen.element.icons.skilltree.spin_speed",
-        spin_cost_skill: "voxygen.element.icons.skilltree.spin_cost",
-        leap_damage_skill: "voxygen.element.icons.skilltree.leap_damage",
-        leap_knockback_skill: "voxygen.element.icons.skilltree.leap_knockback",
-        leap_cost_skill: "voxygen.element.icons.skilltree.leap_cost",
-        leap_distance_skill: "voxygen.element.icons.skilltree.leap_distance",
-        hammer_leap_radius_skill: "voxygen.element.icons.skilltree.leap_radius",
+        buff_amount_skill: "voxygen.element.icons.skilltree.buff_amount",
+        buff_combo_skill: "voxygen.element.icons.skilltree.buff_combo",
+        buff_cost_skill: "voxygen.element.icons.skilltree.buff_cost",
+        buff_damage_skill: "voxygen.element.icons.skilltree.buff_damage",
+        buff_distance_skill: "voxygen.element.icons.skilltree.buff_distance",
+        buff_energy_drain_skill: "voxygen.element.icons.skilltree.buff_energy_drain",
+        buff_energy_regen_skill: "voxygen.element.icons.skilltree.buff_energy_regen",
+        buff_explosion_skill: "voxygen.element.icons.skilltree.buff_explosion",
+        buff_heal_skill: "voxygen.element.icons.skilltree.buff_heal",
+        buff_helicopter_skill: "voxygen.element.icons.skilltree.buff_helicopter",
+        buff_infinite_skill: "voxygen.element.icons.skilltree.buff_infinite",
+        buff_knockback_skill: "voxygen.element.icons.skilltree.buff_knockback",
+        buff_lifesteal_skill: "voxygen.element.icons.skilltree.buff_lifesteal",
+        buff_projectile_speed_skill: "voxygen.element.icons.skilltree.buff_projectile_speed",
+        buff_radius_skill: "voxygen.element.icons.skilltree.buff_radius",
+        buff_speed_skill: "voxygen.element.icons.skilltree.buff_speed",
 
-        axe_spin_amount_skill: "voxygen.element.icons.skilltree.spin_amount",
+        debuff_amount_skill: "voxygen.element.icons.skilltree.debuff_amount",
+        debuff_combo_skill: "voxygen.element.icons.skilltree.debuff_combo",
+        debuff_cost_skill: "voxygen.element.icons.skilltree.debuff_cost",
+        debuff_damage_skill: "voxygen.element.icons.skilltree.debuff_damage",
+        debuff_distance_skill: "voxygen.element.icons.skilltree.debuff_distance",
+        debuff_energy_drain_skill: "voxygen.element.icons.skilltree.debuff_energy_drain",
+        debuff_energy_regen_skill: "voxygen.element.icons.skilltree.debuff_energy_regen",
+        debuff_explosion_skill: "voxygen.element.icons.skilltree.debuff_explosion",
+        debuff_heal_skill: "voxygen.element.icons.skilltree.debuff_heal",
+        debuff_helicopter_skill: "voxygen.element.icons.skilltree.debuff_helicopter",
+        debuff_infinite_skill: "voxygen.element.icons.skilltree.debuff_infinite",
+        debuff_knockback_skill: "voxygen.element.icons.skilltree.debuff_knockback",
+        debuff_lifesteal_skill: "voxygen.element.icons.skilltree.debuff_lifesteal",
+        debuff_projectile_speed_skill: "voxygen.element.icons.skilltree.debuff_projectile_speed",
+        debuff_radius_skill: "voxygen.element.icons.skilltree.debuff_radius",
+        debuff_speed_skill: "voxygen.element.icons.skilltree.debuff_speed",
+
+        heal_amount_skill: "voxygen.element.icons.skilltree.heal_amount",
+        heal_combo_skill: "voxygen.element.icons.skilltree.heal_combo",
+        heal_cost_skill: "voxygen.element.icons.skilltree.heal_cost",
+        heal_damage_skill: "voxygen.element.icons.skilltree.heal_damage",
+        heal_distance_skill: "voxygen.element.icons.skilltree.heal_distance",
+        heal_energy_drain_skill: "voxygen.element.icons.skilltree.heal_energy_drain",
+        heal_energy_regen_skill: "voxygen.element.icons.skilltree.heal_energy_regen",
+        heal_explosion_skill: "voxygen.element.icons.skilltree.heal_explosion",
+        heal_heal_skill: "voxygen.element.icons.skilltree.heal_heal",
+        heal_helicopter_skill: "voxygen.element.icons.skilltree.heal_helicopter",
+        heal_infinite_skill: "voxygen.element.icons.skilltree.heal_infinite",
+        heal_knockback_skill: "voxygen.element.icons.skilltree.heal_knockback",
+        heal_lifesteal_skill: "voxygen.element.icons.skilltree.heal_lifesteal",
+        heal_projectile_speed_skill: "voxygen.element.icons.skilltree.heal_projectile_speed",
+        heal_radius_skill: "voxygen.element.icons.skilltree.heal_radius",
+        heal_speed_skill: "voxygen.element.icons.skilltree.heal_speed",
+
+        magic_amount_skill: "voxygen.element.icons.skilltree.magic_amount",
+        magic_combo_skill: "voxygen.element.icons.skilltree.magic_combo",
+        magic_cost_skill: "voxygen.element.icons.skilltree.magic_cost",
+        magic_damage_skill: "voxygen.element.icons.skilltree.magic_damage",
+        magic_distance_skill: "voxygen.element.icons.skilltree.magic_distance",
+        magic_energy_drain_skill: "voxygen.element.icons.skilltree.magic_energy_drain",
+        magic_energy_regen_skill: "voxygen.element.icons.skilltree.magic_energy_regen",
+        magic_explosion_skill: "voxygen.element.icons.skilltree.magic_explosion",
+        magic_heal_skill: "voxygen.element.icons.skilltree.magic_heal",
+        magic_helicopter_skill: "voxygen.element.icons.skilltree.magic_helicopter",
+        magic_infinite_skill: "voxygen.element.icons.skilltree.magic_infinite",
+        magic_knockback_skill: "voxygen.element.icons.skilltree.magic_knockback",
+        magic_lifesteal_skill: "voxygen.element.icons.skilltree.magic_lifesteal",
+        magic_projectile_speed_skill: "voxygen.element.icons.skilltree.magic_projectile_speed",
+        magic_radius_skill: "voxygen.element.icons.skilltree.magic_radius",
+        magic_speed_skill: "voxygen.element.icons.skilltree.magic_speed",
+
+        physical_amount_skill: "voxygen.element.icons.skilltree.physical_amount",
+        physical_combo_skill: "voxygen.element.icons.skilltree.physical_combo",
+        physical_cost_skill: "voxygen.element.icons.skilltree.physical_cost",
+        physical_damage_skill: "voxygen.element.icons.skilltree.physical_damage",
+        physical_distance_skill: "voxygen.element.icons.skilltree.physical_distance",
+        physical_energy_drain_skill: "voxygen.element.icons.skilltree.physical_energy_drain",
+        physical_energy_regen_skill: "voxygen.element.icons.skilltree.physical_energy_regen",
+        physical_explosion_skill: "voxygen.element.icons.skilltree.physical_explosion",
+        physical_heal_skill: "voxygen.element.icons.skilltree.physical_heal",
+        physical_helicopter_skill: "voxygen.element.icons.skilltree.physical_helicopter",
+        physical_infinite_skill: "voxygen.element.icons.skilltree.physical_infinite",
+        physical_knockback_skill: "voxygen.element.icons.skilltree.physical_knockback",
+        physical_lifesteal_skill: "voxygen.element.icons.skilltree.physical_lifesteal",
+        physical_projectile_speed_skill: "voxygen.element.icons.skilltree.physical_projectile_speed",
+        physical_radius_skill: "voxygen.element.icons.skilltree.physical_radius",
+        physical_speed_skill: "voxygen.element.icons.skilltree.physical_speed",
+
+        utility_amount_skill: "voxygen.element.icons.skilltree.utility_amount",
+        utility_combo_skill: "voxygen.element.icons.skilltree.utility_combo",
+        utility_cost_skill: "voxygen.element.icons.skilltree.utility_cost",
+        utility_damage_skill: "voxygen.element.icons.skilltree.utility_damage",
+        utility_distance_skill: "voxygen.element.icons.skilltree.utility_distance",
+        utility_energy_drain_skill: "voxygen.element.icons.skilltree.utility_energy_drain",
+        utility_energy_regen_skill: "voxygen.element.icons.skilltree.utility_energy_regen",
+        utility_explosion_skill: "voxygen.element.icons.skilltree.utility_explosion",
+        utility_heal_skill: "voxygen.element.icons.skilltree.utility_heal",
+        utility_helicopter_skill: "voxygen.element.icons.skilltree.utility_helicopter",
+        utility_infinite_skill: "voxygen.element.icons.skilltree.utility_infinite",
+        utility_knockback_skill: "voxygen.element.icons.skilltree.utility_knockback",
+        utility_lifesteal_skill: "voxygen.element.icons.skilltree.utility_lifesteal",
+        utility_projectile_speed_skill: "voxygen.element.icons.skilltree.utility_projectile_speed",
+        utility_radius_skill: "voxygen.element.icons.skilltree.utility_radius",
+        utility_speed_skill: "voxygen.element.icons.skilltree.utility_speed",
 
         // Skillbar
         level_up: "voxygen.element.misc_bg.level_up",