diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47029c8..60688c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,73 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## v2.1.0 (2017-05-30)
+
+### Added
+
+- Add icon categories (Thanks @wappsdotgr)
+- Display icon names to allow for `⌘ + F` search
+
+<details>
+  <summary>Add 37 icons</summary>
+
+  - `arrow-down-left`
+  - `arrow-down-right`
+  - `arrow-up-left`
+  - `arrow-up-right`
+  - `battery-charging`
+  - `cast`
+  - `chevrons-down`
+  - `chevrons-left`
+  - `chevrons-right`
+  - `chevrons-up`
+  - `cloud-drizzle`
+  - `cloud-lightning`
+  - `cloud-rain`
+  - `cloud-snow`
+  - `codepen`
+  - `compass`
+  - `edit-2`
+  - `edit-3`
+  - `link-2`
+  - `list`
+  - `log-in`
+  - `log-out`
+  - `navigation-2`
+  - `package`
+  - `repeat`
+  - `share`
+  - `slack`
+  - `speaker`
+  - `trending-down`
+  - `trending-up`
+  - `type`
+  - `user-check`
+  - `user-x`
+  - `voicemail`
+  - `volume`
+  - `volume-1`
+  - `volume-2`
+</details>
+
+### Changed
+
+- Redesign project site
+
+<details>
+  <summary>Change 9 icons</summary>
+
+  - `bar-chart`
+  - `bar-chart-2`
+  - `droplet`
+  - `grid`
+  - `twitter`
+  - `user-minus`
+  - `user-plus`
+  - `user`
+  - `volume-x`
+</details>
+
 ## v2.0.0 (2017-05-23)
 
 ### Added
@@ -104,7 +171,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   - `check-square`
   - `clipboard`
   - `cloud`
-  - `cog`
   - `comment-square`
   - `download`
   - `download-cloud`
@@ -133,6 +199,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   - `plus`
   - `printer`
   - `search`
+  - `settings`
   - `share`
   - `shuffle`
   - `skip-back`
