diff --git a/icons/arrow-down.svg b/icons/arrows/arrow-down.svg
similarity index 100%
rename from icons/arrow-down.svg
rename to icons/arrows/arrow-down.svg
diff --git a/icons/arrow-left.svg b/icons/arrows/arrow-left.svg
similarity index 100%
rename from icons/arrow-left.svg
rename to icons/arrows/arrow-left.svg
diff --git a/icons/arrow-right.svg b/icons/arrows/arrow-right.svg
similarity index 100%
rename from icons/arrow-right.svg
rename to icons/arrows/arrow-right.svg
diff --git a/icons/arrow-up.svg b/icons/arrows/arrow-up.svg
similarity index 100%
rename from icons/arrow-up.svg
rename to icons/arrows/arrow-up.svg
diff --git a/icons/chevron-down.svg b/icons/arrows/chevron-down.svg
similarity index 100%
rename from icons/chevron-down.svg
rename to icons/arrows/chevron-down.svg
diff --git a/icons/chevron-left.svg b/icons/arrows/chevron-left.svg
similarity index 100%
rename from icons/chevron-left.svg
rename to icons/arrows/chevron-left.svg
diff --git a/icons/chevron-right.svg b/icons/arrows/chevron-right.svg
similarity index 100%
rename from icons/chevron-right.svg
rename to icons/arrows/chevron-right.svg
diff --git a/icons/chevron-up.svg b/icons/arrows/chevron-up.svg
similarity index 100%
rename from icons/chevron-up.svg
rename to icons/arrows/chevron-up.svg
diff --git a/icons/comment-circle.svg b/icons/communication/comment-circle.svg
similarity index 100%
rename from icons/comment-circle.svg
rename to icons/communication/comment-circle.svg
diff --git a/icons/comment-square.svg b/icons/communication/comment-square.svg
similarity index 100%
rename from icons/comment-square.svg
rename to icons/communication/comment-square.svg
diff --git a/icons/mail.svg b/icons/communication/mail.svg
similarity index 100%
rename from icons/mail.svg
rename to icons/communication/mail.svg
diff --git a/icons/phone-call.svg b/icons/communication/phone-call.svg
similarity index 100%
rename from icons/phone-call.svg
rename to icons/communication/phone-call.svg
diff --git a/icons/phone-forwarded.svg b/icons/communication/phone-forwarded.svg
similarity index 100%
rename from icons/phone-forwarded.svg
rename to icons/communication/phone-forwarded.svg
diff --git a/icons/phone-incoming.svg b/icons/communication/phone-incoming.svg
similarity index 100%
rename from icons/phone-incoming.svg
rename to icons/communication/phone-incoming.svg
diff --git a/icons/phone-missed.svg b/icons/communication/phone-missed.svg
similarity index 100%
rename from icons/phone-missed.svg
rename to icons/communication/phone-missed.svg
diff --git a/icons/phone-off.svg b/icons/communication/phone-off.svg
similarity index 100%
rename from icons/phone-off.svg
rename to icons/communication/phone-off.svg
diff --git a/icons/phone-outgoing.svg b/icons/communication/phone-outgoing.svg
similarity index 100%
rename from icons/phone-outgoing.svg
rename to icons/communication/phone-outgoing.svg
diff --git a/icons/phone.svg b/icons/communication/phone.svg
similarity index 100%
rename from icons/phone.svg
rename to icons/communication/phone.svg
diff --git a/icons/activity.svg b/icons/core/activity.svg
similarity index 100%
rename from icons/activity.svg
rename to icons/core/activity.svg
diff --git a/icons/alert-circle.svg b/icons/core/alert-circle.svg
similarity index 100%
rename from icons/alert-circle.svg
rename to icons/core/alert-circle.svg
diff --git a/icons/alert-octagon.svg b/icons/core/alert-octagon.svg
similarity index 100%
rename from icons/alert-octagon.svg
rename to icons/core/alert-octagon.svg
diff --git a/icons/alert-triangle.svg b/icons/core/alert-triangle.svg
similarity index 100%
rename from icons/alert-triangle.svg
rename to icons/core/alert-triangle.svg
diff --git a/icons/align-center.svg b/icons/core/align-center.svg
similarity index 100%
rename from icons/align-center.svg
rename to icons/core/align-center.svg
diff --git a/icons/align-justify.svg b/icons/core/align-justify.svg
similarity index 100%
rename from icons/align-justify.svg
rename to icons/core/align-justify.svg
diff --git a/icons/align-left.svg b/icons/core/align-left.svg
similarity index 100%
rename from icons/align-left.svg
rename to icons/core/align-left.svg
diff --git a/icons/align-right.svg b/icons/core/align-right.svg
similarity index 100%
rename from icons/align-right.svg
rename to icons/core/align-right.svg
diff --git a/icons/anchor.svg b/icons/core/anchor.svg
similarity index 100%
rename from icons/anchor.svg
rename to icons/core/anchor.svg
diff --git a/icons/at-sign.svg b/icons/core/at-sign.svg
similarity index 100%
rename from icons/at-sign.svg
rename to icons/core/at-sign.svg
diff --git a/icons/award.svg b/icons/core/award.svg
similarity index 100%
rename from icons/award.svg
rename to icons/core/award.svg
diff --git a/icons/bar-chart-2.svg b/icons/core/bar-chart-2.svg
similarity index 100%
rename from icons/bar-chart-2.svg
rename to icons/core/bar-chart-2.svg
diff --git a/icons/bar-chart.svg b/icons/core/bar-chart.svg
similarity index 100%
rename from icons/bar-chart.svg
rename to icons/core/bar-chart.svg
diff --git a/icons/battery.svg b/icons/core/battery.svg
similarity index 100%
rename from icons/battery.svg
rename to icons/core/battery.svg
diff --git a/icons/bell-off.svg b/icons/core/bell-off.svg
similarity index 100%
rename from icons/bell-off.svg
rename to icons/core/bell-off.svg
diff --git a/icons/bell.svg b/icons/core/bell.svg
similarity index 100%
rename from icons/bell.svg
rename to icons/core/bell.svg
diff --git a/icons/bluetooth.svg b/icons/core/bluetooth.svg
similarity index 100%
rename from icons/bluetooth.svg
rename to icons/core/bluetooth.svg
diff --git a/icons/book.svg b/icons/core/book.svg
similarity index 100%
rename from icons/book.svg
rename to icons/core/book.svg
diff --git a/icons/bookmark.svg b/icons/core/bookmark.svg
similarity index 100%
rename from icons/bookmark.svg
rename to icons/core/bookmark.svg
diff --git a/icons/box.svg b/icons/core/box.svg
similarity index 100%
rename from icons/box.svg
rename to icons/core/box.svg
diff --git a/icons/briefcase.svg b/icons/core/briefcase.svg
similarity index 100%
rename from icons/briefcase.svg
rename to icons/core/briefcase.svg
diff --git a/icons/calendar.svg b/icons/core/calendar.svg
similarity index 100%
rename from icons/calendar.svg
rename to icons/core/calendar.svg
diff --git a/icons/check-circle.svg b/icons/core/check-circle.svg
similarity index 100%
rename from icons/check-circle.svg
rename to icons/core/check-circle.svg
diff --git a/icons/check-square.svg b/icons/core/check-square.svg
similarity index 100%
rename from icons/check-square.svg
rename to icons/core/check-square.svg
diff --git a/icons/check.svg b/icons/core/check.svg
similarity index 100%
rename from icons/check.svg
rename to icons/core/check.svg
diff --git a/icons/circle.svg b/icons/core/circle.svg
similarity index 100%
rename from icons/circle.svg
rename to icons/core/circle.svg
diff --git a/icons/clipboard.svg b/icons/core/clipboard.svg
similarity index 100%
rename from icons/clipboard.svg
rename to icons/core/clipboard.svg
diff --git a/icons/clock.svg b/icons/core/clock.svg
similarity index 100%
rename from icons/clock.svg
rename to icons/core/clock.svg
diff --git a/icons/cloud-off.svg b/icons/core/cloud-off.svg
similarity index 100%
rename from icons/cloud-off.svg
rename to icons/core/cloud-off.svg
diff --git a/icons/cloud.svg b/icons/core/cloud.svg
similarity index 100%
rename from icons/cloud.svg
rename to icons/core/cloud.svg
diff --git a/icons/command.svg b/icons/core/command.svg
similarity index 100%
rename from icons/command.svg
rename to icons/core/command.svg
diff --git a/icons/cpu.svg b/icons/core/cpu.svg
similarity index 100%
rename from icons/cpu.svg
rename to icons/core/cpu.svg
diff --git a/icons/delete.svg b/icons/core/delete.svg
similarity index 100%
rename from icons/delete.svg
rename to icons/core/delete.svg
diff --git a/icons/disc.svg b/icons/core/disc.svg
similarity index 100%
rename from icons/disc.svg
rename to icons/core/disc.svg
diff --git a/icons/download-cloud.svg b/icons/core/download-cloud.svg
similarity index 100%
rename from icons/download-cloud.svg
rename to icons/core/download-cloud.svg
diff --git a/icons/download.svg b/icons/core/download.svg
similarity index 100%
rename from icons/download.svg
rename to icons/core/download.svg
diff --git a/icons/edit.svg b/icons/core/edit.svg
similarity index 100%
rename from icons/edit.svg
rename to icons/core/edit.svg
diff --git a/icons/external-link.svg b/icons/core/external-link.svg
similarity index 100%
rename from icons/external-link.svg
rename to icons/core/external-link.svg
diff --git a/icons/eye-off.svg b/icons/core/eye-off.svg
similarity index 100%
rename from icons/eye-off.svg
rename to icons/core/eye-off.svg
diff --git a/icons/eye.svg b/icons/core/eye.svg
similarity index 100%
rename from icons/eye.svg
rename to icons/core/eye.svg
diff --git a/icons/feather.svg b/icons/core/feather.svg
similarity index 100%
rename from icons/feather.svg
rename to icons/core/feather.svg
diff --git a/icons/file.svg b/icons/core/file.svg
similarity index 100%
rename from icons/file.svg
rename to icons/core/file.svg
diff --git a/icons/filter.svg b/icons/core/filter.svg
similarity index 100%
rename from icons/filter.svg
rename to icons/core/filter.svg
diff --git a/icons/flag.svg b/icons/core/flag.svg
similarity index 100%
rename from icons/flag.svg
rename to icons/core/flag.svg
diff --git a/icons/folder.svg b/icons/core/folder.svg
similarity index 100%
rename from icons/folder.svg
rename to icons/core/folder.svg
diff --git a/icons/grid.svg b/icons/core/grid.svg
similarity index 100%
rename from icons/grid.svg
rename to icons/core/grid.svg
diff --git a/icons/hash.svg b/icons/core/hash.svg
similarity index 100%
rename from icons/hash.svg
rename to icons/core/hash.svg
diff --git a/icons/headphones.svg b/icons/core/headphones.svg
similarity index 100%
rename from icons/headphones.svg
rename to icons/core/headphones.svg
diff --git a/icons/heart.svg b/icons/core/heart.svg
similarity index 100%
rename from icons/heart.svg
rename to icons/core/heart.svg
diff --git a/icons/home.svg b/icons/core/home.svg
similarity index 100%
rename from icons/home.svg
rename to icons/core/home.svg
diff --git a/icons/inbox.svg b/icons/core/inbox.svg
similarity index 100%
rename from icons/inbox.svg
rename to icons/core/inbox.svg
diff --git a/icons/info.svg b/icons/core/info.svg
similarity index 100%
rename from icons/info.svg
rename to icons/core/info.svg
diff --git a/icons/layers.svg b/icons/core/layers.svg
similarity index 100%
rename from icons/layers.svg
rename to icons/core/layers.svg
diff --git a/icons/layout.svg b/icons/core/layout.svg
similarity index 100%
rename from icons/layout.svg
rename to icons/core/layout.svg
diff --git a/icons/life-buoy.svg b/icons/core/life-buoy.svg
similarity index 100%
rename from icons/life-buoy.svg
rename to icons/core/life-buoy.svg
diff --git a/icons/loader.svg b/icons/core/loader.svg
similarity index 100%
rename from icons/loader.svg
rename to icons/core/loader.svg
diff --git a/icons/lock.svg b/icons/core/lock.svg
similarity index 100%
rename from icons/lock.svg
rename to icons/core/lock.svg
diff --git a/icons/maximize-2.svg b/icons/core/maximize-2.svg
similarity index 100%
rename from icons/maximize-2.svg
rename to icons/core/maximize-2.svg
diff --git a/icons/maximize.svg b/icons/core/maximize.svg
similarity index 100%
rename from icons/maximize.svg
rename to icons/core/maximize.svg
diff --git a/icons/menu.svg b/icons/core/menu.svg
similarity index 100%
rename from icons/menu.svg
rename to icons/core/menu.svg
diff --git a/icons/minimize-2.svg b/icons/core/minimize-2.svg
similarity index 100%
rename from icons/minimize-2.svg
rename to icons/core/minimize-2.svg
diff --git a/icons/minimize.svg b/icons/core/minimize.svg
similarity index 100%
rename from icons/minimize.svg
rename to icons/core/minimize.svg
diff --git a/icons/minus-circle.svg b/icons/core/minus-circle.svg
similarity index 100%
rename from icons/minus-circle.svg
rename to icons/core/minus-circle.svg
diff --git a/icons/minus-square.svg b/icons/core/minus-square.svg
similarity index 100%
rename from icons/minus-square.svg
rename to icons/core/minus-square.svg
diff --git a/icons/minus.svg b/icons/core/minus.svg
similarity index 100%
rename from icons/minus.svg
rename to icons/core/minus.svg
diff --git a/icons/monitor.svg b/icons/core/monitor.svg
similarity index 100%
rename from icons/monitor.svg
rename to icons/core/monitor.svg
diff --git a/icons/more-horizontal.svg b/icons/core/more-horizontal.svg
similarity index 100%
rename from icons/more-horizontal.svg
rename to icons/core/more-horizontal.svg
diff --git a/icons/more-vertical.svg b/icons/core/more-vertical.svg
similarity index 100%
rename from icons/more-vertical.svg
rename to icons/core/more-vertical.svg
diff --git a/icons/move.svg b/icons/core/move.svg
similarity index 100%
rename from icons/move.svg
rename to icons/core/move.svg
diff --git a/icons/music.svg b/icons/core/music.svg
similarity index 100%
rename from icons/music.svg
rename to icons/core/music.svg
diff --git a/icons/octagon.svg b/icons/core/octagon.svg
similarity index 100%
rename from icons/octagon.svg
rename to icons/core/octagon.svg
diff --git a/icons/pie-chart.svg b/icons/core/pie-chart.svg
similarity index 100%
rename from icons/pie-chart.svg
rename to icons/core/pie-chart.svg
diff --git a/icons/plus-circle.svg b/icons/core/plus-circle.svg
similarity index 100%
rename from icons/plus-circle.svg
rename to icons/core/plus-circle.svg
diff --git a/icons/plus-square.svg b/icons/core/plus-square.svg
similarity index 100%
rename from icons/plus-square.svg
rename to icons/core/plus-square.svg
diff --git a/icons/plus.svg b/icons/core/plus.svg
similarity index 100%
rename from icons/plus.svg
rename to icons/core/plus.svg
diff --git a/icons/power.svg b/icons/core/power.svg
similarity index 100%
rename from icons/power.svg
rename to icons/core/power.svg
diff --git a/icons/printer.svg b/icons/core/printer.svg
similarity index 100%
rename from icons/printer.svg
rename to icons/core/printer.svg
diff --git a/icons/radio.svg b/icons/core/radio.svg
similarity index 100%
rename from icons/radio.svg
rename to icons/core/radio.svg
diff --git a/icons/core/scissors.svg b/icons/core/scissors.svg
new file mode 100644
index 0000000000000000000000000000000000000000..676e78f82d5334065aa66fa10b47147b20a08d58
--- /dev/null
+++ b/icons/core/scissors.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <circle cx="6" cy="6" r="3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <circle cx="6" cy="18" r="3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="20" y1="4" x2="8.12" y2="15.88" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="14.47" y1="14.48" x2="20" y2="20" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="8.12" y1="8.12" x2="12" y2="12" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/search.svg b/icons/core/search.svg
similarity index 100%
rename from icons/search.svg
rename to icons/core/search.svg
diff --git a/icons/settings.svg b/icons/core/settings.svg
similarity index 100%
rename from icons/settings.svg
rename to icons/core/settings.svg
diff --git a/icons/share.svg b/icons/core/share.svg
similarity index 100%
rename from icons/share.svg
rename to icons/core/share.svg
diff --git a/icons/slash.svg b/icons/core/slash.svg
similarity index 100%
rename from icons/slash.svg
rename to icons/core/slash.svg
diff --git a/icons/square.svg b/icons/core/square.svg
similarity index 100%
rename from icons/square.svg
rename to icons/core/square.svg
diff --git a/icons/star.svg b/icons/core/star.svg
similarity index 100%
rename from icons/star.svg
rename to icons/core/star.svg
diff --git a/icons/tag.svg b/icons/core/tag.svg
similarity index 100%
rename from icons/tag.svg
rename to icons/core/tag.svg
diff --git a/icons/target.svg b/icons/core/target.svg
similarity index 100%
rename from icons/target.svg
rename to icons/core/target.svg
diff --git a/icons/thumbs-down.svg b/icons/core/thumbs-down.svg
similarity index 100%
rename from icons/thumbs-down.svg
rename to icons/core/thumbs-down.svg
diff --git a/icons/thumbs-up.svg b/icons/core/thumbs-up.svg
similarity index 100%
rename from icons/thumbs-up.svg
rename to icons/core/thumbs-up.svg
diff --git a/icons/toggle-left.svg b/icons/core/toggle-left.svg
similarity index 100%
rename from icons/toggle-left.svg
rename to icons/core/toggle-left.svg
diff --git a/icons/toggle-right.svg b/icons/core/toggle-right.svg
similarity index 100%
rename from icons/toggle-right.svg
rename to icons/core/toggle-right.svg
diff --git a/icons/trash-2.svg b/icons/core/trash-2.svg
similarity index 100%
rename from icons/trash-2.svg
rename to icons/core/trash-2.svg
diff --git a/icons/trash.svg b/icons/core/trash.svg
similarity index 100%
rename from icons/trash.svg
rename to icons/core/trash.svg
diff --git a/icons/triangle.svg b/icons/core/triangle.svg
similarity index 100%
rename from icons/triangle.svg
rename to icons/core/triangle.svg
diff --git a/icons/unlock.svg b/icons/core/unlock.svg
similarity index 100%
rename from icons/unlock.svg
rename to icons/core/unlock.svg
diff --git a/icons/upload-cloud.svg b/icons/core/upload-cloud.svg
similarity index 100%
rename from icons/upload-cloud.svg
rename to icons/core/upload-cloud.svg
diff --git a/icons/upload.svg b/icons/core/upload.svg
similarity index 100%
rename from icons/upload.svg
rename to icons/core/upload.svg
diff --git a/icons/user-minus.svg b/icons/core/user-minus.svg
similarity index 100%
rename from icons/user-minus.svg
rename to icons/core/user-minus.svg
diff --git a/icons/user-plus.svg b/icons/core/user-plus.svg
similarity index 100%
rename from icons/user-plus.svg
rename to icons/core/user-plus.svg
diff --git a/icons/user.svg b/icons/core/user.svg
similarity index 100%
rename from icons/user.svg
rename to icons/core/user.svg
diff --git a/icons/watch.svg b/icons/core/watch.svg
similarity index 100%
rename from icons/watch.svg
rename to icons/core/watch.svg
diff --git a/icons/wifi.svg b/icons/core/wifi.svg
similarity index 100%
rename from icons/wifi.svg
rename to icons/core/wifi.svg
diff --git a/icons/x-circle.svg b/icons/core/x-circle.svg
similarity index 100%
rename from icons/x-circle.svg
rename to icons/core/x-circle.svg
diff --git a/icons/x-square.svg b/icons/core/x-square.svg
similarity index 100%
rename from icons/x-square.svg
rename to icons/core/x-square.svg
diff --git a/icons/x.svg b/icons/core/x.svg
similarity index 100%
rename from icons/x.svg
rename to icons/core/x.svg
diff --git a/icons/zap.svg b/icons/core/zap.svg
similarity index 100%
rename from icons/zap.svg
rename to icons/core/zap.svg
diff --git a/icons/zoom-in.svg b/icons/core/zoom-in.svg
similarity index 100%
rename from icons/zoom-in.svg
rename to icons/core/zoom-in.svg
diff --git a/icons/zoom-out.svg b/icons/core/zoom-out.svg
similarity index 100%
rename from icons/zoom-out.svg
rename to icons/core/zoom-out.svg
diff --git a/icons/crosshair.svg b/icons/location/crosshair.svg
similarity index 100%
rename from icons/crosshair.svg
rename to icons/location/crosshair.svg
diff --git a/icons/globe.svg b/icons/location/globe.svg
similarity index 100%
rename from icons/globe.svg
rename to icons/location/globe.svg
diff --git a/icons/location.svg b/icons/location/location.svg
similarity index 100%
rename from icons/location.svg
rename to icons/location/location.svg
diff --git a/icons/map-pin.svg b/icons/location/map-pin.svg
similarity index 100%
rename from icons/map-pin.svg
rename to icons/location/map-pin.svg
diff --git a/icons/map.svg b/icons/location/map.svg
similarity index 100%
rename from icons/map.svg
rename to icons/location/map.svg
diff --git a/icons/chrome.svg b/icons/logos/chrome.svg
similarity index 100%
rename from icons/chrome.svg
rename to icons/logos/chrome.svg
diff --git a/icons/facebook.svg b/icons/logos/facebook.svg
similarity index 100%
rename from icons/facebook.svg
rename to icons/logos/facebook.svg
diff --git a/icons/instagram.svg b/icons/logos/instagram.svg
similarity index 100%
rename from icons/instagram.svg
rename to icons/logos/instagram.svg
diff --git a/icons/pocket.svg b/icons/logos/pocket.svg
similarity index 100%
rename from icons/pocket.svg
rename to icons/logos/pocket.svg
diff --git a/icons/twitter.svg b/icons/logos/twitter.svg
similarity index 100%
rename from icons/twitter.svg
rename to icons/logos/twitter.svg
diff --git a/icons/airplay.svg b/icons/media-controls/airplay.svg
similarity index 100%
rename from icons/airplay.svg
rename to icons/media-controls/airplay.svg
diff --git a/icons/fast-forward.svg b/icons/media-controls/fast-forward.svg
similarity index 100%
rename from icons/fast-forward.svg
rename to icons/media-controls/fast-forward.svg
diff --git a/icons/mic-off.svg b/icons/media-controls/mic-off.svg
similarity index 100%
rename from icons/mic-off.svg
rename to icons/media-controls/mic-off.svg
diff --git a/icons/mic.svg b/icons/media-controls/mic.svg
similarity index 100%
rename from icons/mic.svg
rename to icons/media-controls/mic.svg
diff --git a/icons/media-controls/pause.svg b/icons/media-controls/pause.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d378ae3ab094377857967d58e2bbe5de43feca39
--- /dev/null
+++ b/icons/media-controls/pause.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <rect x="6" y="4" width="4" height="16" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <rect x="14" y="4" width="4" height="16" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/play.svg b/icons/media-controls/play.svg
similarity index 100%
rename from icons/play.svg
rename to icons/media-controls/play.svg
diff --git a/icons/rewind.svg b/icons/media-controls/rewind.svg
similarity index 100%
rename from icons/rewind.svg
rename to icons/media-controls/rewind.svg
diff --git a/icons/media-controls/shuffle.svg b/icons/media-controls/shuffle.svg
new file mode 100644
index 0000000000000000000000000000000000000000..65fa1dcce5b7377d4d4f58f21dd015902d529afc
--- /dev/null
+++ b/icons/media-controls/shuffle.svg
@@ -0,0 +1 @@
+<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
diff --git a/icons/media-controls/skip-back.svg b/icons/media-controls/skip-back.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d655c8310df90c6d8dda0f4ee228f918e0da6463
--- /dev/null
+++ b/icons/media-controls/skip-back.svg
@@ -0,0 +1 @@
+<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
diff --git a/icons/media-controls/skip-forward.svg b/icons/media-controls/skip-forward.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8dc5e273bc0cdda592b09b7b13b0cd006c1fb350
--- /dev/null
+++ b/icons/media-controls/skip-forward.svg
@@ -0,0 +1 @@
+<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
diff --git a/icons/pause.svg b/icons/pause.svg
deleted file mode 100644
index bec3307dcecc5306e52b66b476005c7d2fa3f783..0000000000000000000000000000000000000000
--- a/icons/pause.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-    <rect x="6" y="4" width="4" height="16" rx="1" ry="1"/>
-    <rect x="14" y="4" width="4" height="16" rx="1" ry="1"/>
-</svg>
diff --git a/icons/aperture.svg b/icons/photo-and-video/aperture.svg
similarity index 100%
rename from icons/aperture.svg
rename to icons/photo-and-video/aperture.svg
diff --git a/icons/camera-off.svg b/icons/photo-and-video/camera-off.svg
similarity index 100%
rename from icons/camera-off.svg
rename to icons/photo-and-video/camera-off.svg
diff --git a/icons/camera.svg b/icons/photo-and-video/camera.svg
similarity index 100%
rename from icons/camera.svg
rename to icons/photo-and-video/camera.svg
diff --git a/icons/image.svg b/icons/photo-and-video/image.svg
similarity index 100%
rename from icons/image.svg
rename to icons/photo-and-video/image.svg
diff --git a/icons/video-off.svg b/icons/photo-and-video/video-off.svg
similarity index 100%
rename from icons/video-off.svg
rename to icons/photo-and-video/video-off.svg
diff --git a/icons/video.svg b/icons/photo-and-video/video.svg
similarity index 100%
rename from icons/video.svg
rename to icons/photo-and-video/video.svg
diff --git a/icons/scissors.svg b/icons/scissors.svg
deleted file mode 100644
index 1dc4cda8964a5ae36d795827977e1fc76c7ec51f..0000000000000000000000000000000000000000
--- a/icons/scissors.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-    <circle cx="6" cy="6" r="3"/>
-    <circle cx="6" cy="18" r="3"/>
-    <line x1="20" y1="4" x2="8.12" y2="15.88"/>
-    <line x1="14.47" y1="14.48" x2="20" y2="20"/>
-    <line x1="8.12" y1="8.12" x2="12" y2="12"/>
-</svg>
diff --git a/icons/shuffle.svg b/icons/shuffle.svg
deleted file mode 100644
index 2f77d38817daca763bdc048070b8255460a2de23..0000000000000000000000000000000000000000
--- a/icons/shuffle.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-    <polyline points="16 3 21 3 21 8"/>
-    <line x1="4" y1="20" x2="21" y2="3"/>
-    <polyline points="21 16 21 21 16 21"/>
-    <line x1="14.83" y1="14.83" x2="21" y2="21"/>
-    <line x1="4" y1="4" x2="9.17" y2="9.17"/>
-</svg>
diff --git a/icons/skip-back.svg b/icons/skip-back.svg
deleted file mode 100644
index 78f7077db9399d5c7003f84790abfdcef9467ccc..0000000000000000000000000000000000000000
--- a/icons/skip-back.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-    <polygon points="20 20 8 12 20 4 20 20"/>
-    <line x1="4" y1="20" x2="4" y2="4"/>
-</svg>
diff --git a/icons/skip-forward.svg b/icons/skip-forward.svg
deleted file mode 100644
index 74f4878f695ebdd3cc2e756308401f364816851e..0000000000000000000000000000000000000000
--- a/icons/skip-forward.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-    <polygon points="4 4 16 12 4 20 4 4"/>
-    <line x1="20" y1="4" x2="20" y2="20"/>
-</svg>
diff --git a/icons/droplet.svg b/icons/weather/droplet.svg
similarity index 100%
rename from icons/droplet.svg
rename to icons/weather/droplet.svg
diff --git a/icons/moon.svg b/icons/weather/moon.svg
similarity index 100%
rename from icons/moon.svg
rename to icons/weather/moon.svg
diff --git a/icons/sun.svg b/icons/weather/sun.svg
similarity index 100%
rename from icons/sun.svg
rename to icons/weather/sun.svg
diff --git a/icons/sunrise.svg b/icons/weather/sunrise.svg
similarity index 100%
rename from icons/sunrise.svg
rename to icons/weather/sunrise.svg
diff --git a/icons/sunset.svg b/icons/weather/sunset.svg
similarity index 100%
rename from icons/sunset.svg
rename to icons/weather/sunset.svg
diff --git a/icons/thermometer.svg b/icons/weather/thermometer.svg
similarity index 100%
rename from icons/thermometer.svg
rename to icons/weather/thermometer.svg
diff --git a/icons/umbrella.svg b/icons/weather/umbrella.svg
similarity index 100%
rename from icons/umbrella.svg
rename to icons/weather/umbrella.svg
diff --git a/icons/wind.svg b/icons/weather/wind.svg
similarity index 100%
rename from icons/wind.svg
rename to icons/weather/wind.svg