diff --git a/src/components/Admin/DetailsRow.svelte b/src/components/Admin/DetailsRow.svelte
index 35bacd7a..6062dcf0 100644
--- a/src/components/Admin/DetailsRow.svelte
+++ b/src/components/Admin/DetailsRow.svelte
@@ -13,7 +13,7 @@
     import ContentFooter from "./ContentFooter.svelte";
     import Tooltip from "./Tooltip.svelte";
     import { t } from "../../i18n/store";
-    import Copy from "../icons/Copy.svelte";
+    import Copy from "../icons/actions/Copy.svelte";
 
     import type { Tracking, Link } from "../../../src/openapi/client/index.ts";
     import type { Snippet } from "svelte";
diff --git a/src/components/Admin/ExportCsv.svelte b/src/components/Admin/ExportCsv.svelte
index 55577b4f..1e5335ef 100644
--- a/src/components/Admin/ExportCsv.svelte
+++ b/src/components/Admin/ExportCsv.svelte
@@ -4,8 +4,8 @@
         apiGatewayChargesGetCollection,
         type ApiGatewayChargesGetCollectionData,
     } from "../../openapi/client";
-    import Download from "../icons/Download.svelte";
-    import Spinner from "../icons/Spinner.svelte";
+    import Download from "../icons/actions/Download.svelte";
+    import Spinner from "../icons/status/Spinner.svelte";
     import Button from "../library/buttons/Button.svelte";
 
     let { filters } = $props<{
diff --git a/src/components/Admin/Filters.svelte b/src/components/Admin/Filters.svelte
index d949ccaf..dc2f0f1d 100644
--- a/src/components/Admin/Filters.svelte
+++ b/src/components/Admin/Filters.svelte
@@ -3,7 +3,7 @@
     import Bullet from "../../components/icons/Bullet.svelte";
     import { t } from "../../i18n/store";
     import { type ApiGatewayChargesGetCollectionData } from "../../openapi/client/index";
-    import FiltersIcon from "../icons/Filters.svelte";
+    import FiltersIcon from "../icons/filters/Filters.svelte";
     import Button from "../library/buttons/Button.svelte";
     import Grid from "../library/layout/Grid.svelte";
 
diff --git a/src/components/Admin/FiltersTags.svelte b/src/components/Admin/FiltersTags.svelte
index a0fa6504..1f0a63c9 100644
--- a/src/components/Admin/FiltersTags.svelte
+++ b/src/components/Admin/FiltersTags.svelte
@@ -2,7 +2,7 @@
     import { locale } from "../../i18n/store";
     import { t } from "../../i18n/store";
     import { formatDate } from "../../utils/dates";
-    import CloseIcon from "../icons/Close.svelte";
+    import CloseIcon from "../icons/navigation/Close.svelte";
     import Tag from "../library/tags/Tag.svelte";
 
     import type { Locale } from "../../i18n/locales";
diff --git a/src/components/Admin/Search.svelte b/src/components/Admin/Search.svelte
index 687b5090..3cba6c00 100644
--- a/src/components/Admin/Search.svelte
+++ b/src/components/Admin/Search.svelte
@@ -6,8 +6,8 @@
         apiUsersGetCollection,
     } from "../../openapi/client";
     import { highlightMatch } from "../../utils/highlights";
-    import CloseIcon from "../icons/Close.svelte";
-    import SearchIcon from "../icons/Search.svelte";
+    import SearchIcon from "../icons/actions/Search.svelte";
+    import CloseIcon from "../icons/navigation/Close.svelte";
 
     import type { ProjectJsonld, TipjarJsonld, UserJsonld } from "../../openapi/client/index";
 
diff --git a/src/components/Admin/Table.svelte b/src/components/Admin/Table.svelte
index 77b9246e..235a61a2 100644
--- a/src/components/Admin/Table.svelte
+++ b/src/components/Admin/Table.svelte
@@ -18,7 +18,7 @@
     import { t } from "../../i18n/store";
     import { isLoading, itemsPerPage, sortOptions } from "../../stores/chargesPaginationAndSort.ts";
     import { formatCurrency } from "../../utils/currencies";
-    import Chevron from "../icons/Chevron.svelte";
+    import Chevron from "../icons/navigation/Chevron.svelte";
     import Loader from "../library/feedback/Loader.svelte";
     import Tag from "../library/tags/Tag.svelte";
 