diff --git a/README.md b/README.md
index 4afa611..d113f99 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-[Feather](https://colebemis.github.io/feather)
+[Feather](https://feather.netlify.com)
 ===
 
 ### Simply beautiful open source icons
 
-Each icon is designed on a 24x24 grid with an emphasis on consistency and simplicity.
+Designed on a 24x24 grid with an emphasis on functionality, consistency and simplicity.
 
 Change Log
 ---
diff --git a/_includes/category.html b/_includes/category.html
new file mode 100644
index 0000000..d76df2e
--- /dev/null
+++ b/_includes/category.html
@@ -0,0 +1,11 @@
+<div class="pv4">
+    <h2 class="mt0 mb4 f6 ttu tracked normal">{{ include.category | replace: '-', ' '}}</h2>
+    <ul class="icon-grid mv0 pl0 list">
+      {% capture category_path %}icons/{{ include.category }}{% endcapture %}
+      {% for icon in site.static_files %}
+        {% if icon.path contains category_path  %}
+          {% include icon.html icon=icon %}
+        {% endif %}
+      {% endfor %}
+    </ul>
+  </div>
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index db11c9d..337a0d4 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,7 +1,7 @@
-<footer class="flex flex-column items-center pv5 bt b--black-10">
+<footer class="flex flex-column items-center pt5-ns pb5">
   <ul class="flex flex-column flex-row-l justify-center w-80 mv0 pl0 list">
     {% for link in include.links %}
-    <li class="mh3-l pv3 pv0-l f6 ttu tracked bb b--black-10 bn-l">
+    <li class="mh3-l pv3 pv0-l f5 bb b--black-10 bn-l">
       <a class="lh-copy color-inherit no-underline dim" href="{{ link.url }}" target="_blank">{{ link.title }}</a>
     </li>
     {% endfor %}
@@ -10,9 +10,4 @@
   <p class="mt5 mb2 lh-copy black-90 dim">
     <a class="no-underline color-inherit" href="http://colebemis.com" target="_blank">Made with &lt;3 by Cole Bemis</a>
    </p>
-  <p class="mv0 f6 lh-copy">
-    <span class="mh1">v{{ site.data.package.version }}</span>
-    -
-    <span class="mh1">{{ site.data.manifest | size }} icons</span>
-  </p>
 </footer>
\ No newline at end of file
diff --git a/_includes/header.html b/_includes/header.html
index a77e424..06b3d1a 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,21 +1,11 @@
-<header class="flex flex-column items-center w-80 mw8 pv5 pv6-ns center">
-    <h1 class="mt0 mb2 f2 fw3 tc lh-title black-90">Feather</h1>
-    <p class="mt0 mb5 mb4-ns f5 tc lh-copy">Simply beautiful open source icons</p>
+<header class="pv3 bb b--black-10">
+  <div class="w-80 center flex justify-between items-center">
+    <h1 class="mv0 normal f3 lh-copy black-90">Feather <span class="f5 black-60">v{{ site.data.package.version }}</span></h1>
 
-    <div class="flex flex-column flex-row-ns items-stretch justify-center w-100">
-      <a
-        class="btn mb3 mb0-ns mr3-ns white bg-accent br3 dim"
-        href="feather-{{ site.data.package.version }}.zip"
-        download
-        onclick="ga('send', 'event', 'download', 'click', 'all');">
-        Download
-      </a>
-      <a
-        class="btn btn-outline accent br3 dim"
-        href="https://twitter.com/intent/tweet?text=Feather%20-%20Simply%20beautiful%20open%20source%20icons%20by%20%40colebemis%20colebemis.github.io/feather"
-        target="_blank"
-        onclick="ga('send', 'event', 'share', 'click', 'twitter');">
-        Tweet
-      </a>
-    </div>
+    <ul class="list mv0 pl0 flex">
+      <li class="dn dib-ns"><a class="no-underline color-inherit dim" href="https://twitter.com/intent/tweet?text=Feather%20-%20Simply%20beautiful%20open%20source%20icons%20by%20%40colebemis%20feather.netlify.com" target="_blank">Tweet</a></li>
+      <li class="dn dib-ns ml4"><a class="no-underline color-inherit dim" href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=G6CPFZ6PQRZW8&lc=US&item_name=Feather&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted" target="_blank">Donate</a></li>
+      <li class="ml4"><a class="no-underline color-inherit dim" href="https://github.com/colebemis/feather" target="_blank">GitHub</a></li>
+    </ul>
+  </div>
 </header>
diff --git a/_includes/hero.html b/_includes/hero.html
new file mode 100644
index 0000000..e24c5bc
--- /dev/null
+++ b/_includes/hero.html
@@ -0,0 +1,10 @@
+<div class="flex flex-column items-center w-80 mw8 pt5 pt6-ns center">
+  <h2 class="mt0 mb4 f2 fw3 tc lh-title black-90">Simply beautiful open source icons</h2>
+  <a
+    class="button white bg-accent bg-animate hover-bg-accent-darker br2"
+    href="feather-{{ site.data.package.version }}.zip"
+    download
+    onclick="ga('send', 'event', 'download', 'click', 'all');">
+    Download
+  </a>
+</div>
\ No newline at end of file
diff --git a/_includes/icon.html b/_includes/icon.html
new file mode 100644
index 0000000..2fc7353
--- /dev/null
+++ b/_includes/icon.html
@@ -0,0 +1,10 @@
+<li>
+  <a
+    href="{{ include.icon.path }}"
+    class="flex flex-row items-center dib pa3 br2 no-underline dark-gray bg-near-white bg-animate hover-bg-light-gray"
+    download
+    onclick="ga('send', 'event', 'download', 'click', '{{ include.icon.basename }}');">
+    <span class="svg flex-none lh-none">{% include_relative {{ include.icon.path }} %}</span>
+    <span class="ml3 lh-copy f6 tc black-60 ellipse">{{ include.icon.basename }}</span>
+  </a>
+</li>
diff --git a/_includes/icons.html b/_includes/icons.html
index 7812401..1df1f7d 100644
--- a/_includes/icons.html
+++ b/_includes/icons.html
@@ -1,19 +1,10 @@
-<ul class="flex flex-wrap justify-center w-80 w-80-ns center mw8 mv0 pl0 list">
-  {% for icon in site.data.manifest %}
-  {% capture icon_path %}icons/{{ icon }}.svg{% endcapture %}
-  <li class="icon relative pa3 ma2 black-90 bg-animate br3 outline-0 pointer">
-    {% include_relative {{ icon_path }} %}
-    <div class="tooltip flex flex-column tc white bg-dark-gray br3">
-      <p class="dib mh4 mv3 lh-copy nowrap">{{ icon }}</p>
-      <a
-        class="btn white bg-black-90 dim br3 br--bottom outline-0"
-        href="{{ icon_path }}"
-        download
-        tabindex="-1"
-        onclick="ga('send', 'event', 'download', 'click', '{{ icon }}');">
-        Download
-      </a>
-    </div>
-  </li>
-  {% endfor %}
-</ul>
\ No newline at end of file
+<div class="w-80 center pv5">
+  {% include category.html category="core" %}
+  {% include category.html category="media-controls" %}
+  {% include category.html category="communication" %}
+  {% include category.html category="photo-and-video" %}
+  {% include category.html category="location" %}
+  {% include category.html category="weather" %}
+  {% include category.html category="arrows" %}
+  {% include category.html category="logos" %}
+</div>
diff --git a/_includes/request.html b/_includes/request.html
deleted file mode 100644
index 0af6299..0000000
--- a/_includes/request.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="flex flex-column items-center pv5">
-  <h2 class="mt0 mb4 f4 lh-copy normal tc black-90">Don't see the icon you need?</h2>
-  <a class="btn btn-outline accent br3 dim" href="https://github.com/colebemis/feather/issues/new" target="_blank">Request an icon</a>
-</div>
\ No newline at end of file
diff --git a/assets/feather-preview.png b/assets/feather-preview.png
new file mode 100644
index 0000000..294a2cc
Binary files /dev/null and b/assets/feather-preview.png differ
diff --git a/assets/tooltip-arrow.svg b/assets/tooltip-arrow.svg
deleted file mode 100644
index 892c8eb..0000000
--- a/assets/tooltip-arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="24" viewBox="0 0 40 24" fill="#333333">
-  <path d="M0,15.9l0.6,0c2.2,0,4.3-0.8,5.8-2.3L17.2,2.8c1.6-1.6,4.1-1.6,5.7,0l10.8,10.8c1.5,1.5,3.5,2.3,5.7,2.3H40v8H0 V15.9z"/>
-</svg>
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/alert-octagon.svg b/icons/alert-octagon.svg
deleted file mode 100644
index 4d77d3a..0000000
--- a/icons/alert-octagon.svg
+++ /dev/null
@@ -1,5 +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="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"/>
-  <line x1="12" y1="8" x2="12" y2="12"/>
-  <line x1="12" y1="16" x2="12" y2="16"/>
-</svg>
\ No newline at end of file
diff --git a/icons/alert-triangle.svg b/icons/alert-triangle.svg
deleted file mode 100644
index 20a2b14..0000000
--- a/icons/alert-triangle.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M10.29,3.86,1.82,18a2,2,0,0,0,1.71,3H20.47a2,2,0,0,0,1.71-3L13.71,3.86A2,2,0,0,0,10.29,3.86Z"/>
-  <line x1="12" y1="9" x2="12" y2="13"/>
-  <line x1="12" y1="17" x2="12" y2="17"/>
-</svg>
\ No newline at end of file
diff --git a/icons/align-center.svg b/icons/align-center.svg
deleted file mode 100644
index ab2f80e..0000000
--- a/icons/align-center.svg
+++ /dev/null
@@ -1,6 +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">
-  <line x1="18" y1="10" x2="6" y2="10"/>
-  <line x1="21" y1="6" x2="3" y2="6"/>
-  <line x1="21" y1="14" x2="3" y2="14"/>
-  <line x1="18" y1="18" x2="6" y2="18"/>
-</svg>
\ No newline at end of file
diff --git a/icons/align-justify.svg b/icons/align-justify.svg
deleted file mode 100644
index 3bb6042..0000000
--- a/icons/align-justify.svg
+++ /dev/null
@@ -1,6 +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">
-  <line x1="21" y1="10" x2="3" y2="10"/>
-  <line x1="21" y1="6" x2="3" y2="6"/>
-  <line x1="21" y1="14" x2="3" y2="14"/>
-  <line x1="21" y1="18" x2="3" y2="18"/>
-</svg>
\ No newline at end of file
diff --git a/icons/align-left.svg b/icons/align-left.svg
deleted file mode 100644
index d93cde7..0000000
--- a/icons/align-left.svg
+++ /dev/null
@@ -1,6 +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">
-  <line x1="17" y1="10" x2="3" y2="10"/>
-  <line x1="21" y1="6" x2="3" y2="6"/>
-  <line x1="21" y1="14" x2="3" y2="14"/>
-  <line x1="17" y1="18" x2="3" y2="18"/>
-</svg>
\ No newline at end of file
diff --git a/icons/align-right.svg b/icons/align-right.svg
deleted file mode 100644
index 0d2177b..0000000
--- a/icons/align-right.svg
+++ /dev/null
@@ -1,6 +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">
-  <line x1="21" y1="10" x2="7" y2="10"/>
-  <line x1="21" y1="6" x2="3" y2="6"/>
-  <line x1="21" y1="14" x2="3" y2="14"/>
-  <line x1="21" y1="18" x2="7" y2="18"/>
-</svg>
\ No newline at end of file
diff --git a/icons/aperture.svg b/icons/aperture.svg
deleted file mode 100644
index f1038ad..0000000
--- a/icons/aperture.svg
+++ /dev/null
@@ -1,9 +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="12" cy="12" r="10"/>
-  <line x1="14.31" y1="8" x2="20.05" y2="17.94"/>
-  <line x1="9.69" y1="8" x2="21.17" y2="8"/>
-  <line x1="7.38" y1="12" x2="13.12" y2="2.06"/>
-  <line x1="9.69" y1="16" x2="3.95" y2="6.06"/>
-  <line x1="14.31" y1="16" x2="2.83" y2="16"/>
-  <line x1="16.62" y1="12" x2="10.88" y2="21.94"/>
-</svg>
\ No newline at end of file
diff --git a/icons/arrows/arrow-down-left.svg b/icons/arrows/arrow-down-left.svg
new file mode 100644
index 0000000..e4fa81b
--- /dev/null
+++ b/icons/arrows/arrow-down-left.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <line x1="18" y1="6" x2="6" y2="18" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <polyline points="15 18 6 18 6 9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/arrows/arrow-down-right.svg b/icons/arrows/arrow-down-right.svg
new file mode 100644
index 0000000..7ba7ca1
--- /dev/null
+++ b/icons/arrows/arrow-down-right.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <line x1="6" y1="6" x2="18" y2="18" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <polyline points="9 18 18 18 18 9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/arrows/arrow-down.svg b/icons/arrows/arrow-down.svg
new file mode 100644
index 0000000..edf0f16
--- /dev/null
+++ b/icons/arrows/arrow-down.svg
@@ -0,0 +1,4 @@
+<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">
+    <line x1="12" y1="4" x2="12" y2="20"/>
+    <polyline points="18 14 12 20 6 14"/>
+</svg>
diff --git a/icons/arrow-down.svg b/icons/arrows/arrow-left.svg
similarity index 65%
rename from icons/arrow-down.svg
rename to icons/arrows/arrow-left.svg
index 39baaf5..bde05e4 100644
--- a/icons/arrow-down.svg
+++ b/icons/arrows/arrow-left.svg
@@ -1,4 +1,4 @@
 <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">
-  <line x1="12" y1="4" x2="12" y2="20"/>
-  <polyline points="18 14 12 20 6 14"/>
-</svg>
\ No newline at end of file
+    <line x1="20" y1="12" x2="4" y2="12"/>
+    <polyline points="10 18 4 12 10 6"/>
+</svg>
diff --git a/icons/arrow-right.svg b/icons/arrows/arrow-right.svg
similarity index 65%
rename from icons/arrow-right.svg
rename to icons/arrows/arrow-right.svg
index a6c4a28..a3195a2 100644
--- a/icons/arrow-right.svg
+++ b/icons/arrows/arrow-right.svg
@@ -1,4 +1,4 @@
 <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">
-  <line x1="4" y1="12" x2="20" y2="12"/>
-  <polyline points="14 6 20 12 14 18"/>
-</svg>
\ No newline at end of file
+    <line x1="4" y1="12" x2="20" y2="12"/>
+    <polyline points="14 6 20 12 14 18"/>
+</svg>
diff --git a/icons/arrows/arrow-up-left.svg b/icons/arrows/arrow-up-left.svg
new file mode 100644
index 0000000..2637bcb
--- /dev/null
+++ b/icons/arrows/arrow-up-left.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <line x1="18" y1="18" x2="6" y2="6" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <polyline points="15 6 6 6 6 15" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/arrows/arrow-up-right.svg b/icons/arrows/arrow-up-right.svg
new file mode 100644
index 0000000..e42e4c3
--- /dev/null
+++ b/icons/arrows/arrow-up-right.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <line x1="6" y1="18" x2="18" y2="6" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <polyline points="9 6 18 6 18 15" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/arrow-up.svg b/icons/arrows/arrow-up.svg
similarity index 65%
rename from icons/arrow-up.svg
rename to icons/arrows/arrow-up.svg
index 3a61556..63994a4 100644
--- a/icons/arrow-up.svg
+++ b/icons/arrows/arrow-up.svg
@@ -1,4 +1,4 @@
 <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">
-  <line x1="12" y1="20" x2="12" y2="4"/>
-  <polyline points="6 10 12 4 18 10"/>
-</svg>
\ No newline at end of file
+    <line x1="12" y1="20" x2="12" y2="4"/>
+    <polyline points="6 10 12 4 18 10"/>
+</svg>
diff --git a/icons/chevron-down.svg b/icons/arrows/chevron-down.svg
similarity index 78%
rename from icons/chevron-down.svg
rename to icons/arrows/chevron-down.svg
index 51d25f1..e44c572 100644
--- a/icons/chevron-down.svg
+++ b/icons/arrows/chevron-down.svg
@@ -1,3 +1,3 @@
 <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="6 9 12 15 18 9"/>
-</svg>
\ No newline at end of file
+    <polyline points="6 9 12 15 18 9"/>
+</svg>
diff --git a/icons/chevron-left.svg b/icons/arrows/chevron-left.svg
similarity index 78%
rename from icons/chevron-left.svg
rename to icons/arrows/chevron-left.svg
index c53807d..0d57c8a 100644
--- a/icons/chevron-left.svg
+++ b/icons/arrows/chevron-left.svg
@@ -1,3 +1,3 @@
 <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="15 18 9 12 15 6"/>
-</svg>
\ No newline at end of file
+    <polyline points="15 18 9 12 15 6"/>
+</svg>
diff --git a/icons/chevron-right.svg b/icons/arrows/chevron-right.svg
similarity index 78%
rename from icons/chevron-right.svg
rename to icons/arrows/chevron-right.svg
index 4ac09ce..aa62be5 100644
--- a/icons/chevron-right.svg
+++ b/icons/arrows/chevron-right.svg
@@ -1,3 +1,3 @@
 <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="9 18 15 12 9 6"/>
-</svg>
\ No newline at end of file
+    <polyline points="9 18 15 12 9 6"/>
+</svg>
diff --git a/icons/chevron-up.svg b/icons/arrows/chevron-up.svg
similarity index 78%
rename from icons/chevron-up.svg
rename to icons/arrows/chevron-up.svg
index eccabe8..27f7bb7 100644
--- a/icons/chevron-up.svg
+++ b/icons/arrows/chevron-up.svg
@@ -1,3 +1,3 @@
 <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="18 15 12 9 6 15"/>
-</svg>
\ No newline at end of file
+    <polyline points="18 15 12 9 6 15"/>
+</svg>
diff --git a/icons/arrows/chevrons-down.svg b/icons/arrows/chevrons-down.svg
new file mode 100644
index 0000000..c551d50
--- /dev/null
+++ b/icons/arrows/chevrons-down.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="7 13 12 18 17 13" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="7 6 12 11 17 6" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/arrows/chevrons-left.svg b/icons/arrows/chevrons-left.svg
new file mode 100644
index 0000000..2f1b690
--- /dev/null
+++ b/icons/arrows/chevrons-left.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="11 17 6 12 11 7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="18 17 13 12 18 7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/arrows/chevrons-right.svg b/icons/arrows/chevrons-right.svg
new file mode 100644
index 0000000..12fe6ae
--- /dev/null
+++ b/icons/arrows/chevrons-right.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="13 17 18 12 13 7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="6 17 11 12 6 7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/arrows/chevrons-up.svg b/icons/arrows/chevrons-up.svg
new file mode 100644
index 0000000..179c19b
--- /dev/null
+++ b/icons/arrows/chevrons-up.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="17 11 12 6 7 11" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="17 18 12 13 7 18" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/bar-chart-2.svg b/icons/bar-chart-2.svg
deleted file mode 100644
index edcc64f..0000000
--- a/icons/bar-chart-2.svg
+++ /dev/null
@@ -1,5 +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="10" y="3" width="4" height="18" rx="1" ry="1"/>
-  <rect x="18" y="8" width="4" height="13" rx="1" ry="1"/>
-  <rect x="2" y="13" width="4" height="8" rx="1" ry="1"/>
-</svg>
\ No newline at end of file
diff --git a/icons/bar-chart.svg b/icons/bar-chart.svg
deleted file mode 100644
index ee72572..0000000
--- a/icons/bar-chart.svg
+++ /dev/null
@@ -1,5 +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="18" y="3" width="4" height="18" rx="1" ry="1"/>
-  <rect x="10" y="8" width="4" height="13" rx="1" ry="1"/>
-  <rect x="2" y="13" width="4" height="8" rx="1" ry="1"/>
-</svg>
\ No newline at end of file
diff --git a/icons/bell-off.svg b/icons/bell-off.svg
deleted file mode 100644
index dc25dac..0000000
--- a/icons/bell-off.svg
+++ /dev/null
@@ -1,6 +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">
-  <path d="M8.56,2.9A7,7,0,0,1,19,9v4"/>
-  <path d="M17,17H2a3,3,0,0,0,3-3V9a7,7,0,0,1,.78-3.22"/>
-  <path d="M13.73,21a2,2,0,0,1-3.46,0"/>
-  <line x1="1" y1="1" x2="23" y2="23"/>
-</svg>
\ No newline at end of file
diff --git a/icons/bell.svg b/icons/bell.svg
deleted file mode 100644
index c1bd882..0000000
--- a/icons/bell.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">
-  <path d="M22,17H2a3,3,0,0,0,3-3V9A7,7,0,0,1,19,9v5A3,3,0,0,0,22,17Z"/>
-  <path d="M13.73,21a2,2,0,0,1-3.46,0"/>
-</svg>
\ No newline at end of file
diff --git a/icons/book.svg b/icons/book.svg
deleted file mode 100644
index 07073cc..0000000
--- a/icons/book.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">
-  <path d="M4,19.5H4A2.5,2.5,0,0,1,6.5,17H20"/>
-  <path d="M6.5,2H20a0,0,0,0,1,0,0V22a0,0,0,0,1,0,0H6.5A2.5,2.5,0,0,1,4,19.5V4.5A2.5,2.5,0,0,1,6.5,2Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/box.svg b/icons/box.svg
deleted file mode 100644
index a44d1ae..0000000
--- a/icons/box.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M12.89,1.45l8,4A2,2,0,0,1,22,7.24v9.53a2,2,0,0,1-1.11,1.79l-8,4a2,2,0,0,1-1.79,0l-8-4A2,2,0,0,1,2,16.76V7.24A2,2,0,0,1,3.11,5.45l8-4A2,2,0,0,1,12.89,1.45Z"/>
-  <polyline points="2.32 6.16 12 11 21.68 6.16"/>
-  <line x1="12" y1="22.76" x2="12" y2="11"/>
-</svg>
\ No newline at end of file
diff --git a/icons/calendar.svg b/icons/calendar.svg
deleted file mode 100644
index 8d92be9..0000000
--- a/icons/calendar.svg
+++ /dev/null
@@ -1,6 +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="3" y="4" width="18" height="18" rx="2" ry="2"/>
-  <line x1="16" y1="2" x2="16" y2="6"/>
-  <line x1="8" y1="2" x2="8" y2="6"/>
-  <line x1="3" y1="10" x2="21" y2="10"/>
-</svg>
\ No newline at end of file
diff --git a/icons/camera-off.svg b/icons/camera-off.svg
deleted file mode 100644
index 226b370..0000000
--- a/icons/camera-off.svg
+++ /dev/null
@@ -1,6 +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">
-  <line x1="1" y1="1" x2="23" y2="23"/>
-  <path d="M21,21H3a2,2,0,0,1-2-2V8A2,2,0,0,1,3,6H6"/>
-  <path d="M9,3h6l2,3h4a2,2,0,0,1,2,2v9.34"/>
-  <path d="M15.28,15.28A4,4,0,1,1,9.72,9.72"/>
-</svg>
\ No newline at end of file
diff --git a/icons/check-circle.svg b/icons/check-circle.svg
deleted file mode 100644
index 80b010a..0000000
--- a/icons/check-circle.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">
-  <path d="M22,11.07q0,.46,0,.93a10,10,0,1,1-5.93-9.14"/>
-  <polyline points="23 3 12 14 9 11"/>
-</svg>
\ No newline at end of file
diff --git a/icons/chrome.svg b/icons/chrome.svg
deleted file mode 100644
index 207d7a9..0000000
--- a/icons/chrome.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="12" cy="12" r="10"/>
-  <circle cx="12" cy="12" r="4"/>
-  <line x1="21.17" y1="8" x2="12" y2="8"/>
-  <line x1="3.95" y1="6.06" x2="8.54" y2="14"/>
-  <line x1="10.88" y1="21.94" x2="15.46" y2="14"/>
-</svg>
\ No newline at end of file
diff --git a/icons/cloud-off.svg b/icons/cloud-off.svg
deleted file mode 100644
index 68f43f1..0000000
--- a/icons/cloud-off.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M22.61,16.95A5,5,0,0,0,18,10H16.74A8,8,0,0,0,9.69,4"/>
-  <path d="M5,5A8,8,0,0,0,9,20h9a5,5,0,0,0,1.7-.3"/>
-  <line x1="1" y1="1" x2="23" y2="23"/>
-</svg>
\ No newline at end of file
diff --git a/icons/cog.svg b/icons/cog.svg
deleted file mode 100644
index 3735b5f..0000000
--- a/icons/cog.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">
-  <path d="M19.4,15v0a1.65,1.65,0,0,0,.33,1.82l.06.06a2,2,0,0,1,0,2.83h0a2,2,0,0,1-2.83,0l-.06-.06a1.65,1.65,0,0,0-1.82-.33h0a1.65,1.65,0,0,0-1,1.51V21a2,2,0,0,1-2,2h0a2,2,0,0,1-2-2v-.09A1.65,1.65,0,0,0,9,19.4h0a1.65,1.65,0,0,0-1.82.33l-.06.06a2,2,0,0,1-2.83,0h0a2,2,0,0,1,0-2.83l.06-.06a1.65,1.65,0,0,0,.33-1.82v0a1.65,1.65,0,0,0-1.51-1H3a2,2,0,0,1-2-2H1a2,2,0,0,1,2-2h.09A1.65,1.65,0,0,0,4.6,9v0a1.65,1.65,0,0,0-.33-1.82l-.06-.06a2,2,0,0,1,0-2.83h0a2,2,0,0,1,2.83,0l.06.06a1.65,1.65,0,0,0,1.82.33H9a1.65,1.65,0,0,0,1-1.51V3a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2v.09A1.65,1.65,0,0,0,15,4.6h0a1.65,1.65,0,0,0,1.82-.33l.06-.06a2,2,0,0,1,2.83,0h0a2,2,0,0,1,0,2.83l-.06.06a1.65,1.65,0,0,0-.33,1.82V9a1.65,1.65,0,0,0,1.51,1H21a2,2,0,0,1,2,2h0a2,2,0,0,1-2,2h-.09A1.65,1.65,0,0,0,19.4,15Z"/>
-  <circle cx="12" cy="12" r="3"/>
-</svg>
\ No newline at end of file
diff --git a/icons/command.svg b/icons/command.svg
deleted file mode 100644
index c629e26..0000000
--- a/icons/command.svg
+++ /dev/null
@@ -1,3 +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">
-  <path d="M18,3h0a3,3,0,0,0-3,3V18a3,3,0,0,0,3,3h0a3,3,0,0,0,3-3h0a3,3,0,0,0-3-3H6a3,3,0,0,0-3,3H3a3,3,0,0,0,3,3H6a3,3,0,0,0,3-3V6A3,3,0,0,0,6,3H6A3,3,0,0,0,3,6H3A3,3,0,0,0,6,9H18a3,3,0,0,0,3-3h0A3,3,0,0,0,18,3Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/comment-circle.svg b/icons/comment-circle.svg
deleted file mode 100644
index 20c6935..0000000
--- a/icons/comment-circle.svg
+++ /dev/null
@@ -1,3 +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">
-  <path d="M21,11.5a8.38,8.38,0,0,1-.9,3.8A8.5,8.5,0,0,1,12.5,20a8.38,8.38,0,0,1-3.8-.9L3,21l1.9-5.7A8.38,8.38,0,0,1,4,11.5,8.5,8.5,0,0,1,8.7,3.9,8.38,8.38,0,0,1,12.5,3L13,3a8.48,8.48,0,0,1,8,8C21,11.15,21,11.33,21,11.5Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/comment-square.svg b/icons/comment-square.svg
deleted file mode 100644
index a5a4ed7..0000000
--- a/icons/comment-square.svg
+++ /dev/null
@@ -1,3 +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">
-  <path d="M21,15a2,2,0,0,1-2,2H7L3,21V5A2,2,0,0,1,5,3H19a2,2,0,0,1,2,2Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/feather.svg b/icons/communication/mail.svg
similarity index 55%
rename from icons/feather.svg
rename to icons/communication/mail.svg
index d40a254..4dddcc6 100644
--- a/icons/feather.svg
+++ b/icons/communication/mail.svg
@@ -1,5 +1,4 @@
 <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">
-  <path d="M20.24,12.24a6,6,0,0,0-8.49-8.49L5,10.5V19h8.5Z"/>
-  <line x1="16" y1="8" x2="2" y2="22"/>
-  <line x1="17" y1="15" x2="9" y2="15"/>
+    <path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"/>
+    <polyline points="22,6 12,13 2,6"/>
 </svg>
diff --git a/icons/communication/message-circle.svg b/icons/communication/message-circle.svg
new file mode 100644
index 0000000..c263358
--- /dev/null
+++ b/icons/communication/message-circle.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"/>
+</svg>
diff --git a/icons/clock.svg b/icons/communication/message-square.svg
similarity index 67%
rename from icons/clock.svg
rename to icons/communication/message-square.svg
index c218edd..33e4b91 100644
--- a/icons/clock.svg
+++ b/icons/communication/message-square.svg
@@ -1,4 +1,3 @@
 <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="12" cy="12" r="10"/>
-  <polyline points="12 6 12 12 15 15"/>
-</svg>
\ No newline at end of file
+    <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/>
+</svg>
diff --git a/icons/communication/phone-call.svg b/icons/communication/phone-call.svg
new file mode 100644
index 0000000..6e22f5c
--- /dev/null
+++ b/icons/communication/phone-call.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M15.05 5A5 5 0 0 1 19 8.95M15.05 1A9 9 0 0 1 23 8.94m-1 7.98v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"/>
+</svg>
diff --git a/icons/communication/phone-forwarded.svg b/icons/communication/phone-forwarded.svg
new file mode 100644
index 0000000..0b7b6ec
--- /dev/null
+++ b/icons/communication/phone-forwarded.svg
@@ -0,0 +1,5 @@
+<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="19 1 23 5 19 9"/>
+    <line x1="15" y1="5" x2="23" y2="5"/>
+    <path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"/>
+</svg>
diff --git a/icons/communication/phone-incoming.svg b/icons/communication/phone-incoming.svg
new file mode 100644
index 0000000..d24df2c
--- /dev/null
+++ b/icons/communication/phone-incoming.svg
@@ -0,0 +1,5 @@
+<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 2 16 8 22 8"/>
+    <line x1="23" y1="1" x2="16" y2="8"/>
+    <path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"/>
+</svg>
diff --git a/icons/communication/phone-missed.svg b/icons/communication/phone-missed.svg
new file mode 100644
index 0000000..9e73774
--- /dev/null
+++ b/icons/communication/phone-missed.svg
@@ -0,0 +1,5 @@
+<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">
+    <line x1="23" y1="1" x2="17" y2="7"/>
+    <line x1="17" y1="1" x2="23" y2="7"/>
+    <path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"/>
+</svg>
diff --git a/icons/communication/phone-off.svg b/icons/communication/phone-off.svg
new file mode 100644
index 0000000..bde5152
--- /dev/null
+++ b/icons/communication/phone-off.svg
@@ -0,0 +1,4 @@
+<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">
+    <path d="M10.68 13.31a16 16 0 0 0 3.41 2.6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7 2 2 0 0 1 1.72 2v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.42 19.42 0 0 1-3.33-2.67m-2.67-3.34a19.79 19.79 0 0 1-3.07-8.63A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91"/>
+    <line x1="23" y1="1" x2="1" y2="23"/>
+</svg>
diff --git a/icons/communication/phone-outgoing.svg b/icons/communication/phone-outgoing.svg
new file mode 100644
index 0000000..14facf1
--- /dev/null
+++ b/icons/communication/phone-outgoing.svg
@@ -0,0 +1,5 @@
+<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="23 7 23 1 17 1"/>
+    <line x1="16" y1="8" x2="23" y2="1"/>
+    <path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"/>
+</svg>
diff --git a/icons/communication/phone.svg b/icons/communication/phone.svg
new file mode 100644
index 0000000..375e5be
--- /dev/null
+++ b/icons/communication/phone.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"/>
+</svg>
diff --git a/icons/communication/voicemail.svg b/icons/communication/voicemail.svg
new file mode 100644
index 0000000..b5b2c2e
--- /dev/null
+++ b/icons/communication/voicemail.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <circle cx="5.5" cy="11.5" r="4.5" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
+    <circle cx="18.5" cy="11.5" r="4.5" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="5.5" y1="16" x2="18.5" y2="16" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
+</svg>
diff --git a/icons/activity.svg b/icons/core/activity.svg
similarity index 73%
rename from icons/activity.svg
rename to icons/core/activity.svg
index 2bff8e6..3584132 100644
--- a/icons/activity.svg
+++ b/icons/core/activity.svg
@@ -1,3 +1,3 @@
 <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="22 12 18 12 15 21 9 3 6 12 2 12"/>
-</svg>
\ No newline at end of file
+    <polyline points="22 12 18 12 15 21 9 3 6 12 2 12"/>
+</svg>
diff --git a/icons/airplay.svg b/icons/core/airplay.svg
similarity index 54%
rename from icons/airplay.svg
rename to icons/core/airplay.svg
index 6edad76..427e2c7 100644
--- a/icons/airplay.svg
+++ b/icons/core/airplay.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M5,17H4a2,2,0,0,1-2-2V5A2,2,0,0,1,4,3H20a2,2,0,0,1,2,2V15a2,2,0,0,1-2,2H19"/>
-  <polygon points="12 15 17 21 7 21 12 15"/>
-</svg>
\ No newline at end of file
+    <path d="M5 17H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-1"/>
+    <polygon points="12 15 17 21 7 21 12 15"/>
+</svg>
diff --git a/icons/alert-circle.svg b/icons/core/alert-circle.svg
similarity index 57%
rename from icons/alert-circle.svg
rename to icons/core/alert-circle.svg
index bcb3594..280aa31 100644
--- a/icons/alert-circle.svg
+++ b/icons/core/alert-circle.svg
@@ -1,5 +1,5 @@
 <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="12" cy="12" r="10"/>
-  <line x1="12" y1="8" x2="12" y2="12"/>
-  <line x1="12" y1="16" x2="12" y2="16"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <line x1="12" y1="8" x2="12" y2="12"/>
+    <line x1="12" y1="16" x2="12" y2="16"/>
+</svg>
diff --git a/icons/core/alert-octagon.svg b/icons/core/alert-octagon.svg
new file mode 100644
index 0000000..cf6765d
--- /dev/null
+++ b/icons/core/alert-octagon.svg
@@ -0,0 +1,5 @@
+<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="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"/>
+    <line x1="12" y1="8" x2="12" y2="12"/>
+    <line x1="12" y1="16" x2="12" y2="16"/>
+</svg>
diff --git a/icons/core/alert-triangle.svg b/icons/core/alert-triangle.svg
new file mode 100644
index 0000000..c32b76d
--- /dev/null
+++ b/icons/core/alert-triangle.svg
@@ -0,0 +1,5 @@
+<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">
+    <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"/>
+    <line x1="12" y1="9" x2="12" y2="13"/>
+    <line x1="12" y1="17" x2="12" y2="17"/>
+</svg>
diff --git a/icons/core/align-center.svg b/icons/core/align-center.svg
new file mode 100644
index 0000000..9e48a28
--- /dev/null
+++ b/icons/core/align-center.svg
@@ -0,0 +1,6 @@
+<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">
+    <line x1="18" y1="10" x2="6" y2="10"/>
+    <line x1="21" y1="6" x2="3" y2="6"/>
+    <line x1="21" y1="14" x2="3" y2="14"/>
+    <line x1="18" y1="18" x2="6" y2="18"/>
+</svg>
diff --git a/icons/core/align-justify.svg b/icons/core/align-justify.svg
new file mode 100644
index 0000000..cb9c9bf
--- /dev/null
+++ b/icons/core/align-justify.svg
@@ -0,0 +1,6 @@
+<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">
+    <line x1="21" y1="10" x2="3" y2="10"/>
+    <line x1="21" y1="6" x2="3" y2="6"/>
+    <line x1="21" y1="14" x2="3" y2="14"/>
+    <line x1="21" y1="18" x2="3" y2="18"/>
+</svg>
diff --git a/icons/core/align-left.svg b/icons/core/align-left.svg
new file mode 100644
index 0000000..0854522
--- /dev/null
+++ b/icons/core/align-left.svg
@@ -0,0 +1,6 @@
+<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">
+    <line x1="17" y1="10" x2="3" y2="10"/>
+    <line x1="21" y1="6" x2="3" y2="6"/>
+    <line x1="21" y1="14" x2="3" y2="14"/>
+    <line x1="17" y1="18" x2="3" y2="18"/>
+</svg>
diff --git a/icons/core/align-right.svg b/icons/core/align-right.svg
new file mode 100644
index 0000000..72708c2
--- /dev/null
+++ b/icons/core/align-right.svg
@@ -0,0 +1,6 @@
+<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">
+    <line x1="21" y1="10" x2="7" y2="10"/>
+    <line x1="21" y1="6" x2="3" y2="6"/>
+    <line x1="21" y1="14" x2="3" y2="14"/>
+    <line x1="21" y1="18" x2="7" y2="18"/>
+</svg>
diff --git a/icons/triangle.svg b/icons/core/anchor.svg
similarity index 71%
rename from icons/triangle.svg
rename to icons/core/anchor.svg
index 0ff0ae5..d87888f 100644
--- a/icons/triangle.svg
+++ b/icons/core/anchor.svg
@@ -1,3 +1,5 @@
 <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">
-  <path d="M10.29,3.86,1.82,18a2,2,0,0,0,1.71,3H20.47a2,2,0,0,0,1.71-3L13.71,3.86A2,2,0,0,0,10.29,3.86Z"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="5" r="3"/>
+    <line x1="12" y1="22" x2="12" y2="8"/>
+    <path d="M5 12H2a10 10 0 0 0 20 0h-3"/>
+</svg>
diff --git a/icons/at-sign.svg b/icons/core/at-sign.svg
similarity index 61%
rename from icons/at-sign.svg
rename to icons/core/at-sign.svg
index d4bdb9d..0d62e47 100644
--- a/icons/at-sign.svg
+++ b/icons/core/at-sign.svg
@@ -1,4 +1,4 @@
 <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="12" cy="12" r="4"/>
-  <path d="M16,12v1a3,3,0,0,0,6,0V12a10,10,0,1,0-3.92,7.94"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="4"/>
+    <path d="M16 12v1a3 3 0 0 0 6 0v-1a10 10 0 1 0-3.92 7.94"/>
+</svg>
diff --git a/icons/award.svg b/icons/core/award.svg
similarity index 61%
rename from icons/award.svg
rename to icons/core/award.svg
index d176c79..a8206b5 100644
--- a/icons/award.svg
+++ b/icons/core/award.svg
@@ -1,4 +1,4 @@
 <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="12" cy="8" r="7"/>
-  <polyline points="8.21 13.89 7 23 12 20 17 23 15.79 13.88"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="8" r="7"/>
+    <polyline points="8.21 13.89 7 23 12 20 17 23 15.79 13.88"/>
+</svg>
diff --git a/icons/core/bar-chart-2.svg b/icons/core/bar-chart-2.svg
new file mode 100644
index 0000000..bf04491
--- /dev/null
+++ b/icons/core/bar-chart-2.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <rect x="10" y="3" width="4" height="18" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <rect x="18" y="8" width="4" height="13" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <rect x="2" y="13" width="4" height="8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/bar-chart.svg b/icons/core/bar-chart.svg
new file mode 100644
index 0000000..593b543
--- /dev/null
+++ b/icons/core/bar-chart.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <rect x="18" y="3" width="4" height="18" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <rect x="10" y="8" width="4" height="13" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <rect x="2" y="13" width="4" height="8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/battery-charging.svg b/icons/core/battery-charging.svg
new file mode 100644
index 0000000..99a591f
--- /dev/null
+++ b/icons/core/battery-charging.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M5 18H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h3.19M15 6h2a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2h-3.19" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="23" y1="13" x2="23" y2="11" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="11 6 7 12 13 12 9 18" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/battery.svg b/icons/core/battery.svg
similarity index 60%
rename from icons/battery.svg
rename to icons/core/battery.svg
index d48c4f3..42f99b9 100644
--- a/icons/battery.svg
+++ b/icons/core/battery.svg
@@ -1,4 +1,4 @@
 <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="1" y="6" width="18" height="12" rx="2" ry="2"/>
-  <line x1="23" y1="13" x2="23" y2="11"/>
-</svg>
\ No newline at end of file
+    <rect x="1" y="6" width="18" height="12" rx="2" ry="2"/>
+    <line x1="23" y1="13" x2="23" y2="11"/>
+</svg>
diff --git a/icons/hash.svg b/icons/core/bell-off.svg
similarity index 52%
rename from icons/hash.svg
rename to icons/core/bell-off.svg
index b6a7b5f..19117ae 100644
--- a/icons/hash.svg
+++ b/icons/core/bell-off.svg
@@ -1,6 +1,4 @@
 <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">
-  <line x1="4" y1="9" x2="20" y2="9"/>
-  <line x1="4" y1="15" x2="20" y2="15"/>
-  <line x1="10" y1="3" x2="8" y2="21"/>
-  <line x1="16" y1="3" x2="14" y2="21"/>
+    <path d="M8.56 2.9A7 7 0 0 1 19 9v4m-2 4H2a3 3 0 0 0 3-3V9a7 7 0 0 1 .78-3.22M13.73 21a2 2 0 0 1-3.46 0"/>
+    <line x1="1" y1="1" x2="23" y2="23"/>
 </svg>
diff --git a/icons/core/bell.svg b/icons/core/bell.svg
new file mode 100644
index 0000000..a9063aa
--- /dev/null
+++ b/icons/core/bell.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M22 17H2a3 3 0 0 0 3-3V9a7 7 0 0 1 14 0v5a3 3 0 0 0 3 3zm-8.27 4a2 2 0 0 1-3.46 0"/>
+</svg>
diff --git a/icons/bluetooth.svg b/icons/core/bluetooth.svg
similarity index 68%
rename from icons/bluetooth.svg
rename to icons/core/bluetooth.svg
index dc5e512..4fdf7e8 100644
--- a/icons/bluetooth.svg
+++ b/icons/core/bluetooth.svg
@@ -1,3 +1,3 @@
 <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="6.5 6.5 17.5 17.5 12 23 12 1 17.5 6.5 6.5 17.5"/>
-</svg>
\ No newline at end of file
+    <polyline points="6.5 6.5 17.5 17.5 12 23 12 1 17.5 6.5 6.5 17.5"/>
+</svg>
diff --git a/icons/anchor.svg b/icons/core/book.svg
similarity index 56%
rename from icons/anchor.svg
rename to icons/core/book.svg
index 65d06d3..d081df9 100644
--- a/icons/anchor.svg
+++ b/icons/core/book.svg
@@ -1,5 +1,4 @@
 <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="12" cy="5" r="3"/>
-  <line x1="12" y1="22" x2="12" y2="8"/>
-  <path d="M5,12H2a10,10,0,0,0,20,0H19"/>
-</svg>
\ No newline at end of file
+    <path d="M4 19.5A2.5 2.5 0 0 1 6.5 17H20"/>
+    <path d="M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z"/>
+</svg>
diff --git a/icons/filter.svg b/icons/core/bookmark.svg
similarity index 71%
rename from icons/filter.svg
rename to icons/core/bookmark.svg
index 187f9bf..2852ebb 100644
--- a/icons/filter.svg
+++ b/icons/core/bookmark.svg
@@ -1,3 +1,3 @@
 <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="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3"/>
-</svg>
\ No newline at end of file
+    <path d="M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z"/>
+</svg>
diff --git a/icons/core/box.svg b/icons/core/box.svg
new file mode 100644
index 0000000..0b4858d
--- /dev/null
+++ b/icons/core/box.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M12.89 1.45l8 4A2 2 0 0 1 22 7.24v9.53a2 2 0 0 1-1.11 1.79l-8 4a2 2 0 0 1-1.79 0l-8-4a2 2 0 0 1-1.1-1.8V7.24a2 2 0 0 1 1.11-1.79l8-4a2 2 0 0 1 1.78 0z" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="2.32 6.16 12 11 21.68 6.16" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="22.76" x2="12" y2="11" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/briefcase.svg b/icons/core/briefcase.svg
similarity index 57%
rename from icons/briefcase.svg
rename to icons/core/briefcase.svg
index 5aff6cd..d8257d8 100644
--- a/icons/briefcase.svg
+++ b/icons/core/briefcase.svg
@@ -1,4 +1,4 @@
 <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="2" y="7" width="20" height="14" rx="2" ry="2"/>
-  <path d="M16,21V5a2,2,0,0,0-2-2H10A2,2,0,0,0,8,5V21"/>
-</svg>
\ No newline at end of file
+    <rect x="2" y="7" width="20" height="14" rx="2" ry="2"/>
+    <path d="M16 21V5a2 2 0 0 0-2-2h-4a2 2 0 0 0-2 2v16"/>
+</svg>
diff --git a/icons/core/calendar.svg b/icons/core/calendar.svg
new file mode 100644
index 0000000..0030bb9
--- /dev/null
+++ b/icons/core/calendar.svg
@@ -0,0 +1,6 @@
+<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="3" y="4" width="18" height="18" rx="2" ry="2"/>
+    <line x1="16" y1="2" x2="16" y2="6"/>
+    <line x1="8" y1="2" x2="8" y2="6"/>
+    <line x1="3" y1="10" x2="21" y2="10"/>
+</svg>
diff --git a/icons/core/cast.svg b/icons/core/cast.svg
new file mode 100644
index 0000000..e08743f
--- /dev/null
+++ b/icons/core/cast.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M2 16.1A5 5 0 0 1 5.9 20M2 12.05A9 9 0 0 1 9.95 20M2 8V6a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2h-6" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="2" y1="20" x2="2" y2="20" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/check-circle.svg b/icons/core/check-circle.svg
new file mode 100644
index 0000000..720c2f1
--- /dev/null
+++ b/icons/core/check-circle.svg
@@ -0,0 +1,4 @@
+<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">
+    <path d="M22 11.07V12a10 10 0 1 1-5.93-9.14"/>
+    <polyline points="23 3 12 14 9 11"/>
+</svg>
diff --git a/icons/check-square.svg b/icons/core/check-square.svg
similarity index 58%
rename from icons/check-square.svg
rename to icons/core/check-square.svg
index ad593e7..0868480 100644
--- a/icons/check-square.svg
+++ b/icons/core/check-square.svg
@@ -1,4 +1,4 @@
 <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="9 11 12 14 23 3"/>
-  <path d="M21,12v7a2,2,0,0,1-2,2H5a2,2,0,0,1-2-2V5A2,2,0,0,1,5,3H16"/>
-</svg>
\ No newline at end of file
+    <polyline points="9 11 12 14 23 3"/>
+    <path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"/>
+</svg>
diff --git a/icons/check.svg b/icons/core/check.svg
similarity index 78%
rename from icons/check.svg
rename to icons/core/check.svg
index f053b26..9351e77 100644
--- a/icons/check.svg
+++ b/icons/core/check.svg
@@ -1,3 +1,3 @@
 <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="20 6 9 17 4 12"/>
-</svg>
\ No newline at end of file
+    <polyline points="20 6 9 17 4 12"/>
+</svg>
diff --git a/icons/circle.svg b/icons/core/circle.svg
similarity index 79%
rename from icons/circle.svg
rename to icons/core/circle.svg
index f6750a0..8b9ba61 100644
--- a/icons/circle.svg
+++ b/icons/core/circle.svg
@@ -1,3 +1,3 @@
 <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="12" cy="12" r="10"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+</svg>
diff --git a/icons/clipboard.svg b/icons/core/clipboard.svg
similarity index 52%
rename from icons/clipboard.svg
rename to icons/core/clipboard.svg
index df73949..e4ba7f6 100644
--- a/icons/clipboard.svg
+++ b/icons/core/clipboard.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M16,4h2a2,2,0,0,1,2,2V20a2,2,0,0,1-2,2H6a2,2,0,0,1-2-2V6A2,2,0,0,1,6,4H8"/>
-  <rect x="8" y="2" width="8" height="4" rx="1" ry="1"/>
-</svg>
\ No newline at end of file
+    <path d="M16 4h2a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2"/>
+    <rect x="8" y="2" width="8" height="4" rx="1" ry="1"/>
+</svg>
diff --git a/icons/arrow-left.svg b/icons/core/clock.svg
similarity index 66%
rename from icons/arrow-left.svg
rename to icons/core/clock.svg
index 0b0730a..a793880 100644
--- a/icons/arrow-left.svg
+++ b/icons/core/clock.svg
@@ -1,4 +1,4 @@
 <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">
-  <line x1="20" y1="12" x2="4" y2="12"/>
-  <polyline points="10 18 4 12 10 6"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <polyline points="12 6 12 12 15 15"/>
+</svg>
diff --git a/icons/core/cloud-off.svg b/icons/core/cloud-off.svg
new file mode 100644
index 0000000..556fadf
--- /dev/null
+++ b/icons/core/cloud-off.svg
@@ -0,0 +1,4 @@
+<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">
+    <path d="M22.61 16.95A5 5 0 0 0 18 10h-1.26a8 8 0 0 0-7.05-6M5 5a8 8 0 0 0 4 15h9a5 5 0 0 0 1.7-.3"/>
+    <line x1="1" y1="1" x2="23" y2="23"/>
+</svg>
diff --git a/icons/cloud.svg b/icons/core/cloud.svg
similarity index 71%
rename from icons/cloud.svg
rename to icons/core/cloud.svg
index 938302a..cb6087f 100644
--- a/icons/cloud.svg
+++ b/icons/core/cloud.svg
@@ -1,3 +1,3 @@
 <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">
-  <path d="M18,10H16.74A8,8,0,1,0,9,20h9a5,5,0,0,0,0-10Z"/>
-</svg>
\ No newline at end of file
+    <path d="M18 10h-1.26A8 8 0 1 0 9 20h9a5 5 0 0 0 0-10z"/>
+</svg>
diff --git a/icons/core/command.svg b/icons/core/command.svg
new file mode 100644
index 0000000..4135d14
--- /dev/null
+++ b/icons/core/command.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M18 3a3 3 0 0 0-3 3v12a3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3H6a3 3 0 0 0-3 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3V6a3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3h12a3 3 0 0 0 3-3 3 3 0 0 0-3-3z"/>
+</svg>
diff --git a/icons/core/copy.svg b/icons/core/copy.svg
new file mode 100644
index 0000000..42f754d
--- /dev/null
+++ b/icons/core/copy.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <rect x="9" y="2" width="13" height="13" rx="2" ry="2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <path d="M9 9H4a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2-2v-5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/cpu.svg b/icons/core/cpu.svg
new file mode 100644
index 0000000..26d36fc
--- /dev/null
+++ b/icons/core/cpu.svg
@@ -0,0 +1,12 @@
+<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="4" y="4" width="16" height="16" rx="2" ry="2"/>
+    <rect x="9" y="9" width="6" height="6"/>
+    <line x1="9" y1="1" x2="9" y2="4"/>
+    <line x1="15" y1="1" x2="15" y2="4"/>
+    <line x1="9" y1="20" x2="9" y2="23"/>
+    <line x1="15" y1="20" x2="15" y2="23"/>
+    <line x1="20" y1="9" x2="23" y2="9"/>
+    <line x1="20" y1="14" x2="23" y2="14"/>
+    <line x1="1" y1="9" x2="4" y2="9"/>
+    <line x1="1" y1="14" x2="4" y2="14"/>
+</svg>
diff --git a/icons/delete.svg b/icons/core/delete.svg
similarity index 52%
rename from icons/delete.svg
rename to icons/core/delete.svg
index 9564f92..830dab7 100644
--- a/icons/delete.svg
+++ b/icons/core/delete.svg
@@ -1,5 +1,5 @@
 <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">
-  <path d="M21,4H8L1,12l7,8H21a2,2,0,0,0,2-2V6A2,2,0,0,0,21,4Z"/>
-  <line x1="18" y1="9" x2="12" y2="15"/>
-  <line x1="12" y1="9" x2="18" y2="15"/>
-</svg>
\ No newline at end of file
+    <path d="M21 4H8l-7 8 7 8h13a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2z"/>
+    <line x1="18" y1="9" x2="12" y2="15"/>
+    <line x1="12" y1="9" x2="18" y2="15"/>
+</svg>
diff --git a/icons/core/disc.svg b/icons/core/disc.svg
new file mode 100644
index 0000000..bd80b99
--- /dev/null
+++ b/icons/core/disc.svg
@@ -0,0 +1,4 @@
+<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="12" cy="12" r="10"/>
+    <circle cx="12" cy="12" r="3"/>
+</svg>
diff --git a/icons/download-cloud.svg b/icons/core/download-cloud.svg
similarity index 51%
rename from icons/download-cloud.svg
rename to icons/core/download-cloud.svg
index 3bd0128..623f805 100644
--- a/icons/download-cloud.svg
+++ b/icons/core/download-cloud.svg
@@ -1,5 +1,5 @@
 <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="8 17 12 21 16 17"/>
-  <line x1="12" y1="12" x2="12" y2="21"/>
-  <path d="M20.88,18.09A5,5,0,0,0,18,9H16.74A8,8,0,1,0,3,16.29"/>
-</svg>
\ No newline at end of file
+    <polyline points="8 17 12 21 16 17"/>
+    <line x1="12" y1="12" x2="12" y2="21"/>
+    <path d="M20.88 18.09A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.29"/>
+</svg>
diff --git a/icons/download.svg b/icons/core/download.svg
similarity index 53%
rename from icons/download.svg
rename to icons/core/download.svg
index 29ec61f..5af8946 100644
--- a/icons/download.svg
+++ b/icons/core/download.svg
@@ -1,5 +1,5 @@
 <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">
-  <path d="M3,17v3a2,2,0,0,0,2,2H19a2,2,0,0,0,2-2V17"/>
-  <polyline points="8 12 12 16 16 12"/>
-  <line x1="12" y1="2" x2="12" y2="16"/>
-</svg>
\ No newline at end of file
+    <path d="M3 17v3a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-3"/>
+    <polyline points="8 12 12 16 16 12"/>
+    <line x1="12" y1="2" x2="12" y2="16"/>
+</svg>
diff --git a/icons/core/edit-2.svg b/icons/core/edit-2.svg
new file mode 100644
index 0000000..6d92674
--- /dev/null
+++ b/icons/core/edit-2.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="16 3 21 8 8 21 3 21 3 16 16 3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/edit-3.svg b/icons/core/edit-3.svg
new file mode 100644
index 0000000..e670223
--- /dev/null
+++ b/icons/core/edit-3.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="14 2 18 6 7 17 3 17 3 13 14 2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="3" y1="22" x2="21" y2="22" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/edit.svg b/icons/core/edit.svg
similarity index 55%
rename from icons/edit.svg
rename to icons/core/edit.svg
index 17adda7..045f38b 100644
--- a/icons/edit.svg
+++ b/icons/core/edit.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M20,14.66V20a2,2,0,0,1-2,2H4a2,2,0,0,1-2-2V6A2,2,0,0,1,4,4H9.34"/>
-  <polygon points="18 2 22 6 12 16 8 16 8 12 18 2"/>
-</svg>
\ No newline at end of file
+    <path d="M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34"/>
+    <polygon points="18 2 22 6 12 16 8 16 8 12 18 2"/>
+</svg>
diff --git a/icons/external-link.svg b/icons/core/external-link.svg
similarity index 51%
rename from icons/external-link.svg
rename to icons/core/external-link.svg
index bb42e42..fdbcd4c 100644
--- a/icons/external-link.svg
+++ b/icons/core/external-link.svg
@@ -1,5 +1,5 @@
 <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">
-  <path d="M18,13v6a2,2,0,0,1-2,2H5a2,2,0,0,1-2-2V8A2,2,0,0,1,5,6h6"/>
-  <polyline points="15 3 21 3 21 9"/>
-  <line x1="10" y1="14" x2="21" y2="3"/>
-</svg>
\ No newline at end of file
+    <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/>
+    <polyline points="15 3 21 3 21 9"/>
+    <line x1="10" y1="14" x2="21" y2="3"/>
+</svg>
diff --git a/icons/core/eye-off.svg b/icons/core/eye-off.svg
new file mode 100644
index 0000000..b020444
--- /dev/null
+++ b/icons/core/eye-off.svg
@@ -0,0 +1,4 @@
+<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">
+    <path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24"/>
+    <line x1="1" y1="1" x2="23" y2="23"/>
+</svg>
diff --git a/icons/eye.svg b/icons/core/eye.svg
similarity index 62%
rename from icons/eye.svg
rename to icons/core/eye.svg
index 8071571..25ef86f 100644
--- a/icons/eye.svg
+++ b/icons/core/eye.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M1,12S5,4,12,4s11,8,11,8-4,8-11,8S1,12,1,12Z"/>
-  <circle cx="12" cy="12" r="3"/>
-</svg>
\ No newline at end of file
+    <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/>
+    <circle cx="12" cy="12" r="3"/>
+</svg>
diff --git a/icons/crosshair.svg b/icons/core/feather.svg
similarity index 56%
rename from icons/crosshair.svg
rename to icons/core/feather.svg
index cf41eb5..92e51f9 100644
--- a/icons/crosshair.svg
+++ b/icons/core/feather.svg
@@ -1,7 +1,5 @@
 <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="12" cy="12" r="10"/>
-  <line x1="22" y1="12" x2="18" y2="12"/>
-  <line x1="6" y1="12" x2="2" y2="12"/>
-  <line x1="12" y1="6" x2="12" y2="2"/>
-  <line x1="12" y1="22" x2="12" y2="18"/>
-</svg>
\ No newline at end of file
+    <path d="M20.24 12.24a6 6 0 0 0-8.49-8.49L5 10.5V19h8.5z"/>
+    <line x1="16" y1="8" x2="2" y2="22"/>
+    <line x1="17" y1="15" x2="9" y2="15"/>
+</svg>
diff --git a/icons/file.svg b/icons/core/file.svg
similarity index 58%
rename from icons/file.svg
rename to icons/core/file.svg
index 59d810a..97ea233 100644
--- a/icons/file.svg
+++ b/icons/core/file.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M13,2H6A2,2,0,0,0,4,4V20a2,2,0,0,0,2,2H18a2,2,0,0,0,2-2V9Z"/>
-  <polyline points="13 2 13 9 20 9"/>
-</svg>
\ No newline at end of file
+    <path d="M13 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9z"/>
+    <polyline points="13 2 13 9 20 9"/>
+</svg>
diff --git a/icons/disc.svg b/icons/core/filter.svg
similarity index 69%
rename from icons/disc.svg
rename to icons/core/filter.svg
index c43642b..94e0f2e 100644
--- a/icons/disc.svg
+++ b/icons/core/filter.svg
@@ -1,4 +1,3 @@
 <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="12" cy="12" r="10"/>
-  <circle cx="12" cy="12" r="3"/>
-</svg>
\ No newline at end of file
+    <polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3"/>
+</svg>
diff --git a/icons/flag.svg b/icons/core/flag.svg
similarity index 58%
rename from icons/flag.svg
rename to icons/core/flag.svg
index 49ee08b..5c98d0a 100644
--- a/icons/flag.svg
+++ b/icons/core/flag.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M4,15s1-1,4-1,5,2,8,2,4-1,4-1V3s-1,1-4,1S11,2,8,2,4,3,4,3Z"/>
-  <line x1="4" y1="22" x2="4" y2="15"/>
-</svg>
\ No newline at end of file
+    <path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/>
+    <line x1="4" y1="22" x2="4" y2="15"/>
+</svg>
diff --git a/icons/folder.svg b/icons/core/folder.svg
similarity index 63%
rename from icons/folder.svg
rename to icons/core/folder.svg
index 2b61b32..7019d98 100644
--- a/icons/folder.svg
+++ b/icons/core/folder.svg
@@ -1,3 +1,3 @@
 <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">
-  <path d="M22,19a2,2,0,0,1-2,2H4a2,2,0,0,1-2-2V5A2,2,0,0,1,4,3H9l2,3h9a2,2,0,0,1,2,2Z"/>
-</svg>
\ No newline at end of file
+    <path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/>
+</svg>
diff --git a/icons/core/grid.svg b/icons/core/grid.svg
new file mode 100644
index 0000000..6fb5b42
--- /dev/null
+++ b/icons/core/grid.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <rect x="3" y="3" width="7" height="7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <rect x="14" y="3" width="7" height="7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <rect x="14" y="14" width="7" height="7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <rect x="3" y="14" width="7" height="7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/hash.svg b/icons/core/hash.svg
new file mode 100644
index 0000000..375058e
--- /dev/null
+++ b/icons/core/hash.svg
@@ -0,0 +1,6 @@
+<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">
+    <line x1="4" y1="9" x2="20" y2="9"/>
+    <line x1="4" y1="15" x2="20" y2="15"/>
+    <line x1="10" y1="3" x2="8" y2="21"/>
+    <line x1="16" y1="3" x2="14" y2="21"/>
+</svg>
diff --git a/icons/core/headphones.svg b/icons/core/headphones.svg
new file mode 100644
index 0000000..1ea46c3
--- /dev/null
+++ b/icons/core/headphones.svg
@@ -0,0 +1,4 @@
+<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">
+    <path d="M3 18v-6a9 9 0 0 1 18 0v6"/>
+    <path d="M21 19a2 2 0 0 1-2 2h-1a2 2 0 0 1-2-2v-3a2 2 0 0 1 2-2h3zM3 19a2 2 0 0 0 2 2h1a2 2 0 0 0 2-2v-3a2 2 0 0 0-2-2H3z"/>
+</svg>
diff --git a/icons/core/heart.svg b/icons/core/heart.svg
new file mode 100644
index 0000000..6d38a9a
--- /dev/null
+++ b/icons/core/heart.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"/>
+</svg>
diff --git a/icons/home.svg b/icons/core/home.svg
similarity index 59%
rename from icons/home.svg
rename to icons/core/home.svg
index 991edf8..6baccc0 100644
--- a/icons/home.svg
+++ b/icons/core/home.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M3,9l9-7,9,7V20a2,2,0,0,1-2,2H5a2,2,0,0,1-2-2Z"/>
-  <polyline points="9 22 9 12 15 12 15 22"/>
-</svg>
\ No newline at end of file
+    <path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
+    <polyline points="9 22 9 12 15 12 15 22"/>
+</svg>
diff --git a/icons/core/inbox.svg b/icons/core/inbox.svg
new file mode 100644
index 0000000..d19a480
--- /dev/null
+++ b/icons/core/inbox.svg
@@ -0,0 +1,4 @@
+<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="22 13 16 13 14 16 10 16 8 13 2 13"/>
+    <path d="M5.47 5.19L2 13v5a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-5l-3.47-7.81A2 2 0 0 0 16.7 4H7.3a2 2 0 0 0-1.83 1.19z"/>
+</svg>
diff --git a/icons/info.svg b/icons/core/info.svg
similarity index 57%
rename from icons/info.svg
rename to icons/core/info.svg
index 55e75ea..a09af66 100644
--- a/icons/info.svg
+++ b/icons/core/info.svg
@@ -1,5 +1,5 @@
 <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="12" cy="12" r="10"/>
-  <line x1="12" y1="16" x2="12" y2="12"/>
-  <line x1="12" y1="8" x2="12" y2="8"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <line x1="12" y1="16" x2="12" y2="12"/>
+    <line x1="12" y1="8" x2="12" y2="8"/>
+</svg>
diff --git a/icons/layers.svg b/icons/core/layers.svg
similarity index 55%
rename from icons/layers.svg
rename to icons/core/layers.svg
index 3ac1c89..631d4e7 100644
--- a/icons/layers.svg
+++ b/icons/core/layers.svg
@@ -1,5 +1,5 @@
 <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="12 2 2 7 12 12 22 7 12 2"/>
-  <polyline points="2 17 12 22 22 17"/>
-  <polyline points="2 12 12 17 22 12"/>
-</svg>
\ No newline at end of file
+    <polygon points="12 2 2 7 12 12 22 7 12 2"/>
+    <polyline points="2 17 12 22 22 17"/>
+    <polyline points="2 12 12 17 22 12"/>
+</svg>
diff --git a/icons/layout.svg b/icons/core/layout.svg
similarity index 53%
rename from icons/layout.svg
rename to icons/core/layout.svg
index 4f20e54..7dd79c1 100644
--- a/icons/layout.svg
+++ b/icons/core/layout.svg
@@ -1,5 +1,5 @@
 <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="3" y="3" width="18" height="18" rx="2" ry="2"/>
-  <line x1="3" y1="9" x2="21" y2="9"/>
-  <line x1="9" y1="21" x2="9" y2="9"/>
-</svg>
\ No newline at end of file
+    <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+    <line x1="3" y1="9" x2="21" y2="9"/>
+    <line x1="9" y1="21" x2="9" y2="9"/>
+</svg>
diff --git a/icons/core/life-buoy.svg b/icons/core/life-buoy.svg
new file mode 100644
index 0000000..ce923db
--- /dev/null
+++ b/icons/core/life-buoy.svg
@@ -0,0 +1,9 @@
+<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="12" cy="12" r="10"/>
+    <circle cx="12" cy="12" r="4"/>
+    <line x1="4.93" y1="4.93" x2="9.17" y2="9.17"/>
+    <line x1="14.83" y1="14.83" x2="19.07" y2="19.07"/>
+    <line x1="14.83" y1="9.17" x2="19.07" y2="4.93"/>
+    <line x1="14.83" y1="9.17" x2="18.36" y2="5.64"/>
+    <line x1="4.93" y1="19.07" x2="9.17" y2="14.83"/>
+</svg>
diff --git a/icons/core/link-2.svg b/icons/core/link-2.svg
new file mode 100644
index 0000000..22a0219
--- /dev/null
+++ b/icons/core/link-2.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M15 7h3a5 5 0 0 1 5 5 5 5 0 0 1-5 5h-3m-6 0H6a5 5 0 0 1-5-5 5 5 0 0 1 5-5h3" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="8" y1="12" x2="16" y2="12" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/link.svg b/icons/core/link.svg
new file mode 100644
index 0000000..823ff13
--- /dev/null
+++ b/icons/core/link.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+</svg>
diff --git a/icons/core/list.svg b/icons/core/list.svg
new file mode 100644
index 0000000..6e60003
--- /dev/null
+++ b/icons/core/list.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <line x1="8" y1="6" x2="21" y2="6" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="8" y1="12" x2="21" y2="12" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="8" y1="18" x2="21" y2="18" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="3" y1="6" x2="3" y2="6" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="3" y1="12" x2="3" y2="12" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="3" y1="18" x2="3" y2="18" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+</svg>
diff --git a/icons/core/loader.svg b/icons/core/loader.svg
new file mode 100644
index 0000000..12a105b
--- /dev/null
+++ b/icons/core/loader.svg
@@ -0,0 +1,10 @@
+<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">
+    <line x1="12" y1="2" x2="12" y2="6"/>
+    <line x1="12" y1="18" x2="12" y2="22"/>
+    <line x1="4.93" y1="4.93" x2="7.76" y2="7.76"/>
+    <line x1="16.24" y1="16.24" x2="19.07" y2="19.07"/>
+    <line x1="2" y1="12" x2="6" y2="12"/>
+    <line x1="18" y1="12" x2="22" y2="12"/>
+    <line x1="4.93" y1="19.07" x2="7.76" y2="16.24"/>
+    <line x1="16.24" y1="7.76" x2="19.07" y2="4.93"/>
+</svg>
diff --git a/icons/lock.svg b/icons/core/lock.svg
similarity index 61%
rename from icons/lock.svg
rename to icons/core/lock.svg
index 7a05bdd..1fbe746 100644
--- a/icons/lock.svg
+++ b/icons/core/lock.svg
@@ -1,4 +1,4 @@
 <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="3" y="11" width="18" height="11" rx="2" ry="2"/>
-  <path d="M7,11V7A5,5,0,0,1,17,7v4"/>
-</svg>
\ No newline at end of file
+    <rect x="3" y="11" width="18" height="11" rx="2" ry="2"/>
+    <path d="M7 11V7a5 5 0 0 1 10 0v4"/>
+</svg>
diff --git a/icons/core/log-in.svg b/icons/core/log-in.svg
new file mode 100644
index 0000000..29c14b2
--- /dev/null
+++ b/icons/core/log-in.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M14 22h5a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2h-5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="11 16 15 12 11 8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="15" y1="12" x2="3" y2="12" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/log-out.svg b/icons/core/log-out.svg
new file mode 100644
index 0000000..2752568
--- /dev/null
+++ b/icons/core/log-out.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M10 22H5a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="17 16 21 12 17 8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="21" y1="12" x2="9" y2="12" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/maximize-2.svg b/icons/core/maximize-2.svg
similarity index 50%
rename from icons/maximize-2.svg
rename to icons/core/maximize-2.svg
index fb738f0..a6d95a0 100644
--- a/icons/maximize-2.svg
+++ b/icons/core/maximize-2.svg
@@ -1,6 +1,6 @@
 <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="15 3 21 3 21 9"/>
-  <polyline points="9 21 3 21 3 15"/>
-  <line x1="21" y1="3" x2="14" y2="10"/>
-  <line x1="3" y1="21" x2="10" y2="14"/>
-</svg>
\ No newline at end of file
+    <polyline points="15 3 21 3 21 9"/>
+    <polyline points="9 21 3 21 3 15"/>
+    <line x1="21" y1="3" x2="14" y2="10"/>
+    <line x1="3" y1="21" x2="10" y2="14"/>
+</svg>
diff --git a/icons/core/maximize.svg b/icons/core/maximize.svg
new file mode 100644
index 0000000..3570f43
--- /dev/null
+++ b/icons/core/maximize.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M8 3H5a2 2 0 0 0-2 2v3m18 0V5a2 2 0 0 0-2-2h-3m0 18h3a2 2 0 0 0 2-2v-3M3 16v3a2 2 0 0 0 2 2h3"/>
+</svg>
diff --git a/icons/menu.svg b/icons/core/menu.svg
similarity index 56%
rename from icons/menu.svg
rename to icons/core/menu.svg
index 1f35e3e..3a73c86 100644
--- a/icons/menu.svg
+++ b/icons/core/menu.svg
@@ -1,5 +1,5 @@
 <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">
-  <line x1="3" y1="12" x2="21" y2="12"/>
-  <line x1="3" y1="6" x2="21" y2="6"/>
-  <line x1="3" y1="18" x2="21" y2="18"/>
-</svg>
\ No newline at end of file
+    <line x1="3" y1="12" x2="21" y2="12"/>
+    <line x1="3" y1="6" x2="21" y2="6"/>
+    <line x1="3" y1="18" x2="21" y2="18"/>
+</svg>
diff --git a/icons/core/mic-off.svg b/icons/core/mic-off.svg
new file mode 100644
index 0000000..0302ca1
--- /dev/null
+++ b/icons/core/mic-off.svg
@@ -0,0 +1,7 @@
+<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">
+    <line x1="1" y1="1" x2="23" y2="23"/>
+    <path d="M9 9v3a3 3 0 0 0 5.12 2.12M15 9.34V4a3 3 0 0 0-5.94-.6"/>
+    <path d="M17 16.95A7 7 0 0 1 5 12v-2m14 0v2a7 7 0 0 1-.11 1.23"/>
+    <line x1="12" y1="19" x2="12" y2="23"/>
+    <line x1="8" y1="23" x2="16" y2="23"/>
+</svg>
diff --git a/icons/core/mic.svg b/icons/core/mic.svg
new file mode 100644
index 0000000..513b949
--- /dev/null
+++ b/icons/core/mic.svg
@@ -0,0 +1,6 @@
+<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">
+    <path d="M12 1a3 3 0 0 0-3 3v8a3 3 0 0 0 6 0V4a3 3 0 0 0-3-3z"/>
+    <path d="M19 10v2a7 7 0 0 1-14 0v-2"/>
+    <line x1="12" y1="19" x2="12" y2="23"/>
+    <line x1="8" y1="23" x2="16" y2="23"/>
+</svg>
diff --git a/icons/core/minimize-2.svg b/icons/core/minimize-2.svg
new file mode 100644
index 0000000..f4e9814
--- /dev/null
+++ b/icons/core/minimize-2.svg
@@ -0,0 +1,6 @@
+<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="4 14 10 14 10 20"/>
+    <polyline points="20 10 14 10 14 4"/>
+    <line x1="14" y1="10" x2="21" y2="3"/>
+    <line x1="3" y1="21" x2="10" y2="14"/>
+</svg>
diff --git a/icons/core/minimize.svg b/icons/core/minimize.svg
new file mode 100644
index 0000000..d087bd0
--- /dev/null
+++ b/icons/core/minimize.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M8 3v3a2 2 0 0 1-2 2H3m18 0h-3a2 2 0 0 1-2-2V3m0 18v-3a2 2 0 0 1 2-2h3M3 16h3a2 2 0 0 1 2 2v3"/>
+</svg>
diff --git a/icons/minus-circle.svg b/icons/core/minus-circle.svg
similarity index 66%
rename from icons/minus-circle.svg
rename to icons/core/minus-circle.svg
index 4ce8303..bd01962 100644
--- a/icons/minus-circle.svg
+++ b/icons/core/minus-circle.svg
@@ -1,4 +1,4 @@
 <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="12" cy="12" r="10"/>
-  <line x1="8" y1="12" x2="16" y2="12"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <line x1="8" y1="12" x2="16" y2="12"/>
+</svg>
diff --git a/icons/minus-square.svg b/icons/core/minus-square.svg
similarity index 61%
rename from icons/minus-square.svg
rename to icons/core/minus-square.svg
index d30ad44..0ea5245 100644
--- a/icons/minus-square.svg
+++ b/icons/core/minus-square.svg
@@ -1,4 +1,4 @@
 <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="3" y="3" width="18" height="18" rx="2" ry="2"/>
-  <line x1="8" y1="12" x2="16" y2="12"/>
-</svg>
\ No newline at end of file
+    <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+    <line x1="8" y1="12" x2="16" y2="12"/>
+</svg>
diff --git a/icons/minus.svg b/icons/core/minus.svg
similarity index 77%
rename from icons/minus.svg
rename to icons/core/minus.svg
index 3ecbda9..4e0512a 100644
--- a/icons/minus.svg
+++ b/icons/core/minus.svg
@@ -1,3 +1,3 @@
 <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">
-  <line x1="5" y1="12" x2="19" y2="12"/>
-</svg>
\ No newline at end of file
+    <line x1="5" y1="12" x2="19" y2="12"/>
+</svg>
diff --git a/icons/monitor.svg b/icons/core/monitor.svg
similarity index 52%
rename from icons/monitor.svg
rename to icons/core/monitor.svg
index e2335c3..72f3eed 100644
--- a/icons/monitor.svg
+++ b/icons/core/monitor.svg
@@ -1,5 +1,5 @@
 <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="2" y="3" width="20" height="14" rx="2" ry="2"/>
-  <line x1="8" y1="21" x2="16" y2="21"/>
-  <line x1="12" y1="17" x2="12" y2="21"/>
-</svg>
\ No newline at end of file
+    <rect x="2" y="3" width="20" height="14" rx="2" ry="2"/>
+    <line x1="8" y1="21" x2="16" y2="21"/>
+    <line x1="12" y1="17" x2="12" y2="21"/>
+</svg>
diff --git a/icons/more-horizontal.svg b/icons/core/more-horizontal.svg
similarity index 60%
rename from icons/more-horizontal.svg
rename to icons/core/more-horizontal.svg
index 7ed884e..47b83ba 100644
--- a/icons/more-horizontal.svg
+++ b/icons/core/more-horizontal.svg
@@ -1,5 +1,5 @@
 <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="12" cy="12" r="2"/>
-  <circle cx="20" cy="12" r="2"/>
-  <circle cx="4" cy="12" r="2"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="2"/>
+    <circle cx="20" cy="12" r="2"/>
+    <circle cx="4" cy="12" r="2"/>
+</svg>
diff --git a/icons/more-vertical.svg b/icons/core/more-vertical.svg
similarity index 60%
rename from icons/more-vertical.svg
rename to icons/core/more-vertical.svg
index 40ff285..adce645 100644
--- a/icons/more-vertical.svg
+++ b/icons/core/more-vertical.svg
@@ -1,5 +1,5 @@
 <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="12" cy="12" r="2"/>
-  <circle cx="12" cy="4" r="2"/>
-  <circle cx="12" cy="20" r="2"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="2"/>
+    <circle cx="12" cy="4" r="2"/>
+    <circle cx="12" cy="20" r="2"/>
+</svg>
diff --git a/icons/core/move.svg b/icons/core/move.svg
new file mode 100644
index 0000000..71898d7
--- /dev/null
+++ b/icons/core/move.svg
@@ -0,0 +1,8 @@
+<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="5 9 2 12 5 15"/>
+    <polyline points="9 5 12 2 15 5"/>
+    <polyline points="15 19 12 22 9 19"/>
+    <polyline points="19 9 22 12 19 15"/>
+    <line x1="2" y1="12" x2="22" y2="12"/>
+    <line x1="12" y1="2" x2="12" y2="22"/>
+</svg>
diff --git a/icons/core/music.svg b/icons/core/music.svg
new file mode 100644
index 0000000..6bf9c75
--- /dev/null
+++ b/icons/core/music.svg
@@ -0,0 +1,4 @@
+<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">
+    <path d="M9 17H5a2 2 0 0 0-2 2 2 2 0 0 0 2 2h2a2 2 0 0 0 2-2zm12-2h-4a2 2 0 0 0-2 2 2 2 0 0 0 2 2h2a2 2 0 0 0 2-2z"/>
+    <polyline points="9 17 9 5 21 3 21 15"/>
+</svg>
diff --git a/icons/octagon.svg b/icons/core/octagon.svg
similarity index 63%
rename from icons/octagon.svg
rename to icons/core/octagon.svg
index 9837501..425123d 100644
--- a/icons/octagon.svg
+++ b/icons/core/octagon.svg
@@ -1,3 +1,3 @@
 <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="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"/>
-</svg>
\ No newline at end of file
+    <polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"/>
+</svg>
diff --git a/icons/core/package.svg b/icons/core/package.svg
new file mode 100644
index 0000000..3b9f7aa
--- /dev/null
+++ b/icons/core/package.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M12.89 1.45l8 4A2 2 0 0 1 22 7.24v9.53a2 2 0 0 1-1.11 1.79l-8 4a2 2 0 0 1-1.79 0l-8-4a2 2 0 0 1-1.1-1.8V7.24a2 2 0 0 1 1.11-1.79l8-4a2 2 0 0 1 1.78 0z" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="2.32 6.16 12 11 21.68 6.16" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="22.76" x2="12" y2="11" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="7" y1="3.5" x2="17" y2="8.5" fill="none" stroke="#0f0f0f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/pie-chart.svg b/icons/core/pie-chart.svg
similarity index 66%
rename from icons/pie-chart.svg
rename to icons/core/pie-chart.svg
index 98af269..b539f7c 100644
--- a/icons/pie-chart.svg
+++ b/icons/core/pie-chart.svg
@@ -1,4 +1,4 @@
 <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="12" cy="12" r="10"/>
-  <polyline points="12 2 12 12 22 12"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <polyline points="12 2 12 12 22 12"/>
+</svg>
diff --git a/icons/plus-circle.svg b/icons/core/plus-circle.svg
similarity index 57%
rename from icons/plus-circle.svg
rename to icons/core/plus-circle.svg
index b242ea8..4aade84 100644
--- a/icons/plus-circle.svg
+++ b/icons/core/plus-circle.svg
@@ -1,5 +1,5 @@
 <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="12" cy="12" r="10"/>
-  <line x1="12" y1="8" x2="12" y2="16"/>
-  <line x1="8" y1="12" x2="16" y2="12"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <line x1="12" y1="8" x2="12" y2="16"/>
+    <line x1="8" y1="12" x2="16" y2="12"/>
+</svg>
diff --git a/icons/plus-square.svg b/icons/core/plus-square.svg
similarity index 53%
rename from icons/plus-square.svg
rename to icons/core/plus-square.svg
index 176cd40..8b94e78 100644
--- a/icons/plus-square.svg
+++ b/icons/core/plus-square.svg
@@ -1,5 +1,5 @@
 <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="3" y="3" width="18" height="18" rx="2" ry="2"/>
-  <line x1="12" y1="8" x2="12" y2="16"/>
-  <line x1="8" y1="12" x2="16" y2="12"/>
-</svg>
\ No newline at end of file
+    <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+    <line x1="12" y1="8" x2="12" y2="16"/>
+    <line x1="8" y1="12" x2="16" y2="12"/>
+</svg>
diff --git a/icons/plus.svg b/icons/core/plus.svg
similarity index 65%
rename from icons/plus.svg
rename to icons/core/plus.svg
index a74308e..a67c612 100644
--- a/icons/plus.svg
+++ b/icons/core/plus.svg
@@ -1,4 +1,4 @@
 <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">
-  <line x1="12" y1="5" x2="12" y2="19"/>
-  <line x1="5" y1="12" x2="19" y2="12"/>
-</svg>
\ No newline at end of file
+    <line x1="12" y1="5" x2="12" y2="19"/>
+    <line x1="5" y1="12" x2="19" y2="12"/>
+</svg>
diff --git a/icons/power.svg b/icons/core/power.svg
similarity index 64%
rename from icons/power.svg
rename to icons/core/power.svg
index 012facc..51738ff 100644
--- a/icons/power.svg
+++ b/icons/core/power.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M18.36,6.64a9,9,0,1,1-12.73,0"/>
-  <line x1="12" y1="2" x2="12" y2="12"/>
-</svg>
\ No newline at end of file
+    <path d="M18.36 6.64a9 9 0 1 1-12.73 0"/>
+    <line x1="12" y1="2" x2="12" y2="12"/>
+</svg>
diff --git a/icons/core/printer.svg b/icons/core/printer.svg
new file mode 100644
index 0000000..f6321b9
--- /dev/null
+++ b/icons/core/printer.svg
@@ -0,0 +1,5 @@
+<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="6 9 6 2 18 2 18 9"/>
+    <path d="M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2"/>
+    <rect x="6" y="14" width="12" height="8"/>
+</svg>
diff --git a/icons/core/radio.svg b/icons/core/radio.svg
new file mode 100644
index 0000000..ff53494
--- /dev/null
+++ b/icons/core/radio.svg
@@ -0,0 +1,4 @@
+<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="12" cy="12" r="2"/>
+    <path d="M16.24 7.76a6 6 0 0 1 0 8.49m-8.48-.01a6 6 0 0 1 0-8.49m11.31-2.82a10 10 0 0 1 0 14.14m-14.14 0a10 10 0 0 1 0-14.14"/>
+</svg>
diff --git a/icons/core/refresh-ccw.svg b/icons/core/refresh-ccw.svg
new file mode 100644
index 0000000..f9861a6
--- /dev/null
+++ b/icons/core/refresh-ccw.svg
@@ -0,0 +1,5 @@
+<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="1 4 1 10 7 10"/>
+    <polyline points="23 20 23 14 17 14"/>
+    <path d="M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
+</svg>
diff --git a/icons/core/refresh-cw.svg b/icons/core/refresh-cw.svg
new file mode 100644
index 0000000..7cc7827
--- /dev/null
+++ b/icons/core/refresh-cw.svg
@@ -0,0 +1,5 @@
+<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="23 4 23 10 17 10"/>
+    <polyline points="1 20 1 14 7 14"/>
+    <path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"/>
+</svg>
diff --git a/icons/rotate-ccw.svg b/icons/core/rotate-ccw.svg
similarity index 64%
rename from icons/rotate-ccw.svg
rename to icons/core/rotate-ccw.svg
index 3f6e74d..5e54634 100644
--- a/icons/rotate-ccw.svg
+++ b/icons/core/rotate-ccw.svg
@@ -1,4 +1,4 @@
 <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="1 4 1 10 7 10"/>
-  <path d="M3.51,15A9,9,0,1,0,5.64,5.64L1,10"/>
-</svg>
\ No newline at end of file
+    <polyline points="1 4 1 10 7 10"/>
+    <path d="M3.51 15a9 9 0 1 0 2.13-9.36L1 10"/>
+</svg>
diff --git a/icons/core/rotate-cw.svg b/icons/core/rotate-cw.svg
new file mode 100644
index 0000000..bdfac28
--- /dev/null
+++ b/icons/core/rotate-cw.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="23 4 23 10 17 10" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/scissors.svg b/icons/core/scissors.svg
new file mode 100644
index 0000000..676e78f
--- /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 64%
rename from icons/search.svg
rename to icons/core/search.svg
index f4ea4f5..f267e1d 100644
--- a/icons/search.svg
+++ b/icons/core/search.svg
@@ -1,4 +1,4 @@
 <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="10.5" cy="10.5" r="7.5"/>
-  <line x1="21" y1="21" x2="15.8" y2="15.8"/>
-</svg>
\ No newline at end of file
+    <circle cx="10.5" cy="10.5" r="7.5"/>
+    <line x1="21" y1="21" x2="15.8" y2="15.8"/>
+</svg>
diff --git a/icons/core/settings.svg b/icons/core/settings.svg
new file mode 100644
index 0000000..a716372
--- /dev/null
+++ b/icons/core/settings.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <circle cx="12" cy="12" r="3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
+</svg>
diff --git a/icons/core/share-2.svg b/icons/core/share-2.svg
new file mode 100644
index 0000000..531add1
--- /dev/null
+++ b/icons/core/share-2.svg
@@ -0,0 +1,7 @@
+<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="18" cy="5" r="3"/>
+    <circle cx="6" cy="12" r="3"/>
+    <circle cx="18" cy="19" r="3"/>
+    <line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/>
+    <line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/>
+</svg>
diff --git a/icons/core/share.svg b/icons/core/share.svg
new file mode 100644
index 0000000..e68f394
--- /dev/null
+++ b/icons/core/share.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M4 12v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="16 6 12 2 8 6" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="2" x2="12" y2="15" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/slash.svg b/icons/core/slash.svg
similarity index 63%
rename from icons/slash.svg
rename to icons/core/slash.svg
index ef69baa..adb58d5 100644
--- a/icons/slash.svg
+++ b/icons/core/slash.svg
@@ -1,4 +1,4 @@
 <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="12" cy="12" r="10"/>
-  <line x1="4.93" y1="4.93" x2="19.07" y2="19.07"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <line x1="4.93" y1="4.93" x2="19.07" y2="19.07"/>
+</svg>
diff --git a/icons/core/speaker.svg b/icons/core/speaker.svg
new file mode 100644
index 0000000..e909ee0
--- /dev/null
+++ b/icons/core/speaker.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <rect x="4" y="2" width="16" height="20" rx="2" ry="2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <circle cx="12" cy="14" r="4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="6" x2="12" y2="6" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/square.svg b/icons/core/square.svg
similarity index 71%
rename from icons/square.svg
rename to icons/core/square.svg
index d80070e..f95f46e 100644
--- a/icons/square.svg
+++ b/icons/core/square.svg
@@ -1,3 +1,3 @@
 <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="3" y="3" width="18" height="18" rx="2" ry="2"/>
-</svg>
\ No newline at end of file
+    <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+</svg>
diff --git a/icons/star.svg b/icons/core/star.svg
similarity index 58%
rename from icons/star.svg
rename to icons/core/star.svg
index 7de8d90..9f2f540 100644
--- a/icons/star.svg
+++ b/icons/core/star.svg
@@ -1,3 +1,3 @@
 <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="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/>
-</svg>
\ No newline at end of file
+    <polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/>
+</svg>
diff --git a/icons/tag.svg b/icons/core/tag.svg
similarity index 55%
rename from icons/tag.svg
rename to icons/core/tag.svg
index 9a3c463..0925309 100644
--- a/icons/tag.svg
+++ b/icons/core/tag.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M20.59,13.41l-7.17,7.17a2,2,0,0,1-2.83,0L2,12V2H12l8.59,8.59A2,2,0,0,1,20.59,13.41Z"/>
-  <line x1="7" y1="7" x2="7" y2="7"/>
-</svg>
\ No newline at end of file
+    <path d="M20.59 13.41l-7.17 7.17a2 2 0 0 1-2.83 0L2 12V2h10l8.59 8.59a2 2 0 0 1 0 2.82z"/>
+    <line x1="7" y1="7" x2="7" y2="7"/>
+</svg>
diff --git a/icons/target.svg b/icons/core/target.svg
similarity index 60%
rename from icons/target.svg
rename to icons/core/target.svg
index ac2e647..062a70b 100644
--- a/icons/target.svg
+++ b/icons/core/target.svg
@@ -1,5 +1,5 @@
 <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="12" cy="12" r="10"/>
-  <circle cx="12" cy="12" r="6"/>
-  <circle cx="12" cy="12" r="2"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <circle cx="12" cy="12" r="6"/>
+    <circle cx="12" cy="12" r="2"/>
+</svg>
diff --git a/icons/core/thumbs-down.svg b/icons/core/thumbs-down.svg
new file mode 100644
index 0000000..e43ecae
--- /dev/null
+++ b/icons/core/thumbs-down.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M10 15v4a3 3 0 0 0 3 3l4-9V2H5.72a2 2 0 0 0-2 1.7l-1.38 9a2 2 0 0 0 2 2.3zm7-13h2.67A2.31 2.31 0 0 1 22 4v7a2.31 2.31 0 0 1-2.33 2H17"/>
+</svg>
diff --git a/icons/core/thumbs-up.svg b/icons/core/thumbs-up.svg
new file mode 100644
index 0000000..0072d02
--- /dev/null
+++ b/icons/core/thumbs-up.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M14 9V5a3 3 0 0 0-3-3l-4 9v11h11.28a2 2 0 0 0 2-1.7l1.38-9a2 2 0 0 0-2-2.3zM7 22H4a2 2 0 0 1-2-2v-7a2 2 0 0 1 2-2h3"/>
+</svg>
diff --git a/icons/trash.svg b/icons/core/toggle-left.svg
similarity index 70%
rename from icons/trash.svg
rename to icons/core/toggle-left.svg
index 814576e..1239965 100644
--- a/icons/trash.svg
+++ b/icons/core/toggle-left.svg
@@ -1,5 +1,4 @@
 <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="3 6 5 6 21 6"/>
-  <path d="M19,6V20a2,2,0,0,1-2,2H7a2,2,0,0,1-2-2V6"/>
-  <path d="M8,6V4a2,2,0,0,1,2-2h4a2,2,0,0,1,2,2V6"/>
-</svg>
\ No newline at end of file
+    <rect x="1" y="5" width="22" height="14" rx="7" ry="7"/>
+    <circle cx="8" cy="12" r="3"/>
+</svg>
diff --git a/icons/toggle-right.svg b/icons/core/toggle-right.svg
similarity index 62%
rename from icons/toggle-right.svg
rename to icons/core/toggle-right.svg
index a93d391..bc54be1 100644
--- a/icons/toggle-right.svg
+++ b/icons/core/toggle-right.svg
@@ -1,4 +1,4 @@
 <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="1" y="5" width="22" height="14" rx="7" ry="7"/>
-  <circle cx="16" cy="12" r="3"/>
-</svg>
\ No newline at end of file
+    <rect x="1" y="5" width="22" height="14" rx="7" ry="7"/>
+    <circle cx="16" cy="12" r="3"/>
+</svg>
diff --git a/icons/core/trash-2.svg b/icons/core/trash-2.svg
new file mode 100644
index 0000000..2b849a6
--- /dev/null
+++ b/icons/core/trash-2.svg
@@ -0,0 +1,6 @@
+<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="3 6 5 6 21 6"/>
+    <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/>
+    <line x1="10" y1="11" x2="10" y2="17"/>
+    <line x1="14" y1="11" x2="14" y2="17"/>
+</svg>
diff --git a/icons/core/trash.svg b/icons/core/trash.svg
new file mode 100644
index 0000000..730a614
--- /dev/null
+++ b/icons/core/trash.svg
@@ -0,0 +1,4 @@
+<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="3 6 5 6 21 6"/>
+    <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/>
+</svg>
diff --git a/icons/core/trending-down.svg b/icons/core/trending-down.svg
new file mode 100644
index 0000000..ff4f5d6
--- /dev/null
+++ b/icons/core/trending-down.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="23 18 13.5 8.5 8.5 13.5 1 6" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="17 18 23 18 23 12" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/trending-up.svg b/icons/core/trending-up.svg
new file mode 100644
index 0000000..aeba24e
--- /dev/null
+++ b/icons/core/trending-up.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="23 6 13.5 15.5 8.5 10.5 1 18" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="17 6 23 6 23 12" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/triangle.svg b/icons/core/triangle.svg
new file mode 100644
index 0000000..093a7ab
--- /dev/null
+++ b/icons/core/triangle.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"/>
+</svg>
diff --git a/icons/core/type.svg b/icons/core/type.svg
new file mode 100644
index 0000000..503da70
--- /dev/null
+++ b/icons/core/type.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="4 7 4 4 20 4 20 7" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="9" y1="20" x2="15" y2="20" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="4" x2="12" y2="20" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/unlock.svg b/icons/core/unlock.svg
similarity index 61%
rename from icons/unlock.svg
rename to icons/core/unlock.svg
index 815e17e..53e23a4 100644
--- a/icons/unlock.svg
+++ b/icons/core/unlock.svg
@@ -1,4 +1,4 @@
 <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="3" y="11" width="18" height="11" rx="2" ry="2"/>
-  <path d="M7,11V7a5,5,0,0,1,9.9-1"/>
-</svg>
\ No newline at end of file
+    <rect x="3" y="11" width="18" height="11" rx="2" ry="2"/>
+    <path d="M7 11V7a5 5 0 0 1 9.9-1"/>
+</svg>
diff --git a/icons/core/upload-cloud.svg b/icons/core/upload-cloud.svg
new file mode 100644
index 0000000..301ff44
--- /dev/null
+++ b/icons/core/upload-cloud.svg
@@ -0,0 +1,6 @@
+<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 16 12 12 8 16"/>
+    <line x1="12" y1="12" x2="12" y2="21"/>
+    <path d="M20.39 18.39A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.3"/>
+    <polyline points="16 16 12 12 8 16"/>
+</svg>
diff --git a/icons/upload.svg b/icons/core/upload.svg
similarity index 54%
rename from icons/upload.svg
rename to icons/core/upload.svg
index 60c03da..5061f55 100644
--- a/icons/upload.svg
+++ b/icons/core/upload.svg
@@ -1,5 +1,5 @@
 <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">
-  <path d="M3,17v3a2,2,0,0,0,2,2H19a2,2,0,0,0,2-2V17"/>
-  <polyline points="16 6 12 2 8 6"/>
-  <line x1="12" y1="2" x2="12" y2="16"/>
-</svg>
\ No newline at end of file
+    <path d="M3 17v3a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-3"/>
+    <polyline points="16 6 12 2 8 6"/>
+    <line x1="12" y1="2" x2="12" y2="16"/>
+</svg>
diff --git a/icons/core/user-check.svg b/icons/core/user-check.svg
new file mode 100644
index 0000000..5549e4f
--- /dev/null
+++ b/icons/core/user-check.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <circle cx="8.5" cy="7" r="4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="17 11 19 13 23 9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/user-minus.svg b/icons/core/user-minus.svg
new file mode 100644
index 0000000..82b7332
--- /dev/null
+++ b/icons/core/user-minus.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <circle cx="8.5" cy="7" r="4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="23" y1="11" x2="17" y2="11" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/user-plus.svg b/icons/core/user-plus.svg
new file mode 100644
index 0000000..b85a9c3
--- /dev/null
+++ b/icons/core/user-plus.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <circle cx="8.5" cy="7" r="4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="20" y1="8" x2="20" y2="14" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="23" y1="11" x2="17" y2="11" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/user-x.svg b/icons/core/user-x.svg
new file mode 100644
index 0000000..f73b339
--- /dev/null
+++ b/icons/core/user-x.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <circle cx="8.5" cy="7" r="4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="18" y1="8" x2="23" y2="13" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="23" y1="8" x2="18" y2="13" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/user.svg b/icons/core/user.svg
new file mode 100644
index 0000000..78eb48f
--- /dev/null
+++ b/icons/core/user.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <circle cx="12" cy="7" r="4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/core/watch.svg b/icons/core/watch.svg
new file mode 100644
index 0000000..c0f3b3f
--- /dev/null
+++ b/icons/core/watch.svg
@@ -0,0 +1,5 @@
+<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="12" cy="12" r="7"/>
+    <polyline points="12 9 12 12 13.5 13.5"/>
+    <path d="M16.51 17.35l-.35 3.83a2 2 0 0 1-2 1.82H9.83a2 2 0 0 1-2-1.82l-.35-3.83m.01-10.7l.35-3.83A2 2 0 0 1 9.83 1h4.35a2 2 0 0 1 2 1.82l.35 3.83"/>
+</svg>
diff --git a/icons/core/wifi.svg b/icons/core/wifi.svg
new file mode 100644
index 0000000..032dd9b
--- /dev/null
+++ b/icons/core/wifi.svg
@@ -0,0 +1,4 @@
+<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">
+    <path d="M5 11.55a11 11 0 0 1 14.08 0M1.41 8a16 16 0 0 1 21.17 0M8.52 15.11a6 6 0 0 1 6.95 0"/>
+    <line x1="12" y1="19" x2="12" y2="19"/>
+</svg>
diff --git a/icons/x-circle.svg b/icons/core/x-circle.svg
similarity index 57%
rename from icons/x-circle.svg
rename to icons/core/x-circle.svg
index 0978b4c..7e72171 100644
--- a/icons/x-circle.svg
+++ b/icons/core/x-circle.svg
@@ -1,5 +1,5 @@
 <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="12" cy="12" r="10"/>
-  <line x1="15" y1="9" x2="9" y2="15"/>
-  <line x1="9" y1="9" x2="15" y2="15"/>
-</svg>
\ No newline at end of file
+    <circle cx="12" cy="12" r="10"/>
+    <line x1="15" y1="9" x2="9" y2="15"/>
+    <line x1="9" y1="9" x2="15" y2="15"/>
+</svg>
diff --git a/icons/x-square.svg b/icons/core/x-square.svg
similarity index 53%
rename from icons/x-square.svg
rename to icons/core/x-square.svg
index be20496..7681f5c 100644
--- a/icons/x-square.svg
+++ b/icons/core/x-square.svg
@@ -1,5 +1,5 @@
 <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="3" y="3" width="18" height="18" rx="2" ry="2"/>
-  <line x1="9" y1="9" x2="15" y2="15"/>
-  <line x1="15" y1="9" x2="9" y2="15"/>
-</svg>
\ No newline at end of file
+    <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+    <line x1="9" y1="9" x2="15" y2="15"/>
+    <line x1="15" y1="9" x2="9" y2="15"/>
+</svg>
diff --git a/icons/x.svg b/icons/core/x.svg
similarity index 65%
rename from icons/x.svg
rename to icons/core/x.svg
index d32aa96..d27b1bb 100644
--- a/icons/x.svg
+++ b/icons/core/x.svg
@@ -1,4 +1,4 @@
 <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">
-  <line x1="18" y1="6" x2="6" y2="18"/>
-  <line x1="6" y1="6" x2="18" y2="18"/>
-</svg>
\ No newline at end of file
+    <line x1="18" y1="6" x2="6" y2="18"/>
+    <line x1="6" y1="6" x2="18" y2="18"/>
+</svg>
diff --git a/icons/zap.svg b/icons/core/zap.svg
similarity index 71%
rename from icons/zap.svg
rename to icons/core/zap.svg
index ebca677..6e03664 100644
--- a/icons/zap.svg
+++ b/icons/core/zap.svg
@@ -1,3 +1,3 @@
 <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="13 2 3 14 12 14 11 22 21 10 12 10 13 2"/>
-</svg>
\ No newline at end of file
+    <polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2"/>
+</svg>
diff --git a/icons/core/zoom-in.svg b/icons/core/zoom-in.svg
new file mode 100644
index 0000000..8c6a765
--- /dev/null
+++ b/icons/core/zoom-in.svg
@@ -0,0 +1,6 @@
+<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="11" cy="11" r="8"/>
+    <line x1="21" y1="21" x2="16.65" y2="16.65"/>
+    <line x1="11" y1="8" x2="11" y2="14"/>
+    <line x1="8" y1="11" x2="14" y2="11"/>
+</svg>
diff --git a/icons/zoom-out.svg b/icons/core/zoom-out.svg
similarity index 56%
rename from icons/zoom-out.svg
rename to icons/core/zoom-out.svg
index d3262e8..3386ee6 100644
--- a/icons/zoom-out.svg
+++ b/icons/core/zoom-out.svg
@@ -1,5 +1,5 @@
 <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="11" cy="11" r="8"/>
-  <line x1="21" y1="21" x2="16.65" y2="16.65"/>
-  <line x1="8" y1="11" x2="14" y2="11"/>
-</svg>
\ No newline at end of file
+    <circle cx="11" cy="11" r="8"/>
+    <line x1="21" y1="21" x2="16.65" y2="16.65"/>
+    <line x1="8" y1="11" x2="14" y2="11"/>
+</svg>
diff --git a/icons/cpu.svg b/icons/cpu.svg
deleted file mode 100644
index 1d9173a..0000000
--- a/icons/cpu.svg
+++ /dev/null
@@ -1,12 +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="4" y="4" width="16" height="16" rx="2" ry="2"/>
-  <rect x="9" y="9" width="6" height="6"/>
-  <line x1="9" y1="1" x2="9" y2="4"/>
-  <line x1="15" y1="1" x2="15" y2="4"/>
-  <line x1="9" y1="20" x2="9" y2="23"/>
-  <line x1="15" y1="20" x2="15" y2="23"/>
-  <line x1="20" y1="9" x2="23" y2="9"/>
-  <line x1="20" y1="14" x2="23" y2="14"/>
-  <line x1="1" y1="9" x2="4" y2="9"/>
-  <line x1="1" y1="14" x2="4" y2="14"/>
-</svg>
\ No newline at end of file
diff --git a/icons/droplet.svg b/icons/droplet.svg
deleted file mode 100644
index ba636a8..0000000
--- a/icons/droplet.svg
+++ /dev/null
@@ -1,3 +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">
-  <path d="M20,14A8,8,0,0,1,4,14C4,8,12,2,12,2S20,8,20,14Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/eye-off.svg b/icons/eye-off.svg
deleted file mode 100644
index 63f8f70..0000000
--- a/icons/eye-off.svg
+++ /dev/null
@@ -1,6 +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">
-  <path d="M17.94,17.94A10.07,10.07,0,0,1,12,20C5,20,1,12,1,12A18.45,18.45,0,0,1,6.06,6.06"/>
-  <path d="M9.9,4.24A9.12,9.12,0,0,1,12,4c7,0,11,8,11,8a18.5,18.5,0,0,1-2.16,3.19"/>
-  <path d="M14.12,14.12A3,3,0,1,1,9.88,9.88"/>
-  <line x1="1" y1="1" x2="23" y2="23"/>
-</svg>
\ No newline at end of file
diff --git a/icons/globe.svg b/icons/globe.svg
deleted file mode 100644
index 5a01c2b..0000000
--- a/icons/globe.svg
+++ /dev/null
@@ -1,5 +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="12" cy="12" r="10"/>
-  <line x1="2" y1="12" x2="22" y2="12"/>
-  <path d="M12,2a15.3,15.3,0,0,1,4,10,15.3,15.3,0,0,1-4,10A15.3,15.3,0,0,1,8,12,15.3,15.3,0,0,1,12,2Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/grid.svg b/icons/grid.svg
deleted file mode 100644
index 4cbc048..0000000
--- a/icons/grid.svg
+++ /dev/null
@@ -1,6 +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="3" y="3" width="7" height="7" rx="1" ry="1"/>
-  <rect x="14" y="3" width="7" height="7" rx="1" ry="1"/>
-  <rect x="14" y="14" width="7" height="7" rx="1" ry="1"/>
-  <rect x="3" y="14" width="7" height="7" rx="1" ry="1"/>
-</svg>
\ No newline at end of file
diff --git a/icons/headphones.svg b/icons/headphones.svg
deleted file mode 100644
index 99cf296..0000000
--- a/icons/headphones.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M3,18V12a9,9,0,0,1,18,0v6"/>
-  <path d="M21,19a2,2,0,0,1-2,2H18a2,2,0,0,1-2-2V16a2,2,0,0,1,2-2h3Z"/>
-  <path d="M3,19a2,2,0,0,0,2,2H6a2,2,0,0,0,2-2V16a2,2,0,0,0-2-2H3Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/heart.svg b/icons/heart.svg
deleted file mode 100644
index 029452a..0000000
--- a/icons/heart.svg
+++ /dev/null
@@ -1,3 +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">
-  <path d="M20.84,4.61a5.5,5.5,0,0,0-7.78,0L12,5.67,10.94,4.61a5.5,5.5,0,0,0-7.78,7.78l1.06,1.06L12,21.23l7.78-7.78,1.06-1.06A5.5,5.5,0,0,0,20.84,4.61Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/inbox.svg b/icons/inbox.svg
deleted file mode 100644
index b8b9d55..0000000
--- a/icons/inbox.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">
-  <polyline points="22 13 16 13 14 16 10 16 8 13 2 13"/>
-  <path d="M5.47,5.19,2,13v5a2,2,0,0,0,2,2H20a2,2,0,0,0,2-2V13L18.53,5.19A2,2,0,0,0,16.7,4H7.3A2,2,0,0,0,5.47,5.19Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/instagram.svg b/icons/instagram.svg
deleted file mode 100644
index 55beb63..0000000
--- a/icons/instagram.svg
+++ /dev/null
@@ -1,5 +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="2" y="2" width="20" height="20" rx="5" ry="5"/>
-  <path d="M16,11.37A4,4,0,1,1,12.63,8,4,4,0,0,1,16,11.37Z"/>
-  <line x1="17.5" y1="6.5" x2="17.5" y2="6.5"/>
-</svg>
\ No newline at end of file
diff --git a/icons/life-buoy.svg b/icons/life-buoy.svg
deleted file mode 100644
index 6836a02..0000000
--- a/icons/life-buoy.svg
+++ /dev/null
@@ -1,9 +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="12" cy="12" r="10"/>
-  <circle cx="12" cy="12" r="4"/>
-  <line x1="4.93" y1="4.93" x2="9.17" y2="9.17"/>
-  <line x1="14.83" y1="14.83" x2="19.07" y2="19.07"/>
-  <line x1="14.83" y1="9.17" x2="19.07" y2="4.93"/>
-  <line x1="14.83" y1="9.17" x2="18.36" y2="5.64"/>
-  <line x1="4.93" y1="19.07" x2="9.17" y2="14.83"/>
-</svg>
\ No newline at end of file
diff --git a/icons/loader.svg b/icons/loader.svg
deleted file mode 100644
index afdfdd1..0000000
--- a/icons/loader.svg
+++ /dev/null
@@ -1,10 +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">
-  <line x1="12" y1="2" x2="12" y2="6"/>
-  <line x1="12" y1="18" x2="12" y2="22"/>
-  <line x1="4.93" y1="4.93" x2="7.76" y2="7.76"/>
-  <line x1="16.24" y1="16.24" x2="19.07" y2="19.07"/>
-  <line x1="2" y1="12" x2="6" y2="12"/>
-  <line x1="18" y1="12" x2="22" y2="12"/>
-  <line x1="4.93" y1="19.07" x2="7.76" y2="16.24"/>
-  <line x1="16.24" y1="7.76" x2="19.07" y2="4.93"/>
-</svg>
\ No newline at end of file
diff --git a/icons/location.svg b/icons/location.svg
deleted file mode 100644
index 4b42f19..0000000
--- a/icons/location.svg
+++ /dev/null
@@ -1,3 +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="2 11 22 2 13 22 11 13 2 11"/>
-</svg>
\ No newline at end of file
diff --git a/icons/location/compass.svg b/icons/location/compass.svg
new file mode 100644
index 0000000..18fab19
--- /dev/null
+++ b/icons/location/compass.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <circle cx="12" cy="12" r="10" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polygon points="16.24 7.76 14.12 14.12 7.76 16.24 9.88 9.88 16.24 7.76" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/location/crosshair.svg b/icons/location/crosshair.svg
new file mode 100644
index 0000000..e82aa6a
--- /dev/null
+++ b/icons/location/crosshair.svg
@@ -0,0 +1,7 @@
+<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="12" cy="12" r="10"/>
+    <line x1="22" y1="12" x2="18" y2="12"/>
+    <line x1="6" y1="12" x2="2" y2="12"/>
+    <line x1="12" y1="6" x2="12" y2="2"/>
+    <line x1="12" y1="22" x2="12" y2="18"/>
+</svg>
diff --git a/icons/location/globe.svg b/icons/location/globe.svg
new file mode 100644
index 0000000..8336543
--- /dev/null
+++ b/icons/location/globe.svg
@@ -0,0 +1,5 @@
+<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="12" cy="12" r="10"/>
+    <line x1="2" y1="12" x2="22" y2="12"/>
+    <path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/>
+</svg>
diff --git a/icons/map-pin.svg b/icons/location/map-pin.svg
similarity index 62%
rename from icons/map-pin.svg
rename to icons/location/map-pin.svg
index a7358a2..f21bb76 100644
--- a/icons/map-pin.svg
+++ b/icons/location/map-pin.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M21,10c0,7-9,13-9,13S3,17,3,10a9,9,0,0,1,18,0Z"/>
-  <circle cx="12" cy="10" r="3"/>
-</svg>
\ No newline at end of file
+    <path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z"/>
+    <circle cx="12" cy="10" r="3"/>
+</svg>
diff --git a/icons/map.svg b/icons/location/map.svg
similarity index 52%
rename from icons/map.svg
rename to icons/location/map.svg
index 7514845..d0b761a 100644
--- a/icons/map.svg
+++ b/icons/location/map.svg
@@ -1,5 +1,5 @@
 <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="1 6 1 22 8 18 16 22 23 18 23 2 16 6 8 2 1 6"/>
-  <line x1="8" y1="2" x2="8" y2="18"/>
-  <line x1="16" y1="6" x2="16" y2="22"/>
-</svg>
\ No newline at end of file
+    <polygon points="1 6 1 22 8 18 16 22 23 18 23 2 16 6 8 2 1 6"/>
+    <line x1="8" y1="2" x2="8" y2="18"/>
+    <line x1="16" y1="6" x2="16" y2="22"/>
+</svg>
diff --git a/icons/location/navigation-2.svg b/icons/location/navigation-2.svg
new file mode 100644
index 0000000..ee9248b
--- /dev/null
+++ b/icons/location/navigation-2.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="12 2 19 21 12 17 5 21 12 2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/location/navigation.svg b/icons/location/navigation.svg
new file mode 100644
index 0000000..470ca06
--- /dev/null
+++ b/icons/location/navigation.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="3 11 22 2 13 21 11 13 3 11" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/logos/chrome.svg b/icons/logos/chrome.svg
new file mode 100644
index 0000000..6f17bd2
--- /dev/null
+++ b/icons/logos/chrome.svg
@@ -0,0 +1,7 @@
+<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="12" cy="12" r="10"/>
+    <circle cx="12" cy="12" r="4"/>
+    <line x1="21.17" y1="8" x2="12" y2="8"/>
+    <line x1="3.95" y1="6.06" x2="8.54" y2="14"/>
+    <line x1="10.88" y1="21.94" x2="15.46" y2="14"/>
+</svg>
diff --git a/icons/logos/codepen.svg b/icons/logos/codepen.svg
new file mode 100644
index 0000000..07fcb34
--- /dev/null
+++ b/icons/logos/codepen.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="12 2 22 8.5 22 15.5 12 22 2 15.5 2 8.5 12 2" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="22" x2="12" y2="15.5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="22 8.5 12 15.5 2 8.5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="2 15.5 12 8.5 22 15.5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="2" x2="12" y2="8.5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/facebook.svg b/icons/logos/facebook.svg
similarity index 66%
rename from icons/facebook.svg
rename to icons/logos/facebook.svg
index 4f7ab97..608ff27 100644
--- a/icons/facebook.svg
+++ b/icons/logos/facebook.svg
@@ -1,3 +1,3 @@
 <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">
-  <path d="M18,2H15a5,5,0,0,0-5,5v3H7v4h3v8h4V14h3l1-4H14V7a1,1,0,0,1,1-1h3Z"/>
-</svg>
\ No newline at end of file
+    <path d="M18 2h-3a5 5 0 0 0-5 5v3H7v4h3v8h4v-8h3l1-4h-4V7a1 1 0 0 1 1-1h3z"/>
+</svg>
diff --git a/icons/logos/instagram.svg b/icons/logos/instagram.svg
new file mode 100644
index 0000000..9505c4d
--- /dev/null
+++ b/icons/logos/instagram.svg
@@ -0,0 +1,5 @@
+<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="2" y="2" width="20" height="20" rx="5" ry="5"/>
+    <path d="M16 11.37A4 4 0 1 1 12.63 8 4 4 0 0 1 16 11.37z"/>
+    <line x1="17.5" y1="6.5" x2="17.5" y2="6.5"/>
+</svg>
diff --git a/icons/pocket.svg b/icons/logos/pocket.svg
similarity index 55%
rename from icons/pocket.svg
rename to icons/logos/pocket.svg
index efcea7b..634451b 100644
--- a/icons/pocket.svg
+++ b/icons/logos/pocket.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M4,3H20a2,2,0,0,1,2,2v6A10,10,0,0,1,12,21h0A10,10,0,0,1,2,11V5A2,2,0,0,1,4,3Z"/>
-  <polyline points="8 10 12 14 16 10"/>
-</svg>
\ No newline at end of file
+    <path d="M4 3h16a2 2 0 0 1 2 2v6a10 10 0 0 1-10 10A10 10 0 0 1 2 11V5a2 2 0 0 1 2-2z"/>
+    <polyline points="8 10 12 14 16 10"/>
+</svg>
diff --git a/icons/logos/slack.svg b/icons/logos/slack.svg
new file mode 100644
index 0000000..42a3b2e
--- /dev/null
+++ b/icons/logos/slack.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M22.08 9C19.81 1.41 16.54-.35 9 1.92S-.35 7.46 1.92 15 7.46 24.35 15 22.08 24.35 16.54 22.08 9z" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="12.57" y1="5.99" x2="16.15" y2="16.39" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="7.85" y1="7.61" x2="11.43" y2="18.01" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="16.39" y1="7.85" x2="5.99" y2="11.43" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="18.01" y1="12.57" x2="7.61" y2="16.15" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+</svg>
diff --git a/icons/logos/twitter.svg b/icons/logos/twitter.svg
new file mode 100644
index 0000000..93f8025
--- /dev/null
+++ b/icons/logos/twitter.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M23 3a10.9 10.9 0 0 1-3.14 1.53 4.48 4.48 0 0 0-7.86 3v1A10.66 10.66 0 0 1 3 4s-4 9 5 13a11.64 11.64 0 0 1-7 2c9 5 20 0 20-11.5a4.5 4.5 0 0 0-.08-.83A7.72 7.72 0 0 0 23 3z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/mail.svg b/icons/mail.svg
deleted file mode 100644
index e5eff47..0000000
--- a/icons/mail.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">
-  <path d="M4,4h16c1.1,0,2,0.9,2,2v12c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V6C2,4.9,2.9,4,4,4z"/>
-  <polyline points="22,6 12,13 2,6"/>
-</svg>
\ No newline at end of file
diff --git a/icons/maximize.svg b/icons/maximize.svg
deleted file mode 100644
index 13d6721..0000000
--- a/icons/maximize.svg
+++ /dev/null
@@ -1,6 +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">
-  <path d="M8,3H5A2,2,0,0,0,3,5V8"/>
-  <path d="M21,8V5a2,2,0,0,0-2-2H16"/>
-  <path d="M16,21h3a2,2,0,0,0,2-2V16"/>
-  <path d="M3,16v3a2,2,0,0,0,2,2H8"/>
-</svg>
\ No newline at end of file
diff --git a/icons/fast-forward.svg b/icons/media-controls/fast-forward.svg
similarity index 63%
rename from icons/fast-forward.svg
rename to icons/media-controls/fast-forward.svg
index d9c76e4..b2cfd53 100644
--- a/icons/fast-forward.svg
+++ b/icons/media-controls/fast-forward.svg
@@ -1,4 +1,4 @@
 <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="13 19 22 12 13 5 13 19"/>
-  <polygon points="2 19 11 12 2 5 2 19"/>
-</svg>
\ No newline at end of file
+    <polygon points="13 19 22 12 13 5 13 19"/>
+    <polygon points="2 19 11 12 2 5 2 19"/>
+</svg>
diff --git a/icons/media-controls/pause.svg b/icons/media-controls/pause.svg
new file mode 100644
index 0000000..d378ae3
--- /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 77%
rename from icons/play.svg
rename to icons/media-controls/play.svg
index ce6f54b..36134fc 100644
--- a/icons/play.svg
+++ b/icons/media-controls/play.svg
@@ -1,3 +1,3 @@
 <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="5 3 19 12 5 21 5 3"/>
-</svg>
\ No newline at end of file
+    <polygon points="5 3 19 12 5 21 5 3"/>
+</svg>
diff --git a/icons/media-controls/repeat.svg b/icons/media-controls/repeat.svg
new file mode 100644
index 0000000..bfff7f2
--- /dev/null
+++ b/icons/media-controls/repeat.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polyline points="17 1 21 5 17 9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <path d="M3 11V9a4 4 0 0 1 4-4h14" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="7 23 3 19 7 15" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <path d="M21 13v2a4 4 0 0 1-4 4H3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/rewind.svg b/icons/media-controls/rewind.svg
similarity index 63%
rename from icons/rewind.svg
rename to icons/media-controls/rewind.svg
index e7c26de..bcbc2bf 100644
--- a/icons/rewind.svg
+++ b/icons/media-controls/rewind.svg
@@ -1,4 +1,4 @@
 <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="11 19 2 12 11 5 11 19"/>
-  <polygon points="22 19 13 12 22 5 22 19"/>
-</svg>
\ No newline at end of file
+    <polygon points="11 19 2 12 11 5 11 19"/>
+    <polygon points="22 19 13 12 22 5 22 19"/>
+</svg>
diff --git a/icons/media-controls/shuffle.svg b/icons/media-controls/shuffle.svg
new file mode 100644
index 0000000..ecfcece
--- /dev/null
+++ b/icons/media-controls/shuffle.svg
@@ -0,0 +1,7 @@
+<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
new file mode 100644
index 0000000..d0f02ff
--- /dev/null
+++ b/icons/media-controls/skip-back.svg
@@ -0,0 +1,4 @@
+<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
new file mode 100644
index 0000000..b73f046
--- /dev/null
+++ b/icons/media-controls/skip-forward.svg
@@ -0,0 +1,4 @@
+<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>
diff --git a/icons/media-controls/volume-1.svg b/icons/media-controls/volume-1.svg
new file mode 100644
index 0000000..f79ccb7
--- /dev/null
+++ b/icons/media-controls/volume-1.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <path d="M15.54 8.46a5 5 0 0 1 0 7.07" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/media-controls/volume-2.svg b/icons/media-controls/volume-2.svg
new file mode 100644
index 0000000..9f41f30
--- /dev/null
+++ b/icons/media-controls/volume-2.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <path d="M19.07 4.93a10 10 0 0 1 0 14.14M15.54 8.46a5 5 0 0 1 0 7.07" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/media-controls/volume-x.svg b/icons/media-controls/volume-x.svg
new file mode 100644
index 0000000..4133c9d
--- /dev/null
+++ b/icons/media-controls/volume-x.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="23" y1="9" x2="17" y2="15" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="17" y1="9" x2="23" y2="15" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/media-controls/volume.svg b/icons/media-controls/volume.svg
new file mode 100644
index 0000000..c4362bb
--- /dev/null
+++ b/icons/media-controls/volume.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/mic-off.svg b/icons/mic-off.svg
deleted file mode 100644
index 296ff34..0000000
--- a/icons/mic-off.svg
+++ /dev/null
@@ -1,9 +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">
-  <line x1="1" y1="1" x2="23" y2="23"/>
-  <path d="M9,9v3a3,3,0,0,0,5.12,2.12"/>
-  <path d="M15,9.34V4a3,3,0,0,0-5.94-.6"/>
-  <path d="M17,16.95A7,7,0,0,1,5,12V10"/>
-  <path d="M19,10v2a7,7,0,0,1-.11,1.23"/>
-  <line x1="12" y1="19" x2="12" y2="23"/>
-  <line x1="8" y1="23" x2="16" y2="23"/>
-</svg>
\ No newline at end of file
diff --git a/icons/mic.svg b/icons/mic.svg
deleted file mode 100644
index f6b5ef4..0000000
--- a/icons/mic.svg
+++ /dev/null
@@ -1,6 +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">
-  <path d="M12,1A3,3,0,0,0,9,4v8a3,3,0,0,0,6,0V4A3,3,0,0,0,12,1Z"/>
-  <path d="M19,10v2A7,7,0,0,1,5,12V10"/>
-  <line x1="12" y1="19" x2="12" y2="23"/>
-  <line x1="8" y1="23" x2="16" y2="23"/>
-</svg>
\ No newline at end of file
diff --git a/icons/minimize-2.svg b/icons/minimize-2.svg
deleted file mode 100644
index dc15014..0000000
--- a/icons/minimize-2.svg
+++ /dev/null
@@ -1,6 +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="4 14 10 14 10 20"/>
-  <polyline points="20 10 14 10 14 4"/>
-  <line x1="14" y1="10" x2="21" y2="3"/>
-  <line x1="3" y1="21" x2="10" y2="14"/>
-</svg>
\ No newline at end of file
diff --git a/icons/minimize.svg b/icons/minimize.svg
deleted file mode 100644
index 013ead9..0000000
--- a/icons/minimize.svg
+++ /dev/null
@@ -1,6 +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">
-  <path d="M8,3V6A2,2,0,0,1,6,8H3"/>
-  <path d="M21,8H18a2,2,0,0,1-2-2V3"/>
-  <path d="M16,21V18a2,2,0,0,1,2-2h3"/>
-  <path d="M3,16H6a2,2,0,0,1,2,2v3"/>
-</svg>
\ No newline at end of file
diff --git a/icons/move.svg b/icons/move.svg
deleted file mode 100644
index b3151dc..0000000
--- a/icons/move.svg
+++ /dev/null
@@ -1,8 +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="5 9 2 12 5 15"/>
-  <polyline points="9 5 12 2 15 5"/>
-  <polyline points="15 19 12 22 9 19"/>
-  <polyline points="19 9 22 12 19 15"/>
-  <line x1="2" y1="12" x2="22" y2="12"/>
-  <line x1="12" y1="2" x2="12" y2="22"/>
-</svg>
\ No newline at end of file
diff --git a/icons/music.svg b/icons/music.svg
deleted file mode 100644
index 592abe2..0000000
--- a/icons/music.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M9,17H5a2,2,0,0,0-2,2H3a2,2,0,0,0,2,2H7a2,2,0,0,0,2-2Z"/>
-  <path d="M21,15H17a2,2,0,0,0-2,2h0a2,2,0,0,0,2,2h2a2,2,0,0,0,2-2Z"/>
-  <polyline points="9 17 9 5 21 3 21 15"/>
-</svg>
\ No newline at end of file
diff --git a/icons/pause.svg b/icons/pause.svg
deleted file mode 100644
index 1244431..0000000
--- 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>
\ No newline at end of file
diff --git a/icons/phone-call.svg b/icons/phone-call.svg
deleted file mode 100644
index 3547b77..0000000
--- a/icons/phone-call.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M15.05,5A5,5,0,0,1,19,8.95"/>
-  <path d="M15.05,1A9,9,0,0,1,23,8.94"/>
-  <path d="M22,16.92v3a2,2,0,0,1-2.18,2,19.79,19.79,0,0,1-8.63-3.07,19.5,19.5,0,0,1-6-6A19.79,19.79,0,0,1,2.12,4.18,2,2,0,0,1,4.11,2h3a2,2,0,0,1,2,1.72,12.84,12.84,0,0,0,.7,2.81,2,2,0,0,1-.45,2.11L8.09,9.91a16,16,0,0,0,6,6l1.27-1.27a2,2,0,0,1,2.11-.45,12.84,12.84,0,0,0,2.81.7A2,2,0,0,1,22,16.92Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/phone-forwarded.svg b/icons/phone-forwarded.svg
deleted file mode 100644
index 6ad3f57..0000000
--- a/icons/phone-forwarded.svg
+++ /dev/null
@@ -1,5 +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="19 1 23 5 19 9"/>
-  <line x1="15" y1="5" x2="23" y2="5"/>
-  <path d="M22,16.92v3a2,2,0,0,1-2.18,2,19.79,19.79,0,0,1-8.63-3.07,19.5,19.5,0,0,1-6-6A19.79,19.79,0,0,1,2.12,4.18,2,2,0,0,1,4.11,2h3a2,2,0,0,1,2,1.72,12.84,12.84,0,0,0,.7,2.81,2,2,0,0,1-.45,2.11L8.09,9.91a16,16,0,0,0,6,6l1.27-1.27a2,2,0,0,1,2.11-.45,12.84,12.84,0,0,0,2.81.7A2,2,0,0,1,22,16.92Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/phone-incoming.svg b/icons/phone-incoming.svg
deleted file mode 100644
index 4827858..0000000
--- a/icons/phone-incoming.svg
+++ /dev/null
@@ -1,5 +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 2 16 8 22 8"/>
-  <line x1="23" y1="1" x2="16" y2="8"/>
-  <path d="M22,16.92v3a2,2,0,0,1-2.18,2,19.79,19.79,0,0,1-8.63-3.07,19.5,19.5,0,0,1-6-6A19.79,19.79,0,0,1,2.12,4.18,2,2,0,0,1,4.11,2h3a2,2,0,0,1,2,1.72,12.84,12.84,0,0,0,.7,2.81,2,2,0,0,1-.45,2.11L8.09,9.91a16,16,0,0,0,6,6l1.27-1.27a2,2,0,0,1,2.11-.45,12.84,12.84,0,0,0,2.81.7A2,2,0,0,1,22,16.92Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/phone-missed.svg b/icons/phone-missed.svg
deleted file mode 100644
index 47534ea..0000000
--- a/icons/phone-missed.svg
+++ /dev/null
@@ -1,5 +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">
-  <line x1="23" y1="1" x2="17" y2="7"/>
-  <line x1="17" y1="1" x2="23" y2="7"/>
-  <path d="M22,16.92v3a2,2,0,0,1-2.18,2,19.79,19.79,0,0,1-8.63-3.07,19.5,19.5,0,0,1-6-6A19.79,19.79,0,0,1,2.12,4.18,2,2,0,0,1,4.11,2h3a2,2,0,0,1,2,1.72,12.84,12.84,0,0,0,.7,2.81,2,2,0,0,1-.45,2.11L8.09,9.91a16,16,0,0,0,6,6l1.27-1.27a2,2,0,0,1,2.11-.45,12.84,12.84,0,0,0,2.81.7A2,2,0,0,1,22,16.92Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/phone-off.svg b/icons/phone-off.svg
deleted file mode 100644
index 9743c9c..0000000
--- a/icons/phone-off.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M10.68,13.31a16,16,0,0,0,3.41,2.6l1.27-1.27a2,2,0,0,1,2.11-.45,12.84,12.84,0,0,0,2.81.7,2,2,0,0,1,1.72,2v3a2,2,0,0,1-2.18,2,19.79,19.79,0,0,1-8.63-3.07,19.42,19.42,0,0,1-3.33-2.67"/>
-  <path d="M5.19,12.81A19.79,19.79,0,0,1,2.12,4.18,2,2,0,0,1,4.11,2h3a2,2,0,0,1,2,1.72,12.84,12.84,0,0,0,.7,2.81,2,2,0,0,1-.45,2.11L8.09,9.91"/>
-  <line x1="23" y1="1" x2="1" y2="23"/>
-</svg>
\ No newline at end of file
diff --git a/icons/phone-outgoing.svg b/icons/phone-outgoing.svg
deleted file mode 100644
index 08d1e8e..0000000
--- a/icons/phone-outgoing.svg
+++ /dev/null
@@ -1,5 +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="23 7 23 1 17 1"/>
-  <line x1="16" y1="8" x2="23" y2="1"/>
-  <path d="M22,16.92v3a2,2,0,0,1-2.18,2,19.79,19.79,0,0,1-8.63-3.07,19.5,19.5,0,0,1-6-6A19.79,19.79,0,0,1,2.12,4.18,2,2,0,0,1,4.11,2h3a2,2,0,0,1,2,1.72,12.84,12.84,0,0,0,.7,2.81,2,2,0,0,1-.45,2.11L8.09,9.91a16,16,0,0,0,6,6l1.27-1.27a2,2,0,0,1,2.11-.45,12.84,12.84,0,0,0,2.81.7A2,2,0,0,1,22,16.92Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/phone.svg b/icons/phone.svg
deleted file mode 100644
index db12ee9..0000000
--- a/icons/phone.svg
+++ /dev/null
@@ -1,3 +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">
-  <path d="M22,16.92v3a2,2,0,0,1-2.18,2,19.79,19.79,0,0,1-8.63-3.07,19.5,19.5,0,0,1-6-6A19.79,19.79,0,0,1,2.12,4.18,2,2,0,0,1,4.11,2h3a2,2,0,0,1,2,1.72,12.84,12.84,0,0,0,.7,2.81,2,2,0,0,1-.45,2.11L8.09,9.91a16,16,0,0,0,6,6l1.27-1.27a2,2,0,0,1,2.11-.45,12.84,12.84,0,0,0,2.81.7A2,2,0,0,1,22,16.92Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/photo-and-video/aperture.svg b/icons/photo-and-video/aperture.svg
new file mode 100644
index 0000000..dcc35ba
--- /dev/null
+++ b/icons/photo-and-video/aperture.svg
@@ -0,0 +1,9 @@
+<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="12" cy="12" r="10"/>
+    <line x1="14.31" y1="8" x2="20.05" y2="17.94"/>
+    <line x1="9.69" y1="8" x2="21.17" y2="8"/>
+    <line x1="7.38" y1="12" x2="13.12" y2="2.06"/>
+    <line x1="9.69" y1="16" x2="3.95" y2="6.06"/>
+    <line x1="14.31" y1="16" x2="2.83" y2="16"/>
+    <line x1="16.62" y1="12" x2="10.88" y2="21.94"/>
+</svg>
diff --git a/icons/photo-and-video/camera-off.svg b/icons/photo-and-video/camera-off.svg
new file mode 100644
index 0000000..e31a0ea
--- /dev/null
+++ b/icons/photo-and-video/camera-off.svg
@@ -0,0 +1,4 @@
+<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">
+    <line x1="1" y1="1" x2="23" y2="23"/>
+    <path d="M21 21H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h3m3-3h6l2 3h4a2 2 0 0 1 2 2v9.34m-7.72-2.06a4 4 0 1 1-5.56-5.56"/>
+</svg>
diff --git a/icons/camera.svg b/icons/photo-and-video/camera.svg
similarity index 55%
rename from icons/camera.svg
rename to icons/photo-and-video/camera.svg
index e99d16f..3ffe3da 100644
--- a/icons/camera.svg
+++ b/icons/photo-and-video/camera.svg
@@ -1,4 +1,4 @@
 <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">
-  <path d="M23,19a2,2,0,0,1-2,2H3a2,2,0,0,1-2-2V8A2,2,0,0,1,3,6H7L9,3h6l2,3h4a2,2,0,0,1,2,2Z"/>
-  <circle cx="12" cy="13" r="4"/>
-</svg>
\ No newline at end of file
+    <path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"/>
+    <circle cx="12" cy="13" r="4"/>
+</svg>
diff --git a/icons/image.svg b/icons/photo-and-video/image.svg
similarity index 53%
rename from icons/image.svg
rename to icons/photo-and-video/image.svg
index af9508c..6feaa97 100644
--- a/icons/image.svg
+++ b/icons/photo-and-video/image.svg
@@ -1,5 +1,5 @@
 <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="3" y="3" width="18" height="18" rx="2" ry="2"/>
-  <circle cx="8.5" cy="8.5" r="1.5"/>
-  <polyline points="21 15 16 10 5 21"/>
-</svg>
\ No newline at end of file
+    <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+    <circle cx="8.5" cy="8.5" r="1.5"/>
+    <polyline points="21 15 16 10 5 21"/>
+</svg>
diff --git a/icons/photo-and-video/video-off.svg b/icons/photo-and-video/video-off.svg
new file mode 100644
index 0000000..6e482f8
--- /dev/null
+++ b/icons/photo-and-video/video-off.svg
@@ -0,0 +1,4 @@
+<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">
+    <path d="M16 16v1a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V7a2 2 0 0 1 2-2h2m5.66 0H14a2 2 0 0 1 2 2v3.34l1 1L23 7v10"/>
+    <line x1="1" y1="1" x2="23" y2="23"/>
+</svg>
diff --git a/icons/video.svg b/icons/photo-and-video/video.svg
similarity index 60%
rename from icons/video.svg
rename to icons/photo-and-video/video.svg
index 936c1ed..9030f97 100644
--- a/icons/video.svg
+++ b/icons/photo-and-video/video.svg
@@ -1,4 +1,4 @@
 <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="23 7 16 12 23 17 23 7"/>
-  <rect x="1" y="5" width="15" height="14" rx="2" ry="2"/>
-</svg>
\ No newline at end of file
+    <polygon points="23 7 16 12 23 17 23 7"/>
+    <rect x="1" y="5" width="15" height="14" rx="2" ry="2"/>
+</svg>
diff --git a/icons/printer.svg b/icons/printer.svg
deleted file mode 100644
index ac3c9fe..0000000
--- a/icons/printer.svg
+++ /dev/null
@@ -1,5 +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="6 9 6 2 18 2 18 9"/>
-  <path d="M6,18H4a2,2,0,0,1-2-2V11A2,2,0,0,1,4,9H20a2,2,0,0,1,2,2v5a2,2,0,0,1-2,2H18"/>
-  <rect x="6" y="14" width="12" height="8"/>
-</svg>
\ No newline at end of file
diff --git a/icons/radio.svg b/icons/radio.svg
deleted file mode 100644
index 3546db8..0000000
--- a/icons/radio.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="12" cy="12" r="2"/>
-  <path d="M16.24,7.76a6,6,0,0,1,0,8.49"/>
-  <path d="M7.76,16.24a6,6,0,0,1,0-8.49"/>
-  <path d="M19.07,4.93a10,10,0,0,1,0,14.14"/>
-  <path d="M4.93,19.07a10,10,0,0,1,0-14.14"/>
-</svg>
\ No newline at end of file
diff --git a/icons/refresh-ccw.svg b/icons/refresh-ccw.svg
deleted file mode 100644
index b8a04cf..0000000
--- a/icons/refresh-ccw.svg
+++ /dev/null
@@ -1,6 +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="1 4 1 10 7 10"/>
-  <polyline points="23 20 23 14 17 14"/>
-  <path d="M20.49,9A9,9,0,0,0,5.64,5.64L1,10"/>
-  <path d="M23,14l-4.64,4.36A9,9,0,0,1,3.51,15"/>
-</svg>
\ No newline at end of file
diff --git a/icons/refresh-cw.svg b/icons/refresh-cw.svg
deleted file mode 100644
index c1ca632..0000000
--- a/icons/refresh-cw.svg
+++ /dev/null
@@ -1,6 +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="23 4 23 10 17 10"/>
-  <polyline points="1 20 1 14 7 14"/>
-  <path d="M3.51,9A9,9,0,0,1,18.36,5.64L23,10"/>
-  <path d="M1,14l4.64,4.36A9,9,0,0,0,20.49,15"/>
-</svg>
\ No newline at end of file
diff --git a/icons/rotate-cw.svg b/icons/rotate-cw.svg
deleted file mode 100644
index 0df70b7..0000000
--- a/icons/rotate-cw.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">
-  <polyline points="23 4 23 10 17 10"/>
-  <path d="M20.49,15a9,9,0,1,1-2.12-9.36L23,10"/>
-</svg>
\ No newline at end of file
diff --git a/icons/scissors.svg b/icons/scissors.svg
deleted file mode 100644
index 66acdc7..0000000
--- 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>
\ No newline at end of file
diff --git a/icons/share.svg b/icons/share.svg
deleted file mode 100644
index 81c4d3c..0000000
--- a/icons/share.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="18" cy="5" r="3"/>
-  <circle cx="6" cy="12" r="3"/>
-  <circle cx="18" cy="19" r="3"/>
-  <line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/>
-  <line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/>
-</svg>
\ No newline at end of file
diff --git a/icons/shuffle.svg b/icons/shuffle.svg
deleted file mode 100644
index 7012760..0000000
--- 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>
\ No newline at end of file
diff --git a/icons/skip-back.svg b/icons/skip-back.svg
deleted file mode 100644
index 5b0868f..0000000
--- 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>
\ No newline at end of file
diff --git a/icons/skip-forward.svg b/icons/skip-forward.svg
deleted file mode 100644
index b4fd3b0..0000000
--- 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>
\ No newline at end of file
diff --git a/icons/sun.svg b/icons/sun.svg
deleted file mode 100644
index 0c8ab28..0000000
--- a/icons/sun.svg
+++ /dev/null
@@ -1,11 +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="12" cy="12" r="5"/>
-  <line x1="12" y1="1" x2="12" y2="3"/>
-  <line x1="12" y1="21" x2="12" y2="23"/>
-  <line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/>
-  <line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/>
-  <line x1="1" y1="12" x2="3" y2="12"/>
-  <line x1="21" y1="12" x2="23" y2="12"/>
-  <line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/>
-  <line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/>
-</svg>
\ No newline at end of file
diff --git a/icons/sunrise.svg b/icons/sunrise.svg
deleted file mode 100644
index 5151def..0000000
--- a/icons/sunrise.svg
+++ /dev/null
@@ -1,10 +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">
-  <path d="M17,18A5,5,0,0,0,7,18"/>
-  <line x1="12" y1="2" x2="12" y2="9"/>
-  <line x1="4.22" y1="10.22" x2="5.64" y2="11.64"/>
-  <line x1="1" y1="18" x2="3" y2="18"/>
-  <line x1="21" y1="18" x2="23" y2="18"/>
-  <line x1="18.36" y1="11.64" x2="19.78" y2="10.22"/>
-  <line x1="23" y1="22" x2="1" y2="22"/>
-  <polyline points="8 6 12 2 16 6"/>
-</svg>
\ No newline at end of file
diff --git a/icons/sunset.svg b/icons/sunset.svg
deleted file mode 100644
index 1cac295..0000000
--- a/icons/sunset.svg
+++ /dev/null
@@ -1,10 +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">
-  <path d="M17,18A5,5,0,0,0,7,18"/>
-  <line x1="12" y1="9" x2="12" y2="2"/>
-  <line x1="4.22" y1="10.22" x2="5.64" y2="11.64"/>
-  <line x1="1" y1="18" x2="3" y2="18"/>
-  <line x1="21" y1="18" x2="23" y2="18"/>
-  <line x1="18.36" y1="11.64" x2="19.78" y2="10.22"/>
-  <line x1="23" y1="22" x2="1" y2="22"/>
-  <polyline points="16 5 12 9 8 5"/>
-</svg>
\ No newline at end of file
diff --git a/icons/thumbs-down.svg b/icons/thumbs-down.svg
deleted file mode 100644
index 99b2da1..0000000
--- a/icons/thumbs-down.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">
-  <path d="M10,15v4a3,3,0,0,0,3,3l4-9h0V2H5.72a2,2,0,0,0-2,1.7l-1.38,9a2,2,0,0,0,2,2.3Z"/>
-  <path d="M17,2h2.67A2.31,2.31,0,0,1,22,4v7a2.31,2.31,0,0,1-2.33,2H17"/>
-</svg>
\ No newline at end of file
diff --git a/icons/thumbs-up.svg b/icons/thumbs-up.svg
deleted file mode 100644
index 73c9291..0000000
--- a/icons/thumbs-up.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">
-  <path d="M14,9V5a3,3,0,0,0-3-3L7,11H7V22H18.28a2,2,0,0,0,2-1.7l1.38-9a2,2,0,0,0-2-2.3Z"/>
-  <path d="M7,22H4a2,2,0,0,1-2-2V13a2,2,0,0,1,2-2H7"/>
-</svg>
\ No newline at end of file
diff --git a/icons/toggle-left.svg b/icons/toggle-left.svg
deleted file mode 100644
index dbc48f5..0000000
--- a/icons/toggle-left.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="1" y="5" width="22" height="14" rx="7" ry="7"/>
-  <circle cx="8" cy="12" r="3"/>
-</svg>
\ No newline at end of file
diff --git a/icons/trash-2.svg b/icons/trash-2.svg
deleted file mode 100644
index ebee3f7..0000000
--- a/icons/trash-2.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="3 6 5 6 21 6"/>
-  <path d="M19,6V20a2,2,0,0,1-2,2H7a2,2,0,0,1-2-2V6"/>
-  <path d="M8,6V4a2,2,0,0,1,2-2h4a2,2,0,0,1,2,2V6"/>
-  <line x1="10" y1="11" x2="10" y2="17"/>
-  <line x1="14" y1="11" x2="14" y2="17"/>
-</svg>
\ No newline at end of file
diff --git a/icons/twitter.svg b/icons/twitter.svg
deleted file mode 100644
index 048f630..0000000
--- a/icons/twitter.svg
+++ /dev/null
@@ -1,3 +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">
-  <path d="M23,3a10.9,10.9,0,0,1-3.14,1.53A4.48,4.48,0,0,0,12,7.5c0,.17,0,.83,0,1C7,8.5,4,5.5,2,3,2,3-2,13,8,17H8a11.64,11.64,0,0,1-7,2c9,5,20,0,20-11.5a4.5,4.5,0,0,0-.08-.83A7.72,7.72,0,0,0,23,3Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/umbrella.svg b/icons/umbrella.svg
deleted file mode 100644
index 01d9d3e..0000000
--- a/icons/umbrella.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">
-  <path d="M23,12A11.05,11.05,0,0,0,1,12Z"/>
-  <path d="M18,19a3,3,0,0,1-6,0V12"/>
-</svg>
\ No newline at end of file
diff --git a/icons/upload-cloud.svg b/icons/upload-cloud.svg
deleted file mode 100644
index 4d4c33f..0000000
--- a/icons/upload-cloud.svg
+++ /dev/null
@@ -1,6 +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 16 12 12 8 16"/>
-  <line x1="12" y1="12" x2="12" y2="21"/>
-  <path d="M20.39,18.39A5,5,0,0,0,18,9H16.74A8,8,0,1,0,3,16.3"/>
-  <polyline points="16 16 12 12 8 16"/>
-</svg>
\ No newline at end of file
diff --git a/icons/user-minus.svg b/icons/user-minus.svg
deleted file mode 100644
index 540df35..0000000
--- a/icons/user-minus.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M19,21V20c0-2.76-4-5-9-5s-9,2.24-9,5v1"/>
-  <path d="M14,6.37A4,4,0,1,1,10.63,3,4,4,0,0,1,14,6.37Z"/>
-  <line x1="17" y1="11" x2="23" y2="11"/>
-</svg>
\ No newline at end of file
diff --git a/icons/user-plus.svg b/icons/user-plus.svg
deleted file mode 100644
index 56eb13d..0000000
--- a/icons/user-plus.svg
+++ /dev/null
@@ -1,6 +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">
-  <path d="M19,21V20c0-2.76-4-5-9-5s-9,2.24-9,5v1"/>
-  <path d="M14,6.37A4,4,0,1,1,10.63,3,4,4,0,0,1,14,6.37Z"/>
-  <line x1="20" y1="8" x2="20" y2="14"/>
-  <line x1="17" y1="11" x2="23" y2="11"/>
-</svg>
\ No newline at end of file
diff --git a/icons/user.svg b/icons/user.svg
deleted file mode 100644
index a31fd01..0000000
--- a/icons/user.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">
-  <path d="M21,21V20c0-2.76-4-5-9-5s-9,2.24-9,5v1"/>
-  <path d="M16,6.37A4,4,0,1,1,12.63,3,4,4,0,0,1,16,6.37Z"/>
-</svg>
\ No newline at end of file
diff --git a/icons/video-off.svg b/icons/video-off.svg
deleted file mode 100644
index 5c7cac1..0000000
--- a/icons/video-off.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M16,16v1a2,2,0,0,1-2,2H3a2,2,0,0,1-2-2V7A2,2,0,0,1,3,5H5"/>
-  <path d="M10.66,5H14a2,2,0,0,1,2,2v3.34l1,1L23,7V17"/>
-  <line x1="1" y1="1" x2="23" y2="23"/>
-</svg>
\ No newline at end of file
diff --git a/icons/watch.svg b/icons/watch.svg
deleted file mode 100644
index 6718bf4..0000000
--- a/icons/watch.svg
+++ /dev/null
@@ -1,6 +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="12" cy="12" r="7"/>
-  <polyline points="12 9 12 12 13.5 13.5"/>
-  <path d="M16.51,17.35l-.35,3.83a2,2,0,0,1-2,1.82H9.83a2,2,0,0,1-2-1.82l-.35-3.83"/>
-  <path d="M7.49,6.65l.35-3.83A2,2,0,0,1,9.83,1h4.35a2,2,0,0,1,2,1.82l.35,3.83"/>
-</svg>
\ No newline at end of file
diff --git a/icons/weather/cloud-drizzle.svg b/icons/weather/cloud-drizzle.svg
new file mode 100644
index 0000000..18eac99
--- /dev/null
+++ b/icons/weather/cloud-drizzle.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <line x1="8" y1="19" x2="8" y2="21" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="8" y1="13" x2="8" y2="15" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="16" y1="19" x2="16" y2="21" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="16" y1="13" x2="16" y2="15" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="12" y1="21" x2="12" y2="23" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="12" y1="15" x2="12" y2="17" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <path d="M20 16.58A5 5 0 0 0 18 7h-1.26A8 8 0 1 0 4 15.25" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/weather/cloud-lightning.svg b/icons/weather/cloud-lightning.svg
new file mode 100644
index 0000000..08c1c00
--- /dev/null
+++ b/icons/weather/cloud-lightning.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M19 16.9A5 5 0 0 0 18 7h-1.26a8 8 0 1 0-11.62 9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <polyline points="13 11 9 17 15 17 11 23" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/weather/cloud-rain.svg b/icons/weather/cloud-rain.svg
new file mode 100644
index 0000000..e00b164
--- /dev/null
+++ b/icons/weather/cloud-rain.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <line x1="16" y1="13" x2="16" y2="21" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="8" y1="13" x2="8" y2="21" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <line x1="12" y1="15" x2="12" y2="23" fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
+    <path d="M20 16.58A5 5 0 0 0 18 7h-1.26A8 8 0 1 0 4 15.25" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/weather/cloud-snow.svg b/icons/weather/cloud-snow.svg
new file mode 100644
index 0000000..35a6e25
--- /dev/null
+++ b/icons/weather/cloud-snow.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M20 17.58A5 5 0 0 0 18 8h-1.26A8 8 0 1 0 4 16.25" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="8" y1="16" x2="8" y2="16" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="8" y1="20" x2="8" y2="20" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="18" x2="12" y2="18" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="12" y1="22" x2="12" y2="22" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="16" y1="16" x2="16" y2="16" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+    <line x1="16" y1="20" x2="16" y2="20" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/weather/droplet.svg b/icons/weather/droplet.svg
new file mode 100644
index 0000000..fbf4960
--- /dev/null
+++ b/icons/weather/droplet.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M12 2.69l5.66 5.66a8 8 0 1 1-11.31 0z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/icons/moon.svg b/icons/weather/moon.svg
similarity index 71%
rename from icons/moon.svg
rename to icons/weather/moon.svg
index 029585f..eb7ac7b 100644
--- a/icons/moon.svg
+++ b/icons/weather/moon.svg
@@ -1,3 +1,3 @@
 <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">
-  <path d="M21,12.79A9,9,0,1,1,11.21,3,7,7,0,0,0,21,12.79Z"/>
-</svg>
\ No newline at end of file
+    <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/>
+</svg>
diff --git a/icons/weather/sun.svg b/icons/weather/sun.svg
new file mode 100644
index 0000000..a836aea
--- /dev/null
+++ b/icons/weather/sun.svg
@@ -0,0 +1,11 @@
+<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="12" cy="12" r="5"/>
+    <line x1="12" y1="1" x2="12" y2="3"/>
+    <line x1="12" y1="21" x2="12" y2="23"/>
+    <line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/>
+    <line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/>
+    <line x1="1" y1="12" x2="3" y2="12"/>
+    <line x1="21" y1="12" x2="23" y2="12"/>
+    <line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/>
+    <line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/>
+</svg>
diff --git a/icons/weather/sunrise.svg b/icons/weather/sunrise.svg
new file mode 100644
index 0000000..d238fb5
--- /dev/null
+++ b/icons/weather/sunrise.svg
@@ -0,0 +1,10 @@
+<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">
+    <path d="M17 18a5 5 0 0 0-10 0"/>
+    <line x1="12" y1="2" x2="12" y2="9"/>
+    <line x1="4.22" y1="10.22" x2="5.64" y2="11.64"/>
+    <line x1="1" y1="18" x2="3" y2="18"/>
+    <line x1="21" y1="18" x2="23" y2="18"/>
+    <line x1="18.36" y1="11.64" x2="19.78" y2="10.22"/>
+    <line x1="23" y1="22" x2="1" y2="22"/>
+    <polyline points="8 6 12 2 16 6"/>
+</svg>
diff --git a/icons/weather/sunset.svg b/icons/weather/sunset.svg
new file mode 100644
index 0000000..81b52d6
--- /dev/null
+++ b/icons/weather/sunset.svg
@@ -0,0 +1,10 @@
+<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">
+    <path d="M17 18a5 5 0 0 0-10 0"/>
+    <line x1="12" y1="9" x2="12" y2="2"/>
+    <line x1="4.22" y1="10.22" x2="5.64" y2="11.64"/>
+    <line x1="1" y1="18" x2="3" y2="18"/>
+    <line x1="21" y1="18" x2="23" y2="18"/>
+    <line x1="18.36" y1="11.64" x2="19.78" y2="10.22"/>
+    <line x1="23" y1="22" x2="1" y2="22"/>
+    <polyline points="16 5 12 9 8 5"/>
+</svg>
diff --git a/icons/thermometer.svg b/icons/weather/thermometer.svg
similarity index 68%
rename from icons/thermometer.svg
rename to icons/weather/thermometer.svg
index edd53c7..05bd5c9 100644
--- a/icons/thermometer.svg
+++ b/icons/weather/thermometer.svg
@@ -1,3 +1,3 @@
 <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">
-  <path d="M14,14.76V3.5a2.5,2.5,0,0,0-5,0V14.76a4.5,4.5,0,1,0,5,0Z"/>
-</svg>
\ No newline at end of file
+    <path d="M14 14.76V3.5a2.5 2.5 0 0 0-5 0v11.26a4.5 4.5 0 1 0 5 0z"/>
+</svg>
diff --git a/icons/bookmark.svg b/icons/weather/umbrella.svg
similarity index 69%
rename from icons/bookmark.svg
rename to icons/weather/umbrella.svg
index 20a1918..a00f6d3 100644
--- a/icons/bookmark.svg
+++ b/icons/weather/umbrella.svg
@@ -1,3 +1,3 @@
 <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">
-  <path d="M19,21l-7-5L5,21V5A2,2,0,0,1,7,3H17a2,2,0,0,1,2,2Z"/>
-</svg>
\ No newline at end of file
+    <path d="M23 12a11.05 11.05 0 0 0-22 0zm-5 7a3 3 0 0 1-6 0v-7"/>
+</svg>
diff --git a/icons/weather/wind.svg b/icons/weather/wind.svg
new file mode 100644
index 0000000..bc139af
--- /dev/null
+++ b/icons/weather/wind.svg
@@ -0,0 +1,3 @@
+<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">
+    <path d="M9.59 4.59A2 2 0 1 1 11 8H2m10.59 11.41A2 2 0 1 0 14 16H2m15.73-8.27A2.5 2.5 0 1 1 19.5 12H2"/>
+</svg>
diff --git a/icons/wifi.svg b/icons/wifi.svg
deleted file mode 100644
index c881419..0000000
--- a/icons/wifi.svg
+++ /dev/null
@@ -1,6 +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">
-  <path d="M5,11.55a11,11,0,0,1,14.08,0"/>
-  <path d="M1.41,8A16,16,0,0,1,22.58,8"/>
-  <path d="M8.52,15.11a6,6,0,0,1,6.95,0"/>
-  <line x1="12" y1="19" x2="12" y2="19"/>
-</svg>
\ No newline at end of file
diff --git a/icons/wind.svg b/icons/wind.svg
deleted file mode 100644
index 766c46d..0000000
--- a/icons/wind.svg
+++ /dev/null
@@ -1,5 +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">
-  <path d="M9.59,4.59A2,2,0,1,1,11,8H2"/>
-  <path d="M12.59,19.41A2,2,0,1,0,14,16H2"/>
-  <path d="M17.73,7.73A2.5,2.5,0,1,1,19.5,12H2"/>
-</svg>
\ No newline at end of file
diff --git a/icons/zoom-in.svg b/icons/zoom-in.svg
deleted file mode 100644
index 6495bd3..0000000
--- a/icons/zoom-in.svg
+++ /dev/null
@@ -1,6 +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="11" cy="11" r="8"/>
-  <line x1="21" y1="21" x2="16.65" y2="16.65"/>
-  <line x1="11" y1="8" x2="11" y2="14"/>
-  <line x1="8" y1="11" x2="14" y2="11"/>
-</svg>
\ No newline at end of file
diff --git a/index.html b/index.html
index c0ceda2..8a70848 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
 ---
-title: Feather
-description: Feather is a collection of simply beautiful open source icons. Each icon is designed on a 24x24 grid with an emphasis on consistency and simplicity.
+title: Feather – Simply beautiful open source icons
+description: Designed on a 24x24 grid with an emphasis on functionality, consistency and simplicity.
 links:
 - title: Donate
   url: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=G6CPFZ6PQRZW8&lc=US&item_name=Feather&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
@@ -23,7 +23,9 @@ links:
   <meta name="description" content="{{ page.description }}">
   <meta property="og:title" content="{{ page.title }}">
   <meta property="og:description" content="{{ page.description }}">
-  <meta name="twitter:card" content="summary">
+  <meta property="og:image" content="assets/feather-preview.png">
+  <meta name="twitter:card" content="summary_large_image">
+  <meta name="twitter:site" content="@colebemis">
 
   <link rel="shortcut icon" type="image/png" href="assets/favicon.png">
 
@@ -31,14 +33,11 @@ links:
   <link href="https://unpkg.com/tachyons/css/tachyons.min.css" rel="stylesheet">
   <link href="style.css" rel="stylesheet">
 </head>
-<body class="ma0 rubik font-smoothing black-60 bg-near-white">
+<body class="ma0 rubik font-smoothing black-60 bg-white">
 
-  <div class="pb5 pb6-ns bg-white">
-    {% include header.html %}
-    {% include icons.html %}
-  </div>
-
-  {% include request.html %}
+  {% include header.html %}
+  {% include hero.html %}
+  {% include icons.html %}
   {% include footer.html links=page.links %}
 
   </script>
diff --git a/package.json b/package.json
index 9ab7fa7..e7d2aea 100644
--- a/package.json
+++ b/package.json
@@ -1,21 +1,20 @@
 {
   "name": "feather",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "author": "Cole Bemis <cole@colebemis.com> (http://colebemis.com)",
   "repository": {
     "type": "git",
     "url": "https://github.com/colebemis/feather.git"
   },
   "scripts": {
-    "start": "npm run build:manifest && parallelshell 'jekyll serve' 'npm run watch'",
-    "watch": "onchange 'icons/**/*' -v -- npm run build:manifest",
-    "build": "npm run build:manifest && npm run build:zip && jekyll build",
-    "build:manifest": "./bin/build-manifest.sh > manifest.json",
-    "build:zip": "./bin/build-zip.sh"
+    "svgo": "for i in $(find icons/* -type d); do svgo --pretty --multipass --config=svgo-config.yml $i; done",
+    "build": "npm run build-zip && jekyll build",
+    "build-zip": "./bin/build-zip.sh"
   },
   "license": "MIT",
   "devDependencies": {
     "onchange": "^3.2.1",
-    "parallelshell": "^2.0.0"
+    "parallelshell": "^2.0.0",
+    "svgo": "^0.7.2"
   }
 }
diff --git a/style.css b/style.css
index bcf9b5c..d35f30f 100644
--- a/style.css
+++ b/style.css
@@ -1,15 +1,3 @@
-:root {
-  --accent: #4353FF;
-}
-
-.accent {
-  color: var(--accent);
-}
-
-.bg-accent {
-  background-color: var(--accent);
-}
-
 .rubik {
   font-family: "Rubik", sans-serif;
 }
@@ -19,63 +7,79 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.btn {
+.bg-accent {
+  background-color: #4353FF;
+}
+
+.hover-bg-accent-darker:hover {
+  background-color: #3E4DED;
+}
+
+.button {
   display: inline-block;
   padding: 1rem 2rem;
-  font-size: 0.875rem;
-  line-height: 1.5;
-  text-transform: uppercase;
+  font-size: 1rem;
+  line-height: 1.25;
   text-align: center;
-  letter-spacing: 1px;
   text-decoration: none;
 }
 
-.btn-outline {
-  box-shadow: inset 0 0 0 1px currentColor;
+.lh-none {
+  line-height: 0;
 }
 
-.icon {
-  width: 1.5rem;
-  height: 1.5rem;
-  box-sizing: content-box;
+.ellipse {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
-.icon svg {
+.svg [stroke] {
   stroke: currentColor;
 }
 
-.tooltip {
-  position: absolute;
-  top: calc(100% + 1rem);
-  left: 50%;
-  transform: translateX(-50%) scale(0.75);
-  transform-origin: 50% -1rem;
-  opacity: 0;
-  visibility: hidden;
-  cursor: default;
-  z-index: 1;
-  transition-property: opacity, visibility, transform;
-  transition-duration: 0.15s;
-  transition-timing-function: ease-in-out;
+.svg [fill]:not([fill=none]) {
+  fill: currentColor;
 }
 
-/* tooltip arrow */
-.tooltip::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 50%;
-  transform: translate(-50%, -1rem);
-  display: block;
-  width: 2.5rem;
-  height: 1.5rem;
-  background-image: url("assets/tooltip-arrow.svg");
-  background-size: 100%;
+.icon-grid {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin: 0 -0.5rem -1rem;
 }
 
-.icon:hover .tooltip {
-  opacity: 1;
-  visibility: visible;
-  transform: translateX(-50%) scale(1);
-  transition-delay: 0.15s;
-}
\ No newline at end of file
+.icon-grid li {
+  width: 100%;
+  padding: 0 0.5rem 1rem;
+}
+
+/* medium breakpoint */
+@media (min-width: 30em) {
+  .icon-grid li {
+    width: 50%;
+  }
+}
+
+/* large breakpoint */
+@media (min-width: 60em) {
+  .icon-grid li {
+    width: 25%;
+  }
+}
+
+/* if supported, use grid layout  */
+@supports (display: grid) {
+  .icon-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr));
+    grid-gap: 1rem;
+    margin: 0;
+  }
+
+  /* override default styles */
+  .icon-grid li {
+    width: 100%;
+    padding: 0;
+  }
+}
diff --git a/svgo-config.yml b/svgo-config.yml
new file mode 100644
index 0000000..38a34f3
--- /dev/null
+++ b/svgo-config.yml
@@ -0,0 +1,3 @@
+plugins:
+  - removeTitle: true
+  - convertShapeToPath: false