diff --git a/apps/web/src/app/features/account/account.component.ts b/apps/web/src/app/features/account/account.component.ts
index e57a21c..a11fee8 100644
--- a/apps/web/src/app/features/account/account.component.ts
+++ b/apps/web/src/app/features/account/account.component.ts
@@ -65,7 +65,7 @@ export class AccountComponent implements OnInit {
       [
         {
           title: 'Home',
-          icon: 'home_outline.svg',
+          icon: 'home.svg',
           id: 'home',
         },
         {
@@ -80,12 +80,12 @@ export class AccountComponent implements OnInit {
     if (this.authService.isPlatform()) {
       baseMenu[0].push({
         title: 'Connected',
-        icon: 'groups_outline.svg',
+        icon: 'groups.svg',
         id: 'connected-accounts',
       });
       baseMenu[0].push({
         title: 'Products',
-        icon: 'package_outline.svg',
+        icon: 'package.svg',
         id: 'products',
       });
       baseMenu[0].push({
@@ -98,7 +98,7 @@ export class AccountComponent implements OnInit {
     // Add Settings at the bottom
     baseMenu[0].push({
       title: 'Settings',
-      icon: 'person_outline.svg',
+      icon: 'person.svg',
       id: 'settings',
       bottom: true,
     });
diff --git a/apps/web/src/app/features/account/components/add-funds-panel/add-funds-panel.component.html b/apps/web/src/app/features/account/components/add-funds-panel/add-funds-panel.component.html
index 4788885..71e0c2b 100644
--- a/apps/web/src/app/features/account/components/add-funds-panel/add-funds-panel.component.html
+++ b/apps/web/src/app/features/account/components/add-funds-panel/add-funds-panel.component.html
@@ -11,7 +11,7 @@
   <div class="add-funds-header">
     <img
       class="add-funds-icon"
-      src="assets/icons/account_balance_wallet_outline.svg"
+      src="assets/icons/account_balance_wallet.svg"
       alt="Wallet"
     />
     <h3 class="add-funds-title">Add funds to your balance</h3>
diff --git a/apps/web/src/app/features/account/components/transaction-list/components/payout-detail/payout-detail.component.html b/apps/web/src/app/features/account/components/transaction-list/components/payout-detail/payout-detail.component.html
index 57bfd8a..98fb8cc 100644
--- a/apps/web/src/app/features/account/components/transaction-list/components/payout-detail/payout-detail.component.html
+++ b/apps/web/src/app/features/account/components/transaction-list/components/payout-detail/payout-detail.component.html
@@ -27,7 +27,7 @@ <h3 class="panel-section-title">Overview</h3>
       <span class="panel-value">
         <div class="panel-badge">
           <img
-            src="assets/icons/account_balance_wallet_outline.svg"
+            src="assets/icons/account_balance_wallet.svg"
             alt="Wallet"
             class="panel-badge-icon"
           />
diff --git a/apps/web/src/app/features/account/components/transaction-list/components/topup-detail/topup-detail.component.html b/apps/web/src/app/features/account/components/transaction-list/components/topup-detail/topup-detail.component.html
index d1afa50..7c88b56 100644
--- a/apps/web/src/app/features/account/components/transaction-list/components/topup-detail/topup-detail.component.html
+++ b/apps/web/src/app/features/account/components/transaction-list/components/topup-detail/topup-detail.component.html
@@ -27,7 +27,7 @@ <h3 class="panel-section-title">Overview</h3>
       <span class="panel-value">
         <div class="panel-badge">
           <img
-            src="assets/icons/account_balance_wallet_outline.svg"
+            src="assets/icons/account_balance_wallet.svg"
             alt="Wallet"
             class="panel-badge-icon"
           />
diff --git a/apps/web/src/app/features/account/dashboard/dashboard.component.html b/apps/web/src/app/features/account/dashboard/dashboard.component.html
index e4ba091..40f0910 100644
--- a/apps/web/src/app/features/account/dashboard/dashboard.component.html
+++ b/apps/web/src/app/features/account/dashboard/dashboard.component.html
@@ -7,11 +7,7 @@ <h1>Hi {{ personService.person()?.first_name }} 👋</h1>
       class="action-button action-button-dainty"
       (click)="OnAddFundsClick()"
     >
-      <img
-        class="button-icon"
-        src="assets/icons/add_circle_outline.svg"
-        alt=""
-      />
+      <img class="button-icon" src="assets/icons/add_circle.svg" alt="" />
       <span>Add funds</span>
     </button>
     }
diff --git a/apps/web/src/app/features/account/developers/developers.component.html b/apps/web/src/app/features/account/developers/developers.component.html
index c3f9b3d..f631721 100644
--- a/apps/web/src/app/features/account/developers/developers.component.html
+++ b/apps/web/src/app/features/account/developers/developers.component.html
@@ -16,11 +16,7 @@ <h1>Developers</h1>
       class="action-button action-button-dainty"
       (click)="OnCreateApiKeyClick()"
     >
-      <img
-        class="button-icon"
-        src="assets/icons/add_circle_outline.svg"
-        alt=""
-      />
+      <img class="button-icon" src="assets/icons/add_circle.svg" alt="" />
       <span>Create key</span>
     </button>
   </div>
@@ -72,11 +68,7 @@ <h1>Developers</h1>
       class="action-button action-button-dainty"
       (click)="OnCreateWebhookClick()"
     >
-      <img
-        class="button-icon"
-        src="assets/icons/add_circle_outline.svg"
-        alt=""
-      />
+      <img class="button-icon" src="assets/icons/add_circle.svg" alt="" />
       <span>Add endpoint</span>
     </button>
   </div>
diff --git a/apps/web/src/app/features/account/products/views/price-detail/price-detail.component.html b/apps/web/src/app/features/account/products/views/price-detail/price-detail.component.html
index 3f17019..6aedae5 100644
--- a/apps/web/src/app/features/account/products/views/price-detail/price-detail.component.html
+++ b/apps/web/src/app/features/account/products/views/price-detail/price-detail.component.html
@@ -33,7 +33,7 @@ <h4>This price has been archived</h4>
 
 <div class="flex align-vert space-between mb-snug">
   <div class="flex gap-extra-small align-vert dimmed-extra">
-    <img src="assets/icons/sell_outline.svg" class="icon" alt="Sale tag icon" />
+    <img src="assets/icons/sell.svg" class="icon" alt="Sale tag icon" />
     <div>PRICE</div>
   </div>
   <div
diff --git a/apps/web/src/app/features/account/products/views/product-catalogue/product-catalogue.component.ts b/apps/web/src/app/features/account/products/views/product-catalogue/product-catalogue.component.ts
index 56df2ec..99b92aa 100644
--- a/apps/web/src/app/features/account/products/views/product-catalogue/product-catalogue.component.ts
+++ b/apps/web/src/app/features/account/products/views/product-catalogue/product-catalogue.component.ts
@@ -46,7 +46,7 @@ export class ProductCatalogueComponent implements OnInit, OnDestroy {
       type: 'text',
       bolded: true,
       imageField: 'images[0]',
-      placeholderIcon: 'package_outline.svg',
+      placeholderIcon: 'package.svg',
     },
     {
       header: 'Pricing',
diff --git a/apps/web/src/app/features/account/products/views/product-detail/product-detail.component.html b/apps/web/src/app/features/account/products/views/product-detail/product-detail.component.html
index d5fb7d4..a5d0dbb 100644
--- a/apps/web/src/app/features/account/products/views/product-detail/product-detail.component.html
+++ b/apps/web/src/app/features/account/products/views/product-detail/product-detail.component.html
@@ -10,7 +10,7 @@
         <div class="product-image-placeholder">
           <img
             class="icon large-icon"
-            src="assets/icons/package_outline.svg"
+            src="assets/icons/package.svg"
             alt="Product image"
           />
         </div>
@@ -130,11 +130,7 @@ <h2 class="section-title">Details</h2>
           class="action-button action-button-small outline"
           (click)="OnEdit()"
         >
-          <img
-            src="assets/icons/edit_outline.svg"
-            class="icon"
-            alt="Edit icon"
-          />
+          <img src="assets/icons/edit.svg" class="icon" alt="Edit icon" />
         </button>
       </div>
       <div class="attribute">
@@ -225,11 +221,7 @@ <h2 class="section-title">Metadata</h2>
           class="action-button action-button-small outline"
           (click)="OnEdit()"
         >
-          <img
-            src="assets/icons/edit_outline.svg"
-            class="icon"
-            alt="Edit icon"
-          />
+          <img src="assets/icons/edit.svg" class="icon" alt="Edit icon" />
         </button>
       </div>
       @if (MetadataEntries(p.metadata).length > 0) { @for (entry of
diff --git a/apps/web/src/app/features/setup/setup.component.html b/apps/web/src/app/features/setup/setup.component.html
index 0fd2c6d..f6618b2 100644
--- a/apps/web/src/app/features/setup/setup.component.html
+++ b/apps/web/src/app/features/setup/setup.component.html
@@ -27,33 +27,21 @@ <h1>Welcome to Zoneless</h1>
 
       <div class="feature-list">
         <div class="feature-item">
-          <img
-            class="feature-icon"
-            src="assets/icons/bolt_outline.svg"
-            alt=""
-          />
+          <img class="feature-icon" src="assets/icons/bolt.svg" alt="" />
           <div class="feature-text">
             <strong>Instant payouts</strong>
             <span>Instant USDC payouts to your sellers</span>
           </div>
         </div>
         <div class="feature-item">
-          <img
-            class="feature-icon"
-            src="assets/icons/globe_outline.svg"
-            alt=""
-          />
+          <img class="feature-icon" src="assets/icons/globe.svg" alt="" />
           <div class="feature-text">
             <strong>Global payouts</strong>
             <span>Payouts to anywhere in the world</span>
           </div>
         </div>
         <div class="feature-item">
-          <img
-            class="feature-icon"
-            src="assets/icons/savings_outline.svg"
-            alt=""
-          />
+          <img class="feature-icon" src="assets/icons/savings.svg" alt="" />
           <div class="feature-text">
             <strong>Near-zero fees</strong>
             <span>No platform fees — just minimal Solana gas</span>
@@ -62,7 +50,7 @@ <h1>Welcome to Zoneless</h1>
         <div class="feature-item">
           <img
             class="feature-icon"
-            src="assets/icons/lock_open_right_outline.svg"
+            src="assets/icons/lock_open_right.svg"
             alt=""
           />
           <div class="feature-text">
diff --git a/apps/web/src/assets/icons/account_balance_wallet_outline.svg b/apps/web/src/assets/icons/account_balance_wallet.svg
similarity index 100%
rename from apps/web/src/assets/icons/account_balance_wallet_outline.svg
rename to apps/web/src/assets/icons/account_balance_wallet.svg
diff --git a/apps/web/src/assets/icons/add_circle_outline.svg b/apps/web/src/assets/icons/add_circle.svg
similarity index 100%
rename from apps/web/src/assets/icons/add_circle_outline.svg
rename to apps/web/src/assets/icons/add_circle.svg
diff --git a/apps/web/src/assets/icons/add_image_outline.svg b/apps/web/src/assets/icons/add_image.svg
similarity index 100%
rename from apps/web/src/assets/icons/add_image_outline.svg
rename to apps/web/src/assets/icons/add_image.svg
diff --git a/apps/web/src/assets/icons/bolt_outline.svg b/apps/web/src/assets/icons/bolt.svg
similarity index 100%
rename from apps/web/src/assets/icons/bolt_outline.svg
rename to apps/web/src/assets/icons/bolt.svg
diff --git a/apps/web/src/assets/icons/check_circle.svg b/apps/web/src/assets/icons/check_circle.svg
index fa7e045..51f9796 100644
--- a/apps/web/src/assets/icons/check_circle.svg
+++ b/apps/web/src/assets/icons/check_circle.svg
@@ -1,2 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m424-296 282-282-56-56-226 226-114-114-56 56 170 170Zm56 216q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
-
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#000"><path d="m421-298 283-283-46-45-237 237-120-120-45 45 165 166Zm59 218q-82 0-155-31.5t-127.5-86Q143-252 111.5-325T80-480q0-83 31.5-156t86-127Q252-817 325-848.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 82-31.5 155T763-197.5q-54 54.5-127 86T480-80Zm0-60q142 0 241-99.5T820-480q0-142-99-241t-241-99q-141 0-240.5 99T140-480q0 141 99.5 240.5T480-140Zm0-340Z"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/assets/icons/edit.svg b/apps/web/src/assets/icons/edit.svg
index 75f0fa7..8f19b2b 100644
--- a/apps/web/src/assets/icons/edit.svg
+++ b/apps/web/src/assets/icons/edit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="m39.7 14.7-6.4-6.4 2.1-2.1q.85-.85 2.125-.825 1.275.025 2.125.875L41.8 8.4q.85.85.85 2.1t-.85 2.1Zm-2.1 2.1L12.4 42H6v-6.4l25.2-25.2Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#000"><path d="M180-180h44l472-471-44-44-472 471v44Zm-60 60v-128l575-574q8-8 19-12.5t23-4.5q11 0 22 4.5t20 12.5l44 44q9 9 13 20t4 22q0 11-4.5 22.5T823-694L248-120H120Zm659-617-41-41 41 41Zm-105 64-22-22 44 44-22-22Z"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/assets/icons/edit_outline.svg b/apps/web/src/assets/icons/edit_outline.svg
deleted file mode 100644
index 8f19b2b..0000000
--- a/apps/web/src/assets/icons/edit_outline.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#000"><path d="M180-180h44l472-471-44-44-472 471v44Zm-60 60v-128l575-574q8-8 19-12.5t23-4.5q11 0 22 4.5t20 12.5l44 44q9 9 13 20t4 22q0 11-4.5 22.5T823-694L248-120H120Zm659-617-41-41 41 41Zm-105 64-22-22 44 44-22-22Z"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/assets/icons/globe_outline.svg b/apps/web/src/assets/icons/globe.svg
similarity index 100%
rename from apps/web/src/assets/icons/globe_outline.svg
rename to apps/web/src/assets/icons/globe.svg
diff --git a/apps/web/src/assets/icons/groups_outline.svg b/apps/web/src/assets/icons/groups.svg
similarity index 100%
rename from apps/web/src/assets/icons/groups_outline.svg
rename to apps/web/src/assets/icons/groups.svg
diff --git a/apps/web/src/assets/icons/home_outline.svg b/apps/web/src/assets/icons/home.svg
similarity index 100%
rename from apps/web/src/assets/icons/home_outline.svg
rename to apps/web/src/assets/icons/home.svg
diff --git a/apps/web/src/assets/icons/info.svg b/apps/web/src/assets/icons/info.svg
index 2163994..8625a6c 100644
--- a/apps/web/src/assets/icons/info.svg
+++ b/apps/web/src/assets/icons/info.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="M22.1 34.55h4.1V22h-4.1Zm1.9-15.5q1.05 0 1.725-.675T26.4 16.7q0-1.1-.7-1.775-.7-.675-1.7-.675-1.05 0-1.725.675T21.6 16.65q0 1.05.7 1.725t1.7.675Zm0 26.2q-4.4 0-8.275-1.65T8.95 39.05q-2.9-2.9-4.55-6.75T2.75 24q0-4.45 1.65-8.325 1.65-3.875 4.55-6.75t6.75-4.55Q19.55 2.7 24 2.7q4.45 0 8.325 1.675 3.875 1.675 6.75 4.55t4.55 6.75Q45.3 19.55 45.3 24q0 4.45-1.675 8.3-1.675 3.85-4.55 6.725-2.875 2.875-6.75 4.55Q28.45 45.25 24 45.25Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#000"><path d="M453-280h60v-240h-60v240Zm50.5-323.2q9.5-9.2 9.5-22.8 0-14.45-9.48-24.22-9.48-9.78-23.5-9.78t-23.52 9.78Q447-640.45 447-626q0 13.6 9.48 22.8 9.48 9.2 23.5 9.2t23.52-9.2ZM480.27-80q-82.74 0-155.5-31.5Q252-143 197.5-197.5t-86-127.34Q80-397.68 80-480.5t31.5-155.66Q143-709 197.5-763t127.34-85.5Q397.68-880 480.5-880t155.66 31.5Q709-817 763-763t85.5 127Q880-563 880-480.27q0 82.74-31.5 155.5Q817-252 763-197.68q-54 54.31-127 86Q563-80 480.27-80Zm.23-60Q622-140 721-239.5t99-241Q820-622 721.19-721T480-820q-141 0-240.5 98.81T140-480q0 141 99.5 240.5t241 99.5Zm-.5-340Z"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/assets/icons/lock_open_right_outline.svg b/apps/web/src/assets/icons/lock_open_right.svg
similarity index 100%
rename from apps/web/src/assets/icons/lock_open_right_outline.svg
rename to apps/web/src/assets/icons/lock_open_right.svg
diff --git a/apps/web/src/assets/icons/package_outline.svg b/apps/web/src/assets/icons/package.svg
similarity index 100%
rename from apps/web/src/assets/icons/package_outline.svg
rename to apps/web/src/assets/icons/package.svg
diff --git a/apps/web/src/assets/icons/person_outline.svg b/apps/web/src/assets/icons/person.svg
similarity index 100%
rename from apps/web/src/assets/icons/person_outline.svg
rename to apps/web/src/assets/icons/person.svg
diff --git a/apps/web/src/assets/icons/savings_outline.svg b/apps/web/src/assets/icons/savings.svg
similarity index 100%
rename from apps/web/src/assets/icons/savings_outline.svg
rename to apps/web/src/assets/icons/savings.svg
diff --git a/apps/web/src/assets/icons/sell_outline.svg b/apps/web/src/assets/icons/sell.svg
similarity index 100%
rename from apps/web/src/assets/icons/sell_outline.svg
rename to apps/web/src/assets/icons/sell.svg
diff --git a/apps/web/src/assets/icons/send_outline.svg b/apps/web/src/assets/icons/send.svg
similarity index 100%
rename from apps/web/src/assets/icons/send_outline.svg
rename to apps/web/src/assets/icons/send.svg
diff --git a/apps/web/src/assets/icons/settings_outline.svg b/apps/web/src/assets/icons/settings.svg
similarity index 100%
rename from apps/web/src/assets/icons/settings_outline.svg
rename to apps/web/src/assets/icons/settings.svg