diff --git a/bin/build-manifest.sh b/bin/build-manifest.sh
deleted file mode 100755
index ae0f427..0000000
--- a/bin/build-manifest.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-cd ./icons
-
-numFiles=$(ls -1 *.svg | wc -l)
-count=0
-
-echo [
-for icon in $(ls *.svg)
-do
-    count=$((count + 1))
-    echo -n "  "\"${icon%.svg}\"
-    (($count == $numFiles)) && echo "" || echo ,
-done
-echo ]
diff --git a/icons/communication/comment-circle.svg b/icons/communication/message-circle.svg
similarity index 100%
rename from icons/communication/comment-circle.svg
rename to icons/communication/message-circle.svg
diff --git a/icons/communication/comment-square.svg b/icons/communication/message-square.svg
similarity index 100%
rename from icons/communication/comment-square.svg
rename to icons/communication/message-square.svg
diff --git a/icons/media-controls/airplay.svg b/icons/core/airplay.svg
similarity index 100%
rename from icons/media-controls/airplay.svg
rename to icons/core/airplay.svg
diff --git a/icons/refresh-ccw.svg b/icons/core/refresh-ccw.svg
similarity index 100%
rename from icons/refresh-ccw.svg
rename to icons/core/refresh-ccw.svg
diff --git a/icons/refresh-cw.svg b/icons/core/refresh-cw.svg
similarity index 100%
rename from icons/refresh-cw.svg
rename to icons/core/refresh-cw.svg
diff --git a/icons/rotate-ccw.svg b/icons/core/rotate-ccw.svg
similarity index 100%
rename from icons/rotate-ccw.svg
rename to icons/core/rotate-ccw.svg
diff --git a/icons/rotate-cw.svg b/icons/core/rotate-cw.svg
similarity index 100%
rename from icons/rotate-cw.svg
rename to icons/core/rotate-cw.svg
diff --git a/icons/media-controls/shuffle.svg b/icons/media-controls/shuffle.svg
index 65fa1dc..ecfcece 100644
--- a/icons/media-controls/shuffle.svg
+++ b/icons/media-controls/shuffle.svg
@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>shuffle</title><polyline points="16 3 21 3 21 8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="4" y1="20" x2="21" y2="3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polyline points="21 16 21 21 16 21" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="15" y1="15" x2="21" y2="21" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="4" y1="4" x2="9" y2="9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="16 3 21 3 21 8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="4" y1="20" x2="21" y2="3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="21 16 21 21 16 21" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="15" y1="15" x2="21" y2="21" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="4" y1="4" x2="9" y2="9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/media-controls/skip-back.svg b/icons/media-controls/skip-back.svg
index d655c83..d0f02ff 100644
--- a/icons/media-controls/skip-back.svg
+++ b/icons/media-controls/skip-back.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>skip-back</title><polygon points="19 20 9 12 19 4 19 20" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="5" y1="19" x2="5" y2="5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="19 20 9 12 19 4 19 20" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="5" y1="19" x2="5" y2="5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/media-controls/skip-forward.svg b/icons/media-controls/skip-forward.svg
index 8dc5e27..b73f046 100644
--- a/icons/media-controls/skip-forward.svg
+++ b/icons/media-controls/skip-forward.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>skip-forward</title><polygon points="5 4 15 12 5 20 5 4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="19" y1="5" x2="19" y2="19" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="5 4 15 12 5 20 5 4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="19" y1="5" x2="19" y2="19" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>