diff --git a/src/components/Checkout/CartButton.svelte b/src/components/Checkout/CartButton.svelte
index fa4a71d1..92e79baf 100644
--- a/src/components/Checkout/CartButton.svelte
+++ b/src/components/Checkout/CartButton.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { cartCount } from "../../stores/cart";
-    import Bag from "../icons/Bag.svelte";
+    import Bag from "../icons/commerce/Bag.svelte";
 </script>
 
 <a href="/checkout">
diff --git a/src/components/Checkout/CartItem.svelte b/src/components/Checkout/CartItem.svelte
index 2577f35f..3f2ac73d 100644
--- a/src/components/Checkout/CartItem.svelte
+++ b/src/components/Checkout/CartItem.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { t } from "../../i18n/store";
     import { formatCurrency } from "../../utils/currencies";
-    import MoreAndLess from "../icons/MoreAndLess.svelte";
+    import MoreAndLess from "../icons/filters/MoreAndLess.svelte";
 
     import type { CartItem } from "../../stores/cart";
 
diff --git a/src/components/Checkout/Steps.svelte b/src/components/Checkout/Steps.svelte
index 2c2b85e4..9d5191ce 100644
--- a/src/components/Checkout/Steps.svelte
+++ b/src/components/Checkout/Steps.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import WarningIcon from "../../components/icons/Warning.svelte";
+    import WarningIcon from "../../components/icons/status/Warning.svelte";
     import { t } from "../../i18n/store";
 
     export let step = 1;
diff --git a/src/components/Checkout/Summary.svelte b/src/components/Checkout/Summary.svelte
index e545efb5..f8e49266 100644
--- a/src/components/Checkout/Summary.svelte
+++ b/src/components/Checkout/Summary.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import WarningIcon from "../../components/icons/Warning.svelte";
+    import WarningIcon from "../../components/icons/status/Warning.svelte";
     import { t } from "../../i18n/store";
     import { cartAmount, cartByRecipient } from "../../stores/cart";
     import { formatCurrency } from "../../utils/currencies";
diff --git a/src/components/Player/Player.svelte b/src/components/Player/Player.svelte
index c1fd302a..30e5b0fe 100644
--- a/src/components/Player/Player.svelte
+++ b/src/components/Player/Player.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import PeerTube from "./PeerTube.svelte";
     import { t } from "../../i18n/store";
-    import Spinner from "../icons/Spinner.svelte";
+    import Spinner from "../icons/status/Spinner.svelte";
     import Loader from "../library/feedback/Loader.svelte";
 
     let {
diff --git a/src/components/admin/ChatTextarea.svelte b/src/components/admin/ChatTextarea.svelte
index 51306314..736138e1 100644
--- a/src/components/admin/ChatTextarea.svelte
+++ b/src/components/admin/ChatTextarea.svelte
@@ -2,7 +2,7 @@
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
     import { t } from "../../i18n/store";
-    import Send from "../icons/Send.svelte";
+    import Send from "../icons/actions/Send.svelte";
 
     let { class: classes = "" } = $props<{
         class?: ClassNameValue;
diff --git a/src/components/header/HeaderButtons.svelte b/src/components/header/HeaderButtons.svelte
index 482870c3..5fce1f1f 100644
--- a/src/components/header/HeaderButtons.svelte
+++ b/src/components/header/HeaderButtons.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { t } from "../../i18n/store";
-    import SearchIcon from "../icons/Search.svelte";
+    import SearchIcon from "../icons/actions/Search.svelte";
     import Button from "../library/buttons/Button.svelte";
 
     function openSearch() {
diff --git a/src/components/header/LanguagesDropdown.svelte b/src/components/header/LanguagesDropdown.svelte
index 17d0c951..1716d6c7 100644
--- a/src/components/header/LanguagesDropdown.svelte
+++ b/src/components/header/LanguagesDropdown.svelte
@@ -2,8 +2,8 @@
     import { clickOutside } from "flowbite-svelte";
 
     import { getLanguageDisplayName } from "../../utils/lang";
-    import Chevron from "../icons/Chevron.svelte";
     import LanguageIcon from "../icons/LanguageIcon.svelte";
+    import Chevron from "../icons/navigation/Chevron.svelte";
 
     let { languages, selected, onSelect } = $props();
 
diff --git a/src/components/header/UiLanguages.svelte b/src/components/header/UiLanguages.svelte
index 767772fe..1b46f615 100644
--- a/src/components/header/UiLanguages.svelte
+++ b/src/components/header/UiLanguages.svelte
@@ -4,7 +4,7 @@
     import { languagesList } from "../../i18n/locales";
     import { locale } from "../../i18n/store";
     import { getLanguageDisplayName } from "../../utils/lang";
-    import Chevron from "../icons/Chevron.svelte";
+    import Chevron from "../icons/navigation/Chevron.svelte";
 
     const languages = Object.keys(languagesList) as (keyof typeof languagesList)[];
 
diff --git a/src/components/home/CampaignCard.svelte b/src/components/home/CampaignCard.svelte
index 3ffd68f6..81be41ef 100644
--- a/src/components/home/CampaignCard.svelte
+++ b/src/components/home/CampaignCard.svelte
@@ -10,7 +10,7 @@ Converted from CampaignCard.astro to maintain exact functionality
     import { t } from "../../i18n/store";
     import { formatCurrency } from "../../utils/currencies";
     import CampaignStatusBadge from "../home/CampaignStatusBadge.svelte";
-    import Flames from "../icons/Flames.svelte";
+    import Flames from "../icons/status/Flames.svelte";
     import Tag from "../library/tags/Tag.svelte";
 
     import type { Campaign, CampaignSize } from "../../types/campaign";
diff --git a/src/components/home/Campaigns.astro b/src/components/home/Campaigns.astro
index 325f33c2..8f77081d 100644
--- a/src/components/home/Campaigns.astro
+++ b/src/components/home/Campaigns.astro
@@ -1,7 +1,7 @@
 ---
 import CampaignCard from "./CampaignCard.svelte";
 import type { Campaign } from "../../types/campaign";
-import Arrow from "../../components/icons/Arrow.svelte";
+import Arrow from "../../components/icons/navigation/Arrow.svelte";
 import { apiProjectsGetCollection, type Accounting, type Money } from "../../openapi/client";
 import { getLanguage } from "../../middleware/utils";
 import { client } from "../../openapi/client/client.gen";
diff --git a/src/components/home/CampaignsTabsNav.svelte b/src/components/home/CampaignsTabsNav.svelte
index 4030b132..c4fe6278 100644
--- a/src/components/home/CampaignsTabsNav.svelte
+++ b/src/components/home/CampaignsTabsNav.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import Clock from "../../components/icons/Clock.svelte";
     import { t } from "../../i18n/store";
-    import Flames from "../icons/Flames.svelte";
-    import Flash from "../icons/Flash.svelte";
+    import Flames from "../icons/status/Flames.svelte";
+    import Flash from "../icons/media/Flash.svelte";
     import Tabs from "../library/layout/Tabs.svelte";
 
     interface Props {
diff --git a/src/components/home/FeaturedPromoters.astro b/src/components/home/FeaturedPromoters.astro
index 0d4158ce..d766d972 100644
--- a/src/components/home/FeaturedPromoters.astro
+++ b/src/components/home/FeaturedPromoters.astro
@@ -1,7 +1,7 @@
 ---
 import PromoterCard from "./PromoterCard.astro";
 import type { Promoter } from "../../types/promoter";
-import Arrow from "../../components/icons/Arrow.svelte";
+import Arrow from "../../components/icons/navigation/Arrow.svelte";
 import Grid from "../library/layout/Grid.svelte";
 
 const { t } = Astro.locals;
diff --git a/src/components/home/HomeBanner.svelte b/src/components/home/HomeBanner.svelte
index 8815937c..faa64d00 100644
--- a/src/components/home/HomeBanner.svelte
+++ b/src/components/home/HomeBanner.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import Close from "../icons/Close.svelte";
+    import Close from "../icons/navigation/Close.svelte";
     import Button from "../library/buttons/Button.svelte";
 
     interface Props {
diff --git a/src/components/home/PromoterCard.astro b/src/components/home/PromoterCard.astro
index 70c19dc0..4cc30a75 100644
--- a/src/components/home/PromoterCard.astro
+++ b/src/components/home/PromoterCard.astro
@@ -1,6 +1,6 @@
 ---
 import type { Promoter } from "../../types/promoter";
-import ShareIcon from "../icons/Share.svelte";
+import ShareIcon from "../icons/actions/Share.svelte";
 
 export interface Props {
     promoter: Promoter;
diff --git a/src/components/home/Resources.astro b/src/components/home/Resources.astro
index 22ea346b..201087fe 100644
--- a/src/components/home/Resources.astro
+++ b/src/components/home/Resources.astro
@@ -1,6 +1,6 @@
 ---
 import ResourceCard from "./ResourceCard.astro";
-import Arrow from "../../components/icons/Arrow.svelte";
+import Arrow from "../../components/icons/navigation/Arrow.svelte";
 import Grid from "../library/layout/Grid.svelte";
 
 const { t } = Astro.locals;
diff --git a/src/components/library/buttons/ActionableButton.svelte b/src/components/library/buttons/ActionableButton.svelte
index 2b31a489..c1eca051 100644
--- a/src/components/library/buttons/ActionableButton.svelte
+++ b/src/components/library/buttons/ActionableButton.svelte
@@ -2,8 +2,8 @@
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
     import Button from "./Button.svelte";
-    import Check from "../../icons/Check.svelte";
-    import Spinner from "../../icons/Spinner.svelte";
+    import Check from "../../icons/actions/Check.svelte";
+    import Spinner from "../../icons/status/Spinner.svelte";
 
     import type { Snippet } from "svelte";
     import type { HTMLButtonAttributes } from "svelte/elements";
diff --git a/src/components/library/buttons/ReturnButton.svelte b/src/components/library/buttons/ReturnButton.svelte
index 71a14b03..ec94f10c 100644
--- a/src/components/library/buttons/ReturnButton.svelte
+++ b/src/components/library/buttons/ReturnButton.svelte
@@ -2,7 +2,7 @@
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
     import { t } from "../../../i18n/store";
-    import Back from "../../icons/Back.svelte";
+    import Back from "../../icons/navigation/Back.svelte";
 
     interface Props {
         class?: ClassNameValue;
diff --git a/src/components/library/dropdown/DropdownMenu.svelte b/src/components/library/dropdown/DropdownMenu.svelte
index faf43fbc..a6d392be 100644
--- a/src/components/library/dropdown/DropdownMenu.svelte
+++ b/src/components/library/dropdown/DropdownMenu.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import DropdownItem from "./DropdownItem.svelte";
-    import SearchIcon from "../../icons/Search.svelte";
+    import SearchIcon from "../../icons/actions/Search.svelte";
 
     import type { DropdownItemType, DropdownVariant } from "./dropdown.types";
 
diff --git a/src/components/library/feedback/Toast.svelte b/src/components/library/feedback/Toast.svelte
index c584bceb..ac3b7273 100644
--- a/src/components/library/feedback/Toast.svelte
+++ b/src/components/library/feedback/Toast.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
-    import Bookmark from "../../icons/Bookmark.svelte";
-    import Close from "../../icons/Close.svelte";
-    import ErrorIcon from "../../icons/Error.svelte";
-    import NotificationIcon from "../../icons/NotificationIcon.svelte";
-    import WarningIcon from "../../icons/Warning.svelte";
+    import Bookmark from "../../icons/actions/Bookmark.svelte";
+    import Close from "../../icons/navigation/Close.svelte";
+    import ErrorIcon from "../../icons/status/Error.svelte";
+    import NotificationIcon from "../../icons/status/NotificationIcon.svelte";
+    import WarningIcon from "../../icons/status/Warning.svelte";
 
     import type { Snippet } from "svelte";
 
diff --git a/src/components/library/inputs/Email.svelte b/src/components/library/inputs/Email.svelte
index 97f240d4..d0a2947f 100644
--- a/src/components/library/inputs/Email.svelte
+++ b/src/components/library/inputs/Email.svelte
@@ -2,7 +2,7 @@
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
     import { t } from "../../../i18n/store";
-    import CloseIcon from "../../icons/Close.svelte";
+    import CloseIcon from "../../icons/navigation/Close.svelte";
 
     interface Props {
         class?: ClassNameValue;
diff --git a/src/components/library/inputs/FileUpload.svelte b/src/components/library/inputs/FileUpload.svelte
index 86969305..8b8284bb 100644
--- a/src/components/library/inputs/FileUpload.svelte
+++ b/src/components/library/inputs/FileUpload.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { t } from "../../../i18n/store";
-    import UploadFileIcon from "../../icons/UploadFile.svelte";
-    import WarningIcon from "../../icons/Warning.svelte";
+    import UploadFileIcon from "../../icons/actions/UploadFile.svelte";
+    import WarningIcon from "../../icons/status/Warning.svelte";
 
     let {
         maxSizeMB = 20,
diff --git a/src/components/library/inputs/PasswordInput.svelte b/src/components/library/inputs/PasswordInput.svelte
index 0968026f..22baad82 100644
--- a/src/components/library/inputs/PasswordInput.svelte
+++ b/src/components/library/inputs/PasswordInput.svelte
@@ -2,7 +2,7 @@
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
     import { t } from "../../../i18n/store";
-    import Eye from "../../icons/Eye.svelte";
+    import Eye from "../../icons/media/Eye.svelte";
 
     interface Props {
         class?: ClassNameValue;
diff --git a/src/components/library/inputs/Search.svelte b/src/components/library/inputs/Search.svelte
index b598fed8..581f63fe 100644
--- a/src/components/library/inputs/Search.svelte
+++ b/src/components/library/inputs/Search.svelte
@@ -2,8 +2,8 @@
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
     import { t } from "../../../i18n/store";
-    import Close from "../../icons/Close.svelte";
-    import SearchIcon from "../../icons/Search.svelte";
+    import SearchIcon from "../../icons/actions/Search.svelte";
+    import Close from "../../icons/navigation/Close.svelte";
 
     interface Props {
         class?: ClassNameValue;
diff --git a/src/components/library/inputs/Select.svelte b/src/components/library/inputs/Select.svelte
index 5a6a0eb5..6cf42214 100644
--- a/src/components/library/inputs/Select.svelte
+++ b/src/components/library/inputs/Select.svelte
@@ -39,7 +39,7 @@
 <script lang="ts">
     import { twMerge } from "tailwind-merge";
 
-    import Chevron from "../../icons/Chevron.svelte";
+    import Chevron from "../../icons/navigation/Chevron.svelte";
 
     import type { Snippet } from "svelte";
 
diff --git a/src/components/library/layout/AccordionBox.svelte b/src/components/library/layout/AccordionBox.svelte
index cb63d52c..e96cc0d2 100644
--- a/src/components/library/layout/AccordionBox.svelte
+++ b/src/components/library/layout/AccordionBox.svelte
@@ -2,7 +2,7 @@
     import { slide } from "svelte/transition";
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
-    import Chevron from "../../icons/Chevron.svelte";
+    import Chevron from "../../icons/navigation/Chevron.svelte";
 
     import type { Snippet } from "svelte";
 
diff --git a/src/components/library/layout/Carousel.svelte b/src/components/library/layout/Carousel.svelte
index 41603e6c..afdc012e 100644
--- a/src/components/library/layout/Carousel.svelte
+++ b/src/components/library/layout/Carousel.svelte
@@ -2,7 +2,7 @@
     import { onMount, tick, type Snippet } from "svelte";
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
-    import ArrowSliderIcon from "../../icons/ArrowSliderIcon.svelte";
+    import ArrowSliderIcon from "../../icons/navigation/ArrowSliderIcon.svelte";
     import ProjectUpdate from "../../project/ProjectUpdate.svelte";
 
     // Browser check for SSR compatibility
diff --git a/src/components/library/share/CopyUrl.svelte b/src/components/library/share/CopyUrl.svelte
index 929e2bc3..359b0c5c 100644
--- a/src/components/library/share/CopyUrl.svelte
+++ b/src/components/library/share/CopyUrl.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { t } from "../../../i18n/store";
     import Tooltip from "../../admin/Tooltip.svelte";
-    import WebIcon from "../../icons/Web.svelte";
+    import WebIcon from "../../icons/media/Web.svelte";
 
     interface Props {
         url?: string;
diff --git a/src/components/library/share/Iframe.svelte b/src/components/library/share/Iframe.svelte
index 6b3c3258..763d1e62 100644
--- a/src/components/library/share/Iframe.svelte
+++ b/src/components/library/share/Iframe.svelte
@@ -2,7 +2,7 @@
     import { Modal } from "flowbite-svelte";
 
     import { t } from "../../../i18n/store";
-    import Code from "../../icons/Code.svelte";
+    import Code from "../../icons/media/Code.svelte";
     import Loader from "../feedback/Loader.svelte";
 
     interface Props {
diff --git a/src/components/library/share/ShareButton.svelte b/src/components/library/share/ShareButton.svelte
index 3ab8c52d..0d2b46c7 100644
--- a/src/components/library/share/ShareButton.svelte
+++ b/src/components/library/share/ShareButton.svelte
@@ -6,7 +6,7 @@
     import Iframe from "./Iframe.svelte";
     import X from "./X.svelte";
     import { t } from "../../../i18n/store";
-    import ShareIcon from "../../icons/Share.svelte";
+    import ShareIcon from "../../icons/actions/Share.svelte";
 
     interface Props {
         shareText?: string;
diff --git a/src/components/profile/PeriodDropdown.svelte b/src/components/profile/PeriodDropdown.svelte
index 115eb732..eb67be0c 100644
--- a/src/components/profile/PeriodDropdown.svelte
+++ b/src/components/profile/PeriodDropdown.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { t } from "../../i18n/store";
-    import Chevron from "../icons/Chevron.svelte";
+    import Chevron from "../icons/navigation/Chevron.svelte";
 
     interface Props {
         /**
diff --git a/src/components/profile/ProfileHero.astro b/src/components/profile/ProfileHero.astro
index 88bd5ea6..a8459dc3 100644
--- a/src/components/profile/ProfileHero.astro
+++ b/src/components/profile/ProfileHero.astro
@@ -1,6 +1,6 @@
 ---
 import VerifiedBadge from "./VerifiedBadge.svelte";
-import ShareIcon from "../icons/Share.svelte";
+import ShareIcon from "../icons/actions/Share.svelte";
 
 export interface Props {
     coverImage?: string;
diff --git a/src/components/project/CategoryTag.svelte b/src/components/project/CategoryTag.svelte
index 2ca0f8e8..3b2dbbdd 100644
--- a/src/components/project/CategoryTag.svelte
+++ b/src/components/project/CategoryTag.svelte
@@ -2,7 +2,7 @@
     import { locale } from "../../i18n/store";
     import { apiCategoriesIdGet, type Category } from "../../openapi/client";
     import { extractId } from "../../utils/extractId";
-    import BookmarkIcon from "../icons/Bookmark.svelte";
+    import BookmarkIcon from "../icons/actions/Bookmark.svelte";
     import Tag from "../library/tags/Tag.svelte";
 
     interface Props {
diff --git a/src/components/project/ProjectUpdate.svelte b/src/components/project/ProjectUpdate.svelte
index cee90629..8765a8d9 100644
--- a/src/components/project/ProjectUpdate.svelte
+++ b/src/components/project/ProjectUpdate.svelte
@@ -6,8 +6,8 @@
     import { t } from "../../i18n/store";
     import { apiProjectUpdatesGetCollection } from "../../openapi/client/index";
     import { renderMarkdown } from "../../utils/renderMarkdown";
-    import AlertIcon from "../icons/AlertIcon.svelte";
-    import ShareIcon from "../icons/Share.svelte";
+    import ShareIcon from "../icons/actions/Share.svelte";
+    import AlertIcon from "../icons/status/AlertIcon.svelte";
     import Button from "../library/buttons/Button.svelte";
     import Carousel from "../library/layout/Carousel.svelte";
 
diff --git a/src/components/project/Reward.svelte b/src/components/project/Reward.svelte
index e970cce2..074cc1bb 100644
--- a/src/components/project/Reward.svelte
+++ b/src/components/project/Reward.svelte
@@ -4,7 +4,7 @@
     import { formatCurrency } from "../../utils/currencies";
     import { renderMarkdown } from "../../utils/renderMarkdown";
     import UnitIcon from "../icons/UnitIcon.svelte";
-    import UserIcon from "../icons/User.svelte";
+    import UserIcon from "../icons/user/User.svelte";
     import Button from "../library/buttons/Button.svelte";
 
     import type { Project, ProjectReward } from "../../openapi/client";
diff --git a/src/components/project/RewardModal.svelte b/src/components/project/RewardModal.svelte
index bdd3238a..94e1d90f 100644
--- a/src/components/project/RewardModal.svelte
+++ b/src/components/project/RewardModal.svelte
@@ -7,7 +7,7 @@
     import { formatCurrency, getUnit } from "../../utils/currencies";
     import { renderMarkdown } from "../../utils/renderMarkdown";
     import UnitIcon from "../icons/UnitIcon.svelte";
-    import UserIcon from "../icons/User.svelte";
+    import UserIcon from "../icons/user/User.svelte";
     import Button from "../library/buttons/Button.svelte";
 
     import type { Project, ProjectReward } from "../../openapi/client";
diff --git a/src/components/project/SingleProject.svelte b/src/components/project/SingleProject.svelte
index b30f2ebc..3dac586d 100644
--- a/src/components/project/SingleProject.svelte
+++ b/src/components/project/SingleProject.svelte
@@ -17,8 +17,8 @@
     } from "../../openapi/client/index";
     import { getLanguageDisplayName } from "../../utils/lang";
     import LanguagesDropdown from "../header/LanguagesDropdown.svelte";
-    import Arrow from "../icons/Arrow.svelte";
-    import RememberIcon from "../icons/RememberIcon.svelte";
+    import RememberIcon from "../icons/actions/RememberIcon.svelte";
+    import Arrow from "../icons/navigation/Arrow.svelte";
     import Button from "../library/buttons/Button.svelte";
     import Toast from "../library/feedback/Toast.svelte";
     import Sharebutton from "../library/share/ShareButton.svelte";
diff --git a/src/components/project/Tabs.svelte b/src/components/project/Tabs.svelte
index 7c966974..18d6eb90 100644
--- a/src/components/project/Tabs.svelte
+++ b/src/components/project/Tabs.svelte
@@ -7,7 +7,7 @@
     import ProjectUpdate from "./ProjectUpdate.svelte";
     import { t } from "../../i18n/store";
     import { renderMarkdown } from "../../utils/renderMarkdown";
-    import ArrowSliderIcon from "../icons/ArrowSliderIcon.svelte";
+    import ArrowSliderIcon from "../icons/navigation/ArrowSliderIcon.svelte";
 
     import type { Project, Accounting } from "../../openapi/client/index";
 
diff --git a/src/components/project/edit/CreateCard.svelte b/src/components/project/edit/CreateCard.svelte
index fe920289..f0c2f79e 100644
--- a/src/components/project/edit/CreateCard.svelte
+++ b/src/components/project/edit/CreateCard.svelte
@@ -3,7 +3,7 @@
     import CollabsModal from "./CollabsModal.svelte";
     import RewardsModal from "./RewardsModal.svelte";
     import { t } from "../../../i18n/store";
-    import MoreAndLess from "../../icons/MoreAndLess.svelte";
+    import MoreAndLess from "../../icons/filters/MoreAndLess.svelte";
     import Button from "../../library/buttons/Button.svelte";
 
     import type {
diff --git a/src/components/project/edit/MediaUploader.svelte b/src/components/project/edit/MediaUploader.svelte
index fea5ab52..9c97ea52 100644
--- a/src/components/project/edit/MediaUploader.svelte
+++ b/src/components/project/edit/MediaUploader.svelte
@@ -62,9 +62,9 @@
 <script lang="ts">
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
-    import CloseIcon from "../../../components/icons/Close.svelte";
+    import CloseIcon from "../../../components/icons/navigation/Close.svelte";
     import { t } from "../../../i18n/store";
-    import UploadIcon from "../../icons/UploadIcon.svelte";
+    import UploadIcon from "../../icons/actions/UploadIcon.svelte";
     import Button from "../../library/buttons/Button.svelte";
     import Loader from "../../library/feedback/Loader.svelte";
 
diff --git a/src/components/project/edit/RewardItemsSelector.svelte b/src/components/project/edit/RewardItemsSelector.svelte
index a0aeeddc..021d4ad2 100644
--- a/src/components/project/edit/RewardItemsSelector.svelte
+++ b/src/components/project/edit/RewardItemsSelector.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { t } from "../../../i18n/store";
-    import MoreAndLess from "../../icons/MoreAndLess.svelte";
+    import MoreAndLess from "../../icons/filters/MoreAndLess.svelte";
 
     let {
         value = $bindable(1),
diff --git a/src/components/project/edit/VideoUrlInput.svelte b/src/components/project/edit/VideoUrlInput.svelte
index 6c726957..fa70ab75 100644
--- a/src/components/project/edit/VideoUrlInput.svelte
+++ b/src/components/project/edit/VideoUrlInput.svelte
@@ -52,9 +52,9 @@
 <script lang="ts">
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
-    import CloseIcon from "../../../components/icons/Close.svelte";
+    import CloseIcon from "../../../components/icons/navigation/Close.svelte";
     import { t } from "../../../i18n/store";
-    import VideoIcon from "../../icons/VideoIcon.svelte";
+    import VideoIcon from "../../icons/media/VideoIcon.svelte";
     import Button from "../../library/buttons/Button.svelte";
     import TextInput from "../../library/inputs/TextInput.svelte";
 
diff --git a/src/components/search/FilterDropdown.svelte b/src/components/search/FilterDropdown.svelte
index 1bfd4d08..18dab48b 100644
--- a/src/components/search/FilterDropdown.svelte
+++ b/src/components/search/FilterDropdown.svelte
@@ -5,7 +5,7 @@ Supports: Periodo de tiempo, Estado de la campaña, Ubicación
 -->
 <script lang="ts">
     import { t } from "../../i18n/store";
-    import Chevron from "../icons/Chevron.svelte";
+    import Chevron from "../icons/navigation/Chevron.svelte";
 
     import type { HTMLButtonAttributes } from "svelte/elements";
 
diff --git a/src/components/search/SearchFilters.svelte b/src/components/search/SearchFilters.svelte
index bbf7973e..8c2531c5 100644
--- a/src/components/search/SearchFilters.svelte
+++ b/src/components/search/SearchFilters.svelte
@@ -13,7 +13,7 @@ Integrated with searchStore for state management and URL synchronization
     import SearchInput from "./SearchInput.svelte";
     import { t, setLocale } from "../../i18n/store";
     import { searchStore, searchFilters } from "../../stores/searchStore";
-    import FilterIcon from "../icons/FilterIcon.svelte";
+    import FilterIcon from "../icons/filters/FilterIcon.svelte";
 
     interface Props {
         locale?: string;
diff --git a/src/layouts/Header.svelte b/src/layouts/Header.svelte
index f22fade9..2a5f0f73 100644
--- a/src/layouts/Header.svelte
+++ b/src/layouts/Header.svelte
@@ -5,9 +5,9 @@
     import CartButton from "../components/checkout/CartButton.svelte";
     import HeaderButtons from "../components/header/HeaderButtons.svelte";
     import UiLanguages from "../components/header/UiLanguages.svelte";
-    import Hamburger from "../components/icons/Hamburger.svelte";
     import Logo from "../components/icons/Logo.svelte";
-    import UserIcon from "../components/icons/User.svelte";
+    import Hamburger from "../components/icons/navigation/Hamburger.svelte";
+    import UserIcon from "../components/icons/user/User.svelte";
     import { t } from "../i18n/store";
 
     import type { Snippet } from "svelte";
diff --git a/src/pages/[...locale]/about/Cell.svelte b/src/pages/[...locale]/about/Cell.svelte
index ded0d243..be34fc6a 100644
--- a/src/pages/[...locale]/about/Cell.svelte
+++ b/src/pages/[...locale]/about/Cell.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { twMerge, type ClassNameValue } from "tailwind-merge";
 
-    import Arrow from "../../../components/icons/Arrow.svelte";
+    import Arrow from "../../../components/icons/navigation/Arrow.svelte";
 
     import type { Snippet } from "svelte";
 
diff --git a/src/pages/[...locale]/project/[idOrSlug]/edit/ProjectEditorShell.svelte b/src/pages/[...locale]/project/[idOrSlug]/edit/ProjectEditorShell.svelte
index 1e53ae20..48af56de 100644
--- a/src/pages/[...locale]/project/[idOrSlug]/edit/ProjectEditorShell.svelte
+++ b/src/pages/[...locale]/project/[idOrSlug]/edit/ProjectEditorShell.svelte
@@ -16,8 +16,8 @@
     - Disabled tab: border-light-muted, text-light-muted
 -->
 <script lang="ts">
-    import EditIcon from "../../../../../components/icons/Edit.svelte";
-    import Eye from "../../../../../components/icons/Eye.svelte";
+    import EditIcon from "../../../../../components/icons/actions/Edit.svelte";
+    import Eye from "../../../../../components/icons/media/Eye.svelte";
     import Button from "../../../../../components/library/buttons/Button.svelte";
     import TabNavigation, {
         type Tab,