From f81613ff4933882e9c8884b0d50bc7eb8b35240a Mon Sep 17 00:00:00 2001
From: Thibaud Guillaume-Gentil <thibaud@thibaud.gg>
Date: Sun, 15 Dec 2024 10:06:25 +0100
Subject: [PATCH] SVG, switch all to rails_icons gem

This patch removes the `inline_svg` gem and moves all custom SVG icons to the
`rails_icons` gem, with the `icon` helper.
---
 Gemfile                                       |  1 -
 Gemfile.lock                                  | 10 +++-----
 app/admin/delivery.rb                         | 24 +++++--------------
 app/admin/depot.rb                            |  4 ++--
 app/admin/invoice.rb                          |  4 ++--
 app/admin/shop/order.rb                       |  8 ++-----
 app/admin/shop/special_delivery.rb            | 14 +++--------
 app/assets/images/admin/clipboard-check.svg   |  3 ---
 app/assets/images/admin/clipboard.svg         |  3 ---
 app/assets/images/admin/external-link.svg     |  3 ---
 app/assets/images/logo.svg                    |  1 -
 app/assets/images/members/basket.svg          |  1 -
 app/assets/images/members/calendar.svg        |  1 -
 app/assets/images/members/cash.svg            |  1 -
 app/assets/images/members/chevron_right.svg   |  1 -
 app/assets/images/members/close.svg           |  1 -
 .../images/members/document_download.svg      |  1 -
 app/assets/images/members/globe.svg           |  1 -
 app/assets/images/members/hand.svg            |  1 -
 app/assets/images/members/identification.svg  |  1 -
 app/assets/images/members/information.svg     |  3 ---
 app/assets/images/members/link.svg            |  1 -
 app/assets/images/members/mail.svg            |  3 ---
 app/assets/images/members/map.svg             |  1 -
 app/assets/images/members/menu.svg            |  1 -
 app/assets/images/members/minus.svg           |  1 -
 app/assets/images/members/notice.svg          |  1 -
 app/assets/images/members/participant.svg     |  1 -
 app/assets/images/members/pencil_square.svg   |  3 ---
 app/assets/images/members/phone.svg           |  1 -
 app/assets/images/members/plus.svg            |  1 -
 app/assets/images/members/scale.svg           |  1 -
 app/assets/images/members/shopping_cart.svg   |  1 -
 app/assets/images/members/sign_out.svg        |  1 -
 app/assets/images/members/trash.svg           |  1 -
 app/assets/images/members/truck.svg           |  1 -
 app/assets/images/members/user_circle.svg     |  1 -
 app/assets/images/members/warning.svg         |  1 -
 .../icons/own/file-csv.svg}                   |  0
 .../icons/own/file-pdf.svg}                   |  0
 .../icons/own/file-xlsx.svg}                  |  0
 .../{images/admin => svg/icons/own}/logo.svg  |  0
 app/helpers/activities_helper.rb              |  2 +-
 app/helpers/dashboard_helper.rb               |  8 +++----
 app/helpers/invoices_helper.rb                |  2 +-
 app/helpers/links_helper.rb                   |  5 ++--
 app/helpers/members_helper.rb                 |  2 +-
 app/views/active_admin/_site_footer.html.slim |  2 +-
 app/views/active_admin/_site_header.html.erb  |  2 +-
 .../active_admin/page/_onboarding.html.arb    | 12 +++++-----
 .../layouts/active_admin_logged_out.html.slim |  2 +-
 app/views/layouts/members/_flashes.html.slim  |  4 ++--
 app/views/layouts/members/_footer.html.slim   | 15 ++++++------
 app/views/layouts/members/_header.html.slim   |  8 +++----
 app/views/members/accounts/show.html.slim     | 12 +++++-----
 .../_activity_participation.html.slim         |  4 ++--
 app/views/members/baskets/_basket.html.slim   |  8 +++----
 app/views/members/billing/_line.html.slim     |  2 +-
 .../members/contact_sharings/show.html.slim   |  6 ++---
 app/views/members/members/_pricing.html.slim  |  2 +-
 .../members/memberships/_membership.html.slim | 16 ++++++-------
 app/views/members/shop/orders/_cart.html.slim |  8 +++----
 .../shop/orders/_finalized_order.html.slim    |  4 ++--
 .../members/shop/orders/_order.html.slim      | 10 ++++----
 app/views/members/shop/orders/show.html.slim  |  2 +-
 .../members/shop/products/_product.html.slim  |  2 +-
 .../members/shop/products/_variant.html.slim  |  4 ++--
 .../members/shop/products/index.html.slim     |  2 +-
 spec/system/members/billing_spec.rb           |  6 ++---
 69 files changed, 94 insertions(+), 166 deletions(-)
 delete mode 100644 app/assets/images/admin/clipboard-check.svg
 delete mode 100644 app/assets/images/admin/clipboard.svg
 delete mode 100644 app/assets/images/admin/external-link.svg
 delete mode 100644 app/assets/images/logo.svg
 delete mode 100644 app/assets/images/members/basket.svg
 delete mode 100644 app/assets/images/members/calendar.svg
 delete mode 100644 app/assets/images/members/cash.svg
 delete mode 100644 app/assets/images/members/chevron_right.svg
 delete mode 100644 app/assets/images/members/close.svg
 delete mode 100644 app/assets/images/members/document_download.svg
 delete mode 100644 app/assets/images/members/globe.svg
 delete mode 100644 app/assets/images/members/hand.svg
 delete mode 100644 app/assets/images/members/identification.svg
 delete mode 100644 app/assets/images/members/information.svg
 delete mode 100644 app/assets/images/members/link.svg
 delete mode 100644 app/assets/images/members/mail.svg
 delete mode 100644 app/assets/images/members/map.svg
 delete mode 100644 app/assets/images/members/menu.svg
 delete mode 100644 app/assets/images/members/minus.svg
 delete mode 100644 app/assets/images/members/notice.svg
 delete mode 100644 app/assets/images/members/participant.svg
 delete mode 100644 app/assets/images/members/pencil_square.svg
 delete mode 100644 app/assets/images/members/phone.svg
 delete mode 100644 app/assets/images/members/plus.svg
 delete mode 100644 app/assets/images/members/scale.svg
 delete mode 100644 app/assets/images/members/shopping_cart.svg
 delete mode 100644 app/assets/images/members/sign_out.svg
 delete mode 100644 app/assets/images/members/trash.svg
 delete mode 100644 app/assets/images/members/truck.svg
 delete mode 100644 app/assets/images/members/user_circle.svg
 delete mode 100644 app/assets/images/members/warning.svg
 rename app/assets/{images/admin/csv_file.svg => svg/icons/own/file-csv.svg} (100%)
 rename app/assets/{images/admin/pdf_file.svg => svg/icons/own/file-pdf.svg} (100%)
 rename app/assets/{images/admin/xlsx_file.svg => svg/icons/own/file-xlsx.svg} (100%)
 rename app/assets/{images/admin => svg/icons/own}/logo.svg (100%)

diff --git a/Gemfile b/Gemfile
index 86d39d806..1a93af4a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,6 @@ gem "cancancan"
 gem "acts_as_list"
 
 gem "simple_form"
-gem "inline_svg"
 gem "slim"
 
 gem "importmap-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ab39f604..dde39f540 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
     crass (1.0.6)
     css_parser (1.21.0)
       addressable
-    csv (3.3.0)
+    csv (3.3.1)
     date (3.4.1)
     date_validator (0.12.0)
       activemodel (>= 3)
@@ -264,9 +264,6 @@ GEM
       has_scope (>= 0.6)
       railties (>= 7.0)
       responders (>= 2)
-    inline_svg (1.10.0)
-      activesupport (>= 3.0)
-      nokogiri (>= 1.6)
     io-console (0.8.0)
     io-endpoint (0.14.0)
     io-event (1.7.4)
@@ -512,7 +509,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.9)
+    rexml (3.4.0)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
@@ -595,7 +592,7 @@ GEM
       fugit (~> 1.11.0)
       railties (>= 7.1)
       thor (~> 1.3.1)
-    sorbet-runtime (0.5.11691)
+    sorbet-runtime (0.5.11694)
     sqlite3 (2.4.1)
       mini_portile2 (~> 2.8.0)
     sqlite3 (2.4.1-arm64-darwin)
@@ -686,7 +683,6 @@ DEPENDENCIES
   icalendar
   image_processing
   importmap-rails
-  inline_svg
   kramdown
   launchy
   letter_opener
diff --git a/app/admin/delivery.rb b/app/admin/delivery.rb
index 8b0430d77..6ab31b2e6 100644
--- a/app/admin/delivery.rb
+++ b/app/admin/delivery.rb
@@ -40,21 +40,9 @@
       column :shop, ->(delivery) { status_tag(delivery.shop_configured_open?) }, class: "text-right"
     end
     actions do |delivery|
-      div do
-        link_to baskets_path(q: { delivery_id_eq: delivery.id }, format: :csv), title: "CSV" do
-          inline_svg_tag "admin/csv_file.svg", class: "w-5 h-5"
-        end
-      end
-      div do
-        link_to delivery_path(delivery, format: :xlsx), title: "XLSX" do
-          inline_svg_tag "admin/xlsx_file.svg", class: "w-5 h-5"
-        end
-      end
-      div do
-        link_to delivery_path(delivery, format: :pdf), target: "_blank", title: "PDF" do
-          inline_svg_tag "admin/pdf_file.svg", class: "w-5 h-5"
-        end
-      end
+      icon_file_link(:csv, baskets_path(q: { delivery_id_eq: delivery.id }, format: :csv), title: Delivery.human_attribute_name(:summary), size: 5) +
+      icon_file_link(:xlsx, delivery_path(delivery, format: :xlsx), title: Delivery.human_attribute_name(:summary), size: 5) +
+      icon_file_link(:pdf, delivery_path(delivery, format: :pdf), target: "_blank", title: Delivery.human_attribute_name(:sheets), size: 5)
     end
   end
 
@@ -84,9 +72,9 @@
     columns do
       column do
         panel Basket.model_name.human(count: 2), action: (
-          icon_link(:csv_file, Delivery.human_attribute_name(:summary), baskets_path(q: { delivery_id_eq: delivery.id }, format: :csv)) +
-          icon_link(:xlsx_file, Delivery.human_attribute_name(:summary), delivery_path(delivery, format: :xlsx)) +
-          icon_link(:pdf_file, Delivery.human_attribute_name(:sheets), delivery_path(delivery, format: :pdf), target: "_blank")
+          icon_file_link(:csv, baskets_path(q: { delivery_id_eq: delivery.id }, format: :csv), title: Delivery.human_attribute_name(:summary)) +
+          icon_file_link(:xlsx, delivery_path(delivery, format: :xlsx), title: Delivery.human_attribute_name(:summary)) +
+          icon_file_link(:pdf, delivery_path(delivery, format: :pdf), target: "_blank", title: Delivery.human_attribute_name(:sheets))
         ) do
           counts = delivery.basket_counts
           if counts.present?
diff --git a/app/admin/depot.rb b/app/admin/depot.rb
index a2ce0e851..860e914a4 100644
--- a/app/admin/depot.rb
+++ b/app/admin/depot.rb
@@ -86,8 +86,8 @@
       column do
         if next_delivery = depot.next_delivery
           panel t("active_admin.page.index.next_delivery", delivery: link_to(next_delivery.display_name(format: :long), next_delivery)).html_safe, action: (
-            icon_link(:xlsx_file, Delivery.human_attribute_name(:summary), delivery_path(next_delivery, format: :xlsx, depot_id: depot.id)) +
-            icon_link(:pdf_file, Delivery.human_attribute_name(:sheets), delivery_path(next_delivery, format: :pdf, depot_id: depot.id), target: "_blank")
+            icon_file_link(:xlsx, delivery_path(next_delivery, format: :xlsx, depot_id: depot.id), title: Delivery.human_attribute_name(:summary)) +
+            icon_file_link(:pdf, delivery_path(next_delivery, format: :pdf, depot_id: depot.id), target: "_blank", title: Delivery.human_attribute_name(:sheets))
           ) do
             attrs = {}
             if authorized?(:update, depot) && depot.delivery_sheets_mode == "home_delivery"
diff --git a/app/admin/invoice.rb b/app/admin/invoice.rb
index 628a2ec2f..f182a1ac8 100644
--- a/app/admin/invoice.rb
+++ b/app/admin/invoice.rb
@@ -181,7 +181,7 @@
           end
         end
         unless invoice.processing?
-          panel "PDF", action: icon_link(:pdf_file, "PDF", pdf_invoice_path(invoice), target: "_blank") do
+          panel "PDF", action: icon_file_link(:pdf, pdf_invoice_path(invoice), target: "_blank") do
             div class: "p-2" do
               link_to_invoice_pdf(invoice) do
                 image_tag invoice.pdf_file.preview(resize_to_limit: [ 2000, 2000 ]), class: "w-full"
@@ -259,7 +259,7 @@
 
   action_item :pdf, only: :show, if: -> { !resource.processing? } do
     link_to_invoice_pdf(resource, class: "action-item-button") do
-      "PDF"
+      icon "file-pdf", class: "h-5 w-5", library: "own"
     end
   end
 
diff --git a/app/admin/shop/order.rb b/app/admin/shop/order.rb
index 40092a961..8a370833c 100644
--- a/app/admin/shop/order.rb
+++ b/app/admin/shop/order.rb
@@ -285,17 +285,13 @@
   action_item :delivery_pdf, only: :index, if: -> { params.dig(:q, :_delivery_gid_eq).present? } do
     delivery_gid = params.dig(:q, :_delivery_gid_eq)
     depot_id = params.dig(:q, :depot_id_eq)
-    link_to delivery_shop_orders_path(delivery_gid: delivery_gid, depot_id: depot_id, format: :pdf), class: "action-item-button", target: "_blank", title: t(".delivery_orders_pdf") do
-      inline_svg_tag "admin/pdf_file.svg", class: "w-5 h-5"
-    end
+    icon_file_link :pdf, delivery_shop_orders_path(delivery_gid: delivery_gid, depot_id: depot_id, format: :pdf), size: 5, class: "action-item-button", target: "_blank", title: t(".delivery_orders_pdf")
   end
 
   action_item :delivery_xlsx, only: :index, if: -> { params.dig(:q, :_delivery_gid_eq).present? } do
     delivery_gid = params.dig(:q, :_delivery_gid_eq)
     depot_id = params.dig(:q, :depot_id_eq)
-    link_to delivery_shop_orders_path(delivery_gid: delivery_gid, depot_id: depot_id, format: :xlsx), class: "action-item-button", target: "_blank", title: "XLSX" do
-      inline_svg_tag "admin/xlsx_file.svg", class: "w-5 h-5"
-    end
+    icon_file_link :xlsx, delivery_shop_orders_path(delivery_gid: delivery_gid, depot_id: depot_id, format: :xlsx), size: 5, class: "action-item-button", target: "_blank"
   end
 
   batch_action :invoice, if: ->(attr) { params[:scope].in?([ nil, "pending" ]) }, confirm: true do |selection|
diff --git a/app/admin/shop/special_delivery.rb b/app/admin/shop/special_delivery.rb
index 501a4f0af..2aff8b09a 100644
--- a/app/admin/shop/special_delivery.rb
+++ b/app/admin/shop/special_delivery.rb
@@ -56,16 +56,8 @@
           q: { _delivery_gid_eq: d.gid }, scope: :all_without_cart))
     }, sortable: false, class: "text-right"
     actions do |delivery|
-      div do
-        link_to shop_special_delivery_path(delivery, format: :xlsx), title: "XLSX" do
-          inline_svg_tag "admin/xlsx_file.svg", class: "h-5 w-5"
-        end
-      end
-      div do
-        link_to delivery_shop_orders_path(delivery_gid: delivery.gid, format: :pdf), title: "PDF", target: "_blank" do
-          inline_svg_tag "admin/pdf_file.svg", class: "h-5 w-5"
-        end
-      end
+      icon_file_link(:xlsx, shop_special_delivery_path(delivery, format: :xlsx), size: 5) +
+      icon_file_link(:pdf, delivery_shop_orders_path(delivery_gid: delivery.gid, format: :pdf), target: "_blank", size: 5)
     end
   end
 
@@ -83,7 +75,7 @@
           end
         else
           all.each do |producer, items|
-            panel producer.name, action: icon_link(:xlsx_file, "XLSX", shop_special_delivery_path(delivery, format: :xlsx, producer_id: producer.id)) do
+            panel producer.name, action: icon_file_link(:xlsx, shop_special_delivery_path(delivery, format: :xlsx, producer_id: producer.id)) do
               table_for items, i18n: Shop::OrderItem, class: "table-auto data-table-total" do
                 column(:product) { |i| auto_link i.product }
                 column(:product_variant) { |i| i.product_variant }
diff --git a/app/assets/images/admin/clipboard-check.svg b/app/assets/images/admin/clipboard-check.svg
deleted file mode 100644
index 16c165c84..000000000
--- a/app/assets/images/admin/clipboard-check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4" />
-</svg>
diff --git a/app/assets/images/admin/clipboard.svg b/app/assets/images/admin/clipboard.svg
deleted file mode 100644
index 39d5f4642..000000000
--- a/app/assets/images/admin/clipboard.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
-</svg>
diff --git a/app/assets/images/admin/external-link.svg b/app/assets/images/admin/external-link.svg
deleted file mode 100644
index a74e4ad64..000000000
--- a/app/assets/images/admin/external-link.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25" />
-</svg>
diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg
deleted file mode 100644
index 512f9c0da..000000000
--- a/app/assets/images/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg clip-rule="evenodd" fill="#22952f" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" viewBox="0 0 1084 1084" xmlns="http://www.w3.org/2000/svg"><path d="M468.005 78.618c-64.165 10.64-127.273 35.7-188.187 75.186-79.563 50.76-147.191 137.624-179.953 229.995-51.65 146.127-30.533 303.285 57.528 427.818 76.77 108.538 198.122 181.67 326.25 196.426l21.607 2.397.535-27.687c.085-15.173 1.718-35.647 3.29-45.5 3.534-21.222.525-25.791-18.44-25.898-37.173-.209-91.318-17.583-128.356-41.688-22.678-14.542-24.188-15.688-40.38-37.021-18.076-23.24-33.832-54.433-43.15-83.694-7.084-22.04-8.524-35.704-8.277-79.703l-.08-53.106 34.143-.946c85.362-2.554 157.282 24.402 203.27 75.87l17.339 19.442 4.622-12.492c21.942-57.154 58.224-100.95 101.59-122.708 40.7-20.254 71.086-27.29 127.615-29.249l51.979-1.983 2.595 10.635c1.485 5.698 1.342 31.112.062 56.52-3.813 70.911-22.66 117.082-66.93 165.007-22.516 24.15-55.624 43.31-98.182 56.346-14.439 4.471-29.262 9.698-32.305 11.198-13.693 6.751-32.766 93.129-30.375 140.178l1 24.662 15.178-1.053c36.429-2.45 100.257-20.678 139.814-39.801 44.505-22.13 101.623-61.258 129.854-89.928 142.678-144.478 179.875-350.998 95.94-534.682-20.986-45.637-66.91-108.483-108.037-147.405-39.24-37.015-112.213-79.15-171.276-98.828-66.258-21.994-152.323-29.305-220.283-18.308z"/><path d="M706.91 630.356c-28.112 7.429-58.55 23.948-71.53 38.668-15.268 16.984-32.165 53.683-35.713 77.56l-3.139 18.57 14.806-2.193c24.679-4.034 68.052-27.308 83.325-45.05 16.798-19.251 35.212-55.942 38.747-77.543 2.758-18.192 3.135-17.81-26.496-10.012zm-354.663 67.043c-11.4 3.729 9.898 61.126 33.257 89.327 16.577 20.197 66.889 44.757 93.44 44.906 12.517.07 11.083-14.731-4.287-47.06-16.87-35.372-35.337-56.717-60.303-68.996-23.074-11.51-54.885-20.792-62.107-18.177z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/basket.svg b/app/assets/images/members/basket.svg
deleted file mode 100644
index 039b91b58..000000000
--- a/app/assets/images/members/basket.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 11V7a4 4 0 00-8 0v4M5 9h14l1 12H4L5 9z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/calendar.svg b/app/assets/images/members/calendar.svg
deleted file mode 100644
index 4d75058b8..000000000
--- a/app/assets/images/members/calendar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/cash.svg b/app/assets/images/members/cash.svg
deleted file mode 100644
index 5387c6b6c..000000000
--- a/app/assets/images/members/cash.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 9V7a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2m2 4h10a2 2 0 002-2v-6a2 2 0 00-2-2H9a2 2 0 00-2 2v6a2 2 0 002 2zm7-5a2 2 0 11-4 0 2 2 0 014 0z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/chevron_right.svg b/app/assets/images/members/chevron_right.svg
deleted file mode 100644
index 31c379d36..000000000
--- a/app/assets/images/members/chevron_right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/close.svg b/app/assets/images/members/close.svg
deleted file mode 100644
index cffcca364..000000000
--- a/app/assets/images/members/close.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg>
diff --git a/app/assets/images/members/document_download.svg b/app/assets/images/members/document_download.svg
deleted file mode 100644
index 7c3b84bd4..000000000
--- a/app/assets/images/members/document_download.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/globe.svg b/app/assets/images/members/globe.svg
deleted file mode 100644
index 92a261ebe..000000000
--- a/app/assets/images/members/globe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3.055 11H5a2 2 0 012 2v1a2 2 0 002 2 2 2 0 012 2v2.945M8 3.935V5.5A2.5 2.5 0 0010.5 8h.5a2 2 0 012 2 2 2 0 104 0 2 2 0 012-2h1.064M15 20.488V18a2 2 0 012-2h3.064M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/hand.svg b/app/assets/images/members/hand.svg
deleted file mode 100644
index f9ef0146a..000000000
--- a/app/assets/images/members/hand.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 11.5V14m0-2.5v-6a1.5 1.5 0 113 0m-3 6a1.5 1.5 0 00-3 0v2a7.5 7.5 0 0015 0v-5a1.5 1.5 0 00-3 0m-6-3V11m0-5.5v-1a1.5 1.5 0 013 0v1m0 0V11m0-5.5a1.5 1.5 0 013 0v3m0 0V11"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/identification.svg b/app/assets/images/members/identification.svg
deleted file mode 100644
index 9d6cb78e2..000000000
--- a/app/assets/images/members/identification.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 6H5a2 2 0 00-2 2v9a2 2 0 002 2h14a2 2 0 002-2V8a2 2 0 00-2-2h-5m-4 0V5a2 2 0 114 0v1m-4 0a2 2 0 104 0m-5 8a2 2 0 100-4 2 2 0 000 4zm0 0c1.306 0 2.417.835 2.83 2M9 14a3.001 3.001 0 00-2.83 2M15 11h3m-3 4h2"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/information.svg b/app/assets/images/members/information.svg
deleted file mode 100644
index 644a82770..000000000
--- a/app/assets/images/members/information.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M12 7.5h1.5m-1.5 3h1.5m-7.5 3h7.5m-7.5 3h7.5m3-9h3.375c.621 0 1.125.504 1.125 1.125V18a2.25 2.25 0 01-2.25 2.25M16.5 7.5V18a2.25 2.25 0 002.25 2.25M16.5 7.5V4.875c0-.621-.504-1.125-1.125-1.125H4.125C3.504 3.75 3 4.254 3 4.875V18a2.25 2.25 0 002.25 2.25h13.5M6 7.5h3v3H6v-3z" />
-</svg>
diff --git a/app/assets/images/members/link.svg b/app/assets/images/members/link.svg
deleted file mode 100644
index 09bdebe84..000000000
--- a/app/assets/images/members/link.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.828 10.172a4 4 0 00-5.656 0l-4 4a4 4 0 105.656 5.656l1.102-1.101m-.758-4.899a4 4 0 005.656 0l4-4a4 4 0 00-5.656-5.656l-1.1 1.1"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/mail.svg b/app/assets/images/members/mail.svg
deleted file mode 100644
index fba795cb5..000000000
--- a/app/assets/images/members/mail.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M21.75 6.75v10.5a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25m19.5 0v.243a2.25 2.25 0 01-1.07 1.916l-7.5 4.615a2.25 2.25 0 01-2.36 0L3.32 8.91a2.25 2.25 0 01-1.07-1.916V6.75" />
-</svg>
diff --git a/app/assets/images/members/map.svg b/app/assets/images/members/map.svg
deleted file mode 100644
index a3bd88474..000000000
--- a/app/assets/images/members/map.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/menu.svg b/app/assets/images/members/menu.svg
deleted file mode 100644
index 8cdb36c59..000000000
--- a/app/assets/images/members/menu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"/></svg>
diff --git a/app/assets/images/members/minus.svg b/app/assets/images/members/minus.svg
deleted file mode 100644
index b795fa484..000000000
--- a/app/assets/images/members/minus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 12H4"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/notice.svg b/app/assets/images/members/notice.svg
deleted file mode 100644
index b1110815e..000000000
--- a/app/assets/images/members/notice.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/participant.svg b/app/assets/images/members/participant.svg
deleted file mode 100644
index 5ead4f4c3..000000000
--- a/app/assets/images/members/participant.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4.354a4 4 0 110 5.292M15 21H3v-1a6 6 0 0112 0v1zm0 0h6v-1a6 6 0 00-9-5.197M13 7a4 4 0 11-8 0 4 4 0 018 0z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/pencil_square.svg b/app/assets/images/members/pencil_square.svg
deleted file mode 100644
index dc4d35608..000000000
--- a/app/assets/images/members/pencil_square.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-  <path stroke-linecap="round" stroke-linejoin="round" d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10" />
-</svg>
diff --git a/app/assets/images/members/phone.svg b/app/assets/images/members/phone.svg
deleted file mode 100644
index 5b6fa6f8a..000000000
--- a/app/assets/images/members/phone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 5a2 2 0 012-2h3.28a1 1 0 01.948.684l1.498 4.493a1 1 0 01-.502 1.21l-2.257 1.13a11.042 11.042 0 005.516 5.516l1.13-2.257a1 1 0 011.21-.502l4.493 1.498a1 1 0 01.684.949V19a2 2 0 01-2 2h-1C9.716 21 3 14.284 3 6V5z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/plus.svg b/app/assets/images/members/plus.svg
deleted file mode 100644
index 38db7984b..000000000
--- a/app/assets/images/members/plus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/scale.svg b/app/assets/images/members/scale.svg
deleted file mode 100644
index 6fa85a98d..000000000
--- a/app/assets/images/members/scale.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 6l3 1m0 0l-3 9a5.002 5.002 0 006.001 0M6 7l3 9M6 7l6-2m6 2l3-1m-3 1l-3 9a5.002 5.002 0 006.001 0M18 7l3 9m-3-9l-6-2m0-2v2m0 16V5m0 16H9m3 0h3"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/shopping_cart.svg b/app/assets/images/members/shopping_cart.svg
deleted file mode 100644
index 3aca823e1..000000000
--- a/app/assets/images/members/shopping_cart.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 3h2l.4 2M7 13h10l4-8H5.4M7 13L5.4 5M7 13l-2.293 2.293c-.63.63-.184 1.707.707 1.707H17m0 0a2 2 0 100 4 2 2 0 000-4zm-8 2a2 2 0 11-4 0 2 2 0 014 0z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/sign_out.svg b/app/assets/images/members/sign_out.svg
deleted file mode 100644
index 0ce938562..000000000
--- a/app/assets/images/members/sign_out.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/trash.svg b/app/assets/images/members/trash.svg
deleted file mode 100644
index 9e3bcba59..000000000
--- a/app/assets/images/members/trash.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/truck.svg b/app/assets/images/members/truck.svg
deleted file mode 100644
index aef56c984..000000000
--- a/app/assets/images/members/truck.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path d="M9 17a2 2 0 11-4 0 2 2 0 014 0zm10 0a2 2 0 11-4 0 2 2 0 014 0z"/><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16V6a1 1 0 00-1-1H4a1 1 0 00-1 1v10a1 1 0 001 1h1m8-1a1 1 0 01-1 1H9m4-1V8a1 1 0 011-1h2.586a1 1 0 01.707.293l3.414 3.414a1 1 0 01.293.707V16a1 1 0 01-1 1h-1m-6-1a1 1 0 001 1h1M5 17a2 2 0 104 0m-4 0a2 2 0 114 0m6 0a2 2 0 104 0m-4 0a2 2 0 114 0"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/user_circle.svg b/app/assets/images/members/user_circle.svg
deleted file mode 100644
index 935830ea2..000000000
--- a/app/assets/images/members/user_circle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5.121 17.804A13.937 13.937 0 0112 16c2.5 0 4.847.655 6.879 1.804M15 10a3 3 0 11-6 0 3 3 0 016 0zm6 2a9 9 0 11-18 0 9 9 0 0118 0z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/members/warning.svg b/app/assets/images/members/warning.svg
deleted file mode 100644
index 199099db9..000000000
--- a/app/assets/images/members/warning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/admin/csv_file.svg b/app/assets/svg/icons/own/file-csv.svg
similarity index 100%
rename from app/assets/images/admin/csv_file.svg
rename to app/assets/svg/icons/own/file-csv.svg
diff --git a/app/assets/images/admin/pdf_file.svg b/app/assets/svg/icons/own/file-pdf.svg
similarity index 100%
rename from app/assets/images/admin/pdf_file.svg
rename to app/assets/svg/icons/own/file-pdf.svg
diff --git a/app/assets/images/admin/xlsx_file.svg b/app/assets/svg/icons/own/file-xlsx.svg
similarity index 100%
rename from app/assets/images/admin/xlsx_file.svg
rename to app/assets/svg/icons/own/file-xlsx.svg
diff --git a/app/assets/images/admin/logo.svg b/app/assets/svg/icons/own/logo.svg
similarity index 100%
rename from app/assets/images/admin/logo.svg
rename to app/assets/svg/icons/own/logo.svg
diff --git a/app/helpers/activities_helper.rb b/app/helpers/activities_helper.rb
index e23a13388..7401d58ae 100644
--- a/app/helpers/activities_helper.rb
+++ b/app/helpers/activities_helper.rb
@@ -32,7 +32,7 @@ def activities_collection(activities, data: {})
           content_tag(:span, class: "mr-1") {
             "#{activity.participants_count}/#{activity.participants_limit || '∞'}"
           }.concat(
-            icon("users", class: "ms-1 h-5 w-5 text-gray-500", library: "lucide"))
+            icon("users", class: "ms-1 h-5 w-5", library: "lucide", stroke_width: 2))
         })
       [
         text,
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index 32d63961b..ca5fe7bde 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -9,9 +9,9 @@ def onboarding?
   end
 
   def next_delivery_panel_action(delivery)
-    icon_link(:csv_file, Delivery.human_attribute_name(:summary), baskets_path(q: { delivery_id_eq: delivery.id }, format: :csv)) +
-      icon_link(:xlsx_file, Delivery.human_attribute_name(:summary), delivery_path(delivery, format: :xlsx)) +
-      icon_link(:pdf_file, Delivery.human_attribute_name(:sheets), delivery_path(delivery, format: :pdf), target: "_blank")
+    icon_file_link(:csv, baskets_path(q: { delivery_id_eq: delivery.id }, format: :csv), title: Delivery.human_attribute_name(:summary)) +
+      icon_file_link(:xlsx, delivery_path(delivery, format: :xlsx), title: Delivery.human_attribute_name(:summary)) +
+      icon_file_link(:pdf, delivery_path(delivery, format: :pdf), target: "_blank", title: Delivery.human_attribute_name(:sheets))
   end
 
   def billing_panel_action
@@ -35,7 +35,7 @@ def billing_panel_action
             end
           end
         end || "".html_safe
-      ) + icon_link(:xlsx_file, Invoice.human_attribute_name(:summary), billing_path(Current.fy_year, format: :xlsx))
+      ) + icon_file_link(:xlsx, billing_path(Current.fy_year, format: :xlsx), title: Invoice.human_attribute_name(:summary))
     end
   end
 end
diff --git a/app/helpers/invoices_helper.rb b/app/helpers/invoices_helper.rb
index 91d197b1b..257188b39 100644
--- a/app/helpers/invoices_helper.rb
+++ b/app/helpers/invoices_helper.rb
@@ -34,7 +34,7 @@ def link_to_invoice_pdf(invoice, title: "PDF", **options, &block)
       if block
         block.call
       else
-        inline_svg_tag "admin/pdf_file.svg", class: "w-5 h-5"
+        icon "file-pdf", class: "h-5 w-5", library: "own"
       end
     end
   end
diff --git a/app/helpers/links_helper.rb b/app/helpers/links_helper.rb
index 3b565eda0..dcb5fb1da 100644
--- a/app/helpers/links_helper.rb
+++ b/app/helpers/links_helper.rb
@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module LinksHelper
-  def icon_link(icon, title, url, size: 22, **options)
+  def icon_file_link(type, url, size: 6, title: nil, **options)
+    title ||= type.upcase
     content_tag :span do
       link_to(url, title: title, **options) do
-        inline_svg_tag("admin/#{icon}.svg", size: size.to_s)
+        icon "file-#{type}", class: "h-#{size} w-#{size}", library: "own"
       end
     end
   end
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 1b21bbcd2..0d90f0354 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -426,7 +426,7 @@ def collection_text(text, details: nil, icon: nil)
 
   def map_icon(location)
     link_to "https://www.google.com/maps?q=#{location}", title: location, target: :blank do
-      inline_svg_tag "members/map.svg", class: "inline-block text-gray-300 dark:text-gray-700 hover:text-green-500"
+      icon "map", class: "inline-block text-gray-300 dark:text-gray-700 hover:text-green-500"
     end
   end
 
diff --git a/app/views/active_admin/_site_footer.html.slim b/app/views/active_admin/_site_footer.html.slim
index c1ec9a331..3a1d1990f 100644
--- a/app/views/active_admin/_site_footer.html.slim
+++ b/app/views/active_admin/_site_footer.html.slim
@@ -11,5 +11,5 @@ footer class="pt-40"
 
   div class="flex justify-center py-8 mt-4"
     = link_to csa_admin_website_url, class: "inline-flex items-center text-sm py-1 px-2 text-gray-300 dark:text-gray-700 hover:text-green-600 hover:text-green-600 dark:hover:text-green-500 hover:bg-gray-100 dark:hover:bg-gray-700 font-medium focus:outline-none rounded-md no-underline" do
-      = inline_svg_tag('admin/logo.svg', size: '16', class: 'me-2 fill-current')
+      = icon "logo", class: "w-4 h-4 me-2 fill-current", library: "own"
       = 'CSA Admin'
diff --git a/app/views/active_admin/_site_header.html.erb b/app/views/active_admin/_site_header.html.erb
index 490ba63ab..e0d469946 100644
--- a/app/views/active_admin/_site_header.html.erb
+++ b/app/views/active_admin/_site_header.html.erb
@@ -48,7 +48,7 @@
       </button>
 
       <button id="user-menu-button" class="flex items-center w-9 h-9 justify-center text-sm text-white/50 hover:text-white focus:outline-none dark:text-black/50 dark:hover:text-black ms-1" data-dropdown-toggle="user-menu" data-dropdown-offset-distance="3" data-dropdown-placement="bottom-end">
-        <%= icon "user-circle", class: "w-8 h-8", set: "solid" %>
+        <%= icon "user-circle", class: "w-8 h-8", variant: "solid" %>
       </button>
 
       <div id="user-menu" class="z-50 hidden min-w-max bg-white rounded shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:bg-gray-700 py-1 text-sm text-right text-gray-700 dark:text-gray-200" aria-labelledby="user-menu-button">
diff --git a/app/views/active_admin/page/_onboarding.html.arb b/app/views/active_admin/page/_onboarding.html.arb
index 7c0a47276..d227cecff 100644
--- a/app/views/active_admin/page/_onboarding.html.arb
+++ b/app/views/active_admin/page/_onboarding.html.arb
@@ -15,14 +15,14 @@ div class: "flex justify-center" do
               if Delivery.any?
                 a href: deliveries_path do
                   span class: "flex items-center line-through text-gray-400 dark:text-gray-600" do
-                    span inline_svg_tag("admin/clipboard-check.svg", class: "h-8 w-8")
+                    span icon("clipboard-check", class: "h-7 w-7 mr-2", library: "lucide", stroke_width: 1)
                     span t(".create_deliveries")
                   end
                 end
               else
                 a href: new_delivery_path do
                   span class: "flex items-center" do
-                    span inline_svg_tag("admin/clipboard.svg", class: "h-8 w-8")
+                    span icon("clipboard", class: "h-7 w-7 mr-2", library: "lucide", stroke_width: 1)
                     span t(".create_deliveries")
                   end
                 end
@@ -33,14 +33,14 @@ div class: "flex justify-center" do
                 if BasketSize.kept.any?
                   a href: basket_sizes_path do
                     span class: "flex items-center line-through text-gray-400 dark:text-gray-600" do
-                    span inline_svg_tag("admin/clipboard-check.svg", class: "h-8 w-8")
+                      span icon("clipboard-check", class: "h-7 w-7 mr-2", library: "lucide", stroke_width: 1)
                       span t(".create_basket_sizes")
                     end
                   end
                 else
                   a href: new_basket_size_path do
                     span class: "flex items-center" do
-                    span inline_svg_tag("admin/clipboard.svg", class: "h-8 w-8")
+                      span icon("clipboard", class: "h-7 w-7 mr-2", library: "lucide", stroke_width: 1)
                       span t(".create_basket_sizes")
                     end
                   end
@@ -51,14 +51,14 @@ div class: "flex justify-center" do
               if Depot.kept.any?
                 a href: depots_path do
                   span class: "flex items-center line-through text-gray-400 dark:text-gray-600" do
-                    span inline_svg_tag("admin/clipboard-check.svg", class: "h-8 w-8")
+                    span icon("clipboard-check", class: "h-7 w-7 mr-2", library: "lucide", stroke_width: 1)
                     span t(".create_depots")
                   end
                 end
               else
                 a href: new_depot_path do
                   span class: "flex items-center" do
-                    span inline_svg_tag("admin/clipboard.svg", class: "h-8 w-8")
+                    span icon("clipboard", class: "h-7 w-7 mr-2", library: "lucide", stroke_width: 1)
                     span t(".create_depots")
                   end
                 end
diff --git a/app/views/layouts/active_admin_logged_out.html.slim b/app/views/layouts/active_admin_logged_out.html.slim
index 73d736405..74ee43b9f 100644
--- a/app/views/layouts/active_admin_logged_out.html.slim
+++ b/app/views/layouts/active_admin_logged_out.html.slim
@@ -22,5 +22,5 @@ html lang=I18n.locale
 
       div class="pt-8 flex justify-center gap-2"
         = link_to csa_admin_website_url, class: "inline-flex items-center text-sm py-1 px-2 text-gray-300 dark:text-gray-700 hover:text-green-600 hover:text-green-600 dark:hover:text-green-500 hover:bg-gray-100 dark:hover:bg-gray-700 font-medium focus:outline-none rounded-md no-underline" do
-          = inline_svg_tag('admin/logo.svg', size: '16', class: 'me-2 fill-current')
+          = icon "logo", class: "w-4 h-4 me-2 fill-current", library: "own"
           = 'CSA Admin'
diff --git a/app/views/layouts/members/_flashes.html.slim b/app/views/layouts/members/_flashes.html.slim
index 0c18261f0..46c893ed6 100644
--- a/app/views/layouts/members/_flashes.html.slim
+++ b/app/views/layouts/members/_flashes.html.slim
@@ -2,11 +2,11 @@
   - case type
   - when 'alert'
     div class="flash mb-8 bg-red-100 dark:bg-red-900 border border-red-400 dark:border-red-600 text-red-700 dark:text-red-300 p-2 rounded flex items-center"
-      = inline_svg_tag "members/warning.svg", class: 'flex-shrink-0 w-5 h-5 fill-stroke'
+      = icon "exclamation-triangle", class: 'w-5 h-5'
       span class='ml-2'
         = msg
   - when 'notice'
     div class="flash mb-8 bg-green-100 dark:bg-green-900 border border-green-400 dark:border-green-600 text-green-700 dark:text-green-300 p-2 rounded flex items-center"
-      = inline_svg_tag "members/notice.svg", class: 'flex-shrink-0 w-5 h-5 fill-stroke'
+      = icon "information-circle", class: 'w-5 h-5'
       span class='ml-2'
         = msg
diff --git a/app/views/layouts/members/_footer.html.slim b/app/views/layouts/members/_footer.html.slim
index 3880101d2..a0f369809 100644
--- a/app/views/layouts/members/_footer.html.slim
+++ b/app/views/layouts/members/_footer.html.slim
@@ -4,22 +4,22 @@ footer class="w-full flex flex-col text-base text-gray-400 mt-16 dark:text-gray-
       - if current_member && Current.org.member_information_text?
         li class="mx-auto px-4 md:mx-0 md:px-0"
           = link_to members_info_path, class: 'flex items-center hover:text-green-500 py-1 px-4 md:px-0' do
-            = inline_svg_tag 'members/information.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke'
+            = icon 'newspaper', class: 'h-6 w-6'
             span class='ml-2' = member_information_title
       - if current_member
         li class="mx-auto px-4 md:mx-0 md:px-0 mb-4"
           = link_to calendar_webcal_url, class: 'flex items-center hover:text-green-500 py-1 px-4 md:px-0', title: t(".calendar_feed") do
-            = icon('calendar-days', class: 'h-6 w-6 flex-shrink-0 fill-stroke')
+            = icon 'calendar-days', class: 'h-6 w-6'
             span class='ml-2' = t('.calendar')
       - if Current.org.phone?
         li class="mx-auto px-4 #{'md:mx-0 md:px-0' if current_member}"
           = link_to "tel:#{Current.org.phone.phony_formatted(spaces: '', format: :international)}", class: 'flex items-center hover:text-green-500 py-1 px-4 md:px-0' do
-            = inline_svg_tag 'members/phone.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke'
+            = icon 'phone', class: 'h-6 w-6'
             span class='ml-2'
               = Current.org.phone
       li class="mx-auto px-4 #{'md:mx-0 md:px-0' if current_member}"
         = mail_to Current.org.email, class: 'flex items-center hover:text-green-500 py-1 px-4 md:px-0' do
-          = inline_svg_tag 'members/mail.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke'
+          = icon 'envelope', class: 'h-6 w-6'
           span class='ml-2'
             = t('.contact')
   - if Current.org.languages.many? && !current_member
@@ -28,8 +28,7 @@ footer class="w-full flex flex-col text-base text-gray-400 mt-16 dark:text-gray-
         - Current.org.languages.each do |locale|
           li class='hover:bg-gray-100 dark:hover:bg-gray-900'
             = link_to locale, url_for(locale: locale), title: t("languages.#{locale}"), data: { turbolinks: false }, class: 'block w-12 leading-8 hover:text-green-500 uppercase'
-  div class="mx-auto #{'md:mx-0' if current_member} mb-4 mt-12 text-gray-300 dark:text-gray-700"
+  div class="mx-auto #{'md:mx-0.5' if current_member} mb-4 mt-12 text-gray-300 dark:text-gray-700"
     = link_to csa_admin_website_url, class: 'flex items-center hover:text-green-500' do
-      = inline_svg_tag 'logo.svg', class: 'flex-shrink-0 w-5 h-5 fill-current'
-      span class='ml-2'
-        = 'CSA Admin'
+      = icon "logo", class: "w-5 h-5 me-2 md:me-2.5 fill-current", library: "own"
+      = 'CSA Admin'
diff --git a/app/views/layouts/members/_header.html.slim b/app/views/layouts/members/_header.html.slim
index f431dbefc..2f4d8d07c 100644
--- a/app/views/layouts/members/_header.html.slim
+++ b/app/views/layouts/members/_header.html.slim
@@ -5,12 +5,12 @@ header class='flex-grow flex flex-col flex-nowrap justify-between'
         = image_tag(org_logo_url, alt: "#{Current.org.name} Logo", class: 'h-20 w-20 md:h-40 md:w-40')
     div class='m-4 text-gray-900 dark:text-gray-100 md:hidden'
       = link_to '#menu', data: { action: "click->menu#show" } do
-        = inline_svg_tag 'members/menu.svg', title: 'Show Menu', class: 'h-10 w-10'
+        = icon 'bars-3', title: 'Show Menu', class: 'h-10 w-10'
 
   nav data-menu-target='menu' class='my-4 hidden flex-grow flex-col w-full md:block '
     div class='h-20 mx-8 mb-4 flex-none flex justify-end items-center text-gray-900 dark:text-gray-100 md:hidden'
       = link_to '#nomenu', data: { action: "click->menu#hide" }, class: 'inline-block' do
-        = inline_svg_tag 'members/close.svg', title: 'Hide Menu', class: 'h-10 w-10'
+        = icon 'x-mark', title: 'Hide Menu', class: 'h-10 w-10'
 
     div class='mr-8 flex flex-grow h-full flex-col justify-between'
       - membership = current_member.current_or_future_membership
@@ -106,11 +106,11 @@ header class='flex-grow flex flex-col flex-nowrap justify-between'
         li class='mt-12'
           = link_to members_account_path, class: 'block py-2 px-8 flex items-center' do
             - # handle invalid name edit form
-            = inline_svg_tag 'members/user_circle.svg', class: 'h-8 w-8 flex-shrink-0 fill-stroke'
+            = icon 'user-circle', class: 'h-8 w-8'
             span class='ml-2'
               = current_member.name_was
         li class='text-gray-300 dark:text-gray-700'
           = button_to members_logout_path, method: :delete, class: 'px-8 flex items-center ' do
-            = inline_svg_tag 'members/sign_out.svg', class: 'ml-2 h-6 w-6 flex-shrink-0 fill-stroke'
+            = icon 'arrow-right-start-on-rectangle', class: 'mx-1 h-6 w-6'
             span class='ml-2'
               = t('.logout')
diff --git a/app/views/members/accounts/show.html.slim b/app/views/members/accounts/show.html.slim
index 58789745a..9b494b8c6 100644
--- a/app/views/members/accounts/show.html.slim
+++ b/app/views/members/accounts/show.html.slim
@@ -4,24 +4,24 @@ h1 class="mt-2 mb-8 text-xl sm:text-2xl font-extrabold text-gray-900 dark:text-g
 section
   ul class='space-y-4'
     li class='flex flex-row items-center'
-      = inline_svg_tag 'members/identification.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke'
+      = icon 'identification', class: 'h-6 w-6'
       span class='ml-4'
         = current_member.name
 
     li class='flex flex-row'
-      = inline_svg_tag 'members/map.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke'
+      = icon "map", class: 'h-6 w-6'
       span class='ml-4'
         = display_address(current_member)
 
     li class='flex flex-row'
-      = inline_svg_tag 'members/mail.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke'
+      = icon 'envelope', class: 'h-6 w-6'
       span class='ml-4'
         = display_emails(current_member)
         - if newsletter_unsubscribed?
           = button_to t('.subscribe_back_to_newsletter'), members_email_suppression_path, method: :delete, class: 'mt-1 block text-left md:min-w-min min-w-full text-sm hover:text-green-500 underline'
 
     li class='flex flex-row'
-      = inline_svg_tag 'members/phone.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke'
+      = icon 'phone', class: 'h-6 w-6'
       - if current_member.phones_array.any?
         span class='ml-4'
           = display_phones(current_member)
@@ -31,13 +31,13 @@ section
 
     - if Current.org.languages.many?
     li class='flex flex-row'
-      = inline_svg_tag 'members/globe.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke'
+      = icon 'language', class: 'h-6 w-6'
       span class='ml-4'
         = t("languages.#{current_member.language}")
 
     - if current_member.use_shop_depot?
       li class='pt-6 flex flex-row'
-        = inline_svg_tag 'members/basket.svg', class: '-mt-0.5 h-6 w-6 flex-shrink-0 fill-stroke'
+        = icon 'shopping-basket', class: 'h-6 w-6', library: "lucide"
         span class='ml-4'
           - depot = current_member.shop_depot
           - if depot.full_address
diff --git a/app/views/members/activity_participations/_activity_participation.html.slim b/app/views/members/activity_participations/_activity_participation.html.slim
index 9ef76887e..e2b0dcb55 100644
--- a/app/views/members/activity_participations/_activity_participation.html.slim
+++ b/app/views/members/activity_participations/_activity_participation.html.slim
@@ -13,10 +13,10 @@ span class="flex-none flex flex-row flex-nowrap md:flex-wrap"
   span class='h-8 md:ml-5 space-x-2 flex flex-row justify-start md:justify-end'
     span class='ms-1 flex flex-row justify-center items-center' title=t('activities.participant_count', count: activity_participation.participants_count)
       span = activity_participation.participants_count
-      = icon "users", class: "ms-1 h-5 w-5 text-gray-500", library: "lucide"
+      = icon "users", class: "ms-1 h-5 w-5", library: "lucide", stroke_width: 2
     - if activity_participation.carpooling?
       span class='ms-1 flex justify-center items-center' title="#{t('.carpooling')}: #{activity_participation.carpooling_phone.phony_formatted}"
-        = icon "car", library: "lucide", stroke_width: 1.5, class: "h-6 w-6 text-gray-500"
+        = icon "car", library: "lucide", stroke_width: 1.5, class: "h-6 w-6"
     - if activity_participation.note?
       = tooltip("activity-participation-#{activity_participation.id}", activity_participation.note, icon_name: "chat-bubble-bottom-center-text")
 
diff --git a/app/views/members/baskets/_basket.html.slim b/app/views/members/baskets/_basket.html.slim
index cf8d7d924..130f26f29 100644
--- a/app/views/members/baskets/_basket.html.slim
+++ b/app/views/members/baskets/_basket.html.slim
@@ -1,15 +1,15 @@
 ul class="relative p-2 rounded hover:bg-gray-100 dark:hover:bg-gray-900 #{'text-gray-300 dark:text-gray-700' if basket.absent?} #{'bg-gray-200 dark:bg-gray-800' if basket == @next_basket}"
   - if basket.can_member_update?
     = link_to edit_members_basket_path(basket), title: t('.edit'), class: 'absolute top-0 right-0 p-2 ' do
-      = inline_svg_tag 'members/pencil_square.svg', class: 'h-5 w-5 fill-stroke text-gray-400 dark:text-gray-600 hover:text-green-500 dark:hover:text-green-500'
+      = icon 'pencil-square', class: 'h-5 w-5 text-gray-400 dark:text-gray-600 hover:text-green-500 dark:hover:text-green-500'
 
   li class='flex flex-row items-center'
-    = inline_svg_tag 'members/calendar.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+    = icon 'calendar-days', class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
     span class='ml-2'
       = l(basket.delivery.date, format: :medium).titleize
 
   li class='mt-1 flex flex-row items-center'
-    = inline_svg_tag 'members/basket.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+    = icon 'shopping-bag', class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
     span class='ml-2'
       p
         = h basket_description(basket)
@@ -23,7 +23,7 @@ ul class="relative p-2 rounded hover:bg-gray-100 dark:hover:bg-gray-900 #{'text-
               = " *"
 
   li class='mt-1 flex flex-row items-center'
-    = inline_svg_tag 'members/map.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+    = icon "map", class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
     span class='ml-2'
       - depot = basket.depot
       - if depot.full_address
diff --git a/app/views/members/billing/_line.html.slim b/app/views/members/billing/_line.html.slim
index 1fb3583b1..f64d4a701 100644
--- a/app/views/members/billing/_line.html.slim
+++ b/app/views/members/billing/_line.html.slim
@@ -12,7 +12,7 @@ span class="order-2 md:order-1 flex-none w-24 mr-2"
         == t('.invoice_info', id: object.id, type: display_entity(object, link: false))
     span
       = link_to rails_blob_path(object.pdf_file, disposition: 'attachment') do
-        = inline_svg_tag 'members/document_download.svg', class: 'h-6 w-6'
+        = icon 'document-arrow-down', class: 'h-5 w-5'
   span class="order-3 flex-none text-right w-28"
     = cur(object.amount)
 - when Payment
diff --git a/app/views/members/contact_sharings/show.html.slim b/app/views/members/contact_sharings/show.html.slim
index aebb2db7e..0ff9ada8e 100644
--- a/app/views/members/contact_sharings/show.html.slim
+++ b/app/views/members/contact_sharings/show.html.slim
@@ -19,15 +19,15 @@ section
           li class='w-full md:w-1/2 my-2'
             ul class="md:mr-4 -mx-2 relative p-2 space-y-1"
               li class='flex flex-row items-center'
-                = inline_svg_tag 'members/user_circle.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+                = icon 'user-circle', class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
                 span class='ml-2'
                   = member.name
               li class='flex flex-row items-center'
-                = inline_svg_tag 'members/phone.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+                = icon 'phone', class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
                 span class='ml-2'
                   = display_phones(member)
               li class='flex flex-row items-center'
-                = inline_svg_tag 'members/map.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+                = icon "map", class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
                 span class='ml-2'
                   = display_address(member, country: false)
 
diff --git a/app/views/members/members/_pricing.html.slim b/app/views/members/members/_pricing.html.slim
index 50f0dbb08..e2b7c4dfc 100644
--- a/app/views/members/members/_pricing.html.slim
+++ b/app/views/members/members/_pricing.html.slim
@@ -4,7 +4,7 @@
     div class="-mx-4 md:-mx-0 px-4 md:px-0 bg-transparent"
       div class="shadow-md mx-0 mx-auto w-fit flex flex-col border dark:border-gray-700 rounded bg-gray-100 dark:bg-gray-900"
         div class="p-2 px-4 flex flex-row items-center justify-center text-gray-500"
-          = inline_svg_tag 'members/cash.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-400 dark:text-gray-600'
+          = icon "banknotes", class: "h-6 w-6 text-gray-400 dark:text-gray-600"
           span class="ml-3"
             - if current_member&.salary_basket?
               span class="italic text-gray-400 dark:text-gray-600" = t('.salary_basket')
diff --git a/app/views/members/memberships/_membership.html.slim b/app/views/members/memberships/_membership.html.slim
index 0788bbe54..9947bb299 100644
--- a/app/views/members/memberships/_membership.html.slim
+++ b/app/views/members/memberships/_membership.html.slim
@@ -3,16 +3,16 @@ h2 class="mt-8 text-lg font-bold text-gray-900 dark:text-gray-100"
 
   - if membership.can_member_update?
     = link_to edit_members_membership_path(membership), title: t('.edit'), class: 'ml-1.5 p-2' do
-      = inline_svg_tag 'members/pencil_square.svg', class: 'mb-1.5 inline h-5 w-5 text-gray-400 dark:text-gray-600 hover:text-green-500 dark:hover:text-green-500'
+      = icon 'pencil-square', class: 'mb-1.5 inline h-5 w-5 text-gray-400 dark:text-gray-600 hover:text-green-500 dark:hover:text-green-500'
 
 ul class='my-2 md:mr-4 -mx-2 relative p-2 space-y-2' id=membership.fiscal_year.year
   li class='flex flex-row items-center'
-    = inline_svg_tag 'members/calendar.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+    = icon 'calendar-days', class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
     span class='ml-2'
       = [membership.started_on, membership.ended_on].map { |d| l(d) }.join(' – ')
 
   li class='mt-1 flex flex-row items-center'
-    = inline_svg_tag 'members/basket.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+    = icon 'shopping-bag', class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
     span class='ml-2 flex flex-col'
       span = basket_size_description(membership)
       - complements = membership.memberships_basket_complements.includes(:basket_complement)
@@ -20,7 +20,7 @@ ul class='my-2 md:mr-4 -mx-2 relative p-2 space-y-2' id=membership.fiscal_year.y
         span = basket_complements_description(complements)
 
   li class='mt-1 flex flex-row items-center'
-    = inline_svg_tag 'members/map.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+    = icon "map", class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
     span class='ml-2'
       - depot = membership.depot
       - if depot.full_address
@@ -30,7 +30,7 @@ ul class='my-2 md:mr-4 -mx-2 relative p-2 space-y-2' id=membership.fiscal_year.y
         = h depot.public_name
 
   li class='mt-1 flex flex-row items-center'
-    = inline_svg_tag 'members/truck.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+    = icon 'truck', class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
     span class='ml-2'
       = link_to members_deliveries_path do
         = "#{membership.baskets_count} #{Delivery.model_name.human(count: membership.baskets_count)}"
@@ -43,15 +43,15 @@ ul class='my-2 md:mr-4 -mx-2 relative p-2 space-y-2' id=membership.fiscal_year.y
 
   - if Current.org.feature?('activity')
     li class='mt-1 flex flex-row items-center'
-      = inline_svg_tag 'members/hand.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+      = icon 'hand-raised', class: 'h-6 w-6 text-gray-300 dark:text-gray-700'
       span class='ml-2'
         = "#{activities_human_name}: "
         = link_to members_activity_participations_path do
           = t('.activity_participations_demanded', count: membership.activity_participations_demanded)
 
   li
-    li class='mt-1 flex flex-row items-center'
-      = inline_svg_tag 'members/cash.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-300 dark:text-gray-700'
+    li class="mt-1 flex flex-row items-center"
+      = icon "banknotes", class: "h-6 w-6 text-gray-300 dark:text-gray-700"
       span class='ml-2'
         - if current_member.salary_basket?
           span class="italic text-gray-400 dark:text-gray-600"
diff --git a/app/views/members/shop/orders/_cart.html.slim b/app/views/members/shop/orders/_cart.html.slim
index 587af6700..25a84a532 100644
--- a/app/views/members/shop/orders/_cart.html.slim
+++ b/app/views/members/shop/orders/_cart.html.slim
@@ -1,14 +1,14 @@
 - if @order.items.none?
   div class="p-2 w-full flex flex-row items-center justify-center text-gray-400  dark:text-gray-600"
     div class="flex flex-row items-center"
-      = inline_svg_tag 'members/shopping_cart.svg', class: 'h-6 w-6 flex-shrink-0 fill-stroke text-gray-400 dark:text-gray-600'
+      = icon 'shopping-basket', class: 'h-7 w-7 text-gray-400 dark:text-gray-600', library: "lucide"
       div class='ml-4'
         = t('.no_order_items')
 - else
   div class="w-full"
     = link_to members_shop_order_path(@order), target: '_top', title: t('.show_basket'), class: 'flex flex-row items-center justify-between p-2' do
-      = inline_svg_tag 'members/shopping_cart.svg', class: 'flex-none h-6 w-6 flex-shrink-0 text-gray-400 fill-stroke'
-      div class='ml-2 flex-grow text-gray-400'
+      = icon 'shopping-basket', class: 'flex-none h-8 w-8 text-gray-400', library: "lucide"
+      div class='ml-4 flex-grow text-gray-400'
         - count = @order.items.sum(:quantity)
         = "#{count} #{Shop::Product.model_name.human(count: count)}"
 
@@ -17,4 +17,4 @@
 
       div class="ml-2 flex-none"
         div class='text-gray-500 bg-gray-200 dark:bg-gray-600 hover:bg-green-500 font-medium rounded-md focus:outline-none focus:ring-green-500 focus:z-10 text-sm cursor-pointer flex items-center'
-          = inline_svg_tag 'members/chevron_right.svg', class: 'py-1 h-8 w-10 fill-stroke hover:text-white'
+          = icon "chevron-right", class: 'py-1 h-8 w-10 fill-stroke hover:text-white'
diff --git a/app/views/members/shop/orders/_finalized_order.html.slim b/app/views/members/shop/orders/_finalized_order.html.slim
index cc6d9d83e..0fb85445d 100644
--- a/app/views/members/shop/orders/_finalized_order.html.slim
+++ b/app/views/members/shop/orders/_finalized_order.html.slim
@@ -32,7 +32,7 @@ div class="mt-2 space-y-4 md:space-y-2"
 
 div class='mt-6 md:mt-4 flex flex-row items-center justify-end'
   div class='text-sm text-gray-400 dark:text-gray-600 flex flex-row items-center justify-end' title=t('.order_total_weight')
-    = inline_svg_tag('members/scale.svg', class: 'w-4 h-4 stroke-current')
+    = icon 'scale', class: 'w-4 h-4'
     span class='ml-1'
       = kg(@order.weight_in_kg)
 
@@ -51,7 +51,7 @@ div class='mt-6 md:mt-4 flex flex-row items-center justify-end'
   div class='mt-12 flex flex-row justify-center md:justify-end'
     = button_to members_shop_order_path(@order), method: :delete, form: { data: { turbo: false, controller: "confirmation", confirmation_message_value: t('.cancel_order_confirm'), action: "submit->confirmation#confirm" } }, class: 'focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 text-base cursor-pointer' do
         div class='flex flex-row items-center'
-          = inline_svg_tag('members/trash.svg', class: 'w-4 h-4 stroke-current')
+          = icon 'trash', class: 'w-4 h-4'
           span class='ml-1 text-sm font-normal'
             = t('.cancel_order')
 - else
diff --git a/app/views/members/shop/orders/_order.html.slim b/app/views/members/shop/orders/_order.html.slim
index d426c84f3..dfc98c509 100644
--- a/app/views/members/shop/orders/_order.html.slim
+++ b/app/views/members/shop/orders/_order.html.slim
@@ -33,15 +33,15 @@
               button aria-label="minus" class="bg-gray-200 dark:bg-gray-800 text-gray-400 dark:text-gray-600 hover:bg-gray-300 dark:hover:bg-gray-700 rounded-l cursor-pointer outline-none z-0 " data-action="form-number-controls#decrement"
                 div class="mx-2 flex items-center"
                   - if ff.object.quantity == 1
-                    = inline_svg_tag('members/trash.svg', class: 'w-4 h-4 flex-shrink-0 stroke-current')
+                    = icon 'trash', class: 'w-4 h-4'
                   - else
-                    = inline_svg_tag('members/minus.svg', class: 'w-4 h-4 flex-shrink-0 stroke-current')
+                    = icon 'minus', class: 'w-4 h-4'
 
               = ff.input_field :quantity, class: 'controls-none outline-none focus:outline-none border-none text-center dark:text-gray-400 w-8 bg-gray-200 dark:bg-gray-800 font-semibold px-0 hover:text-black dark:hover:text-gray-200 focus:text-black dark:focus:text-white md:text-base cursor-default focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 text-gray-700 z-10', min: 0, max: ff.object.product_variant.stock, data: { form_number_controls_target: 'input', action: "change->form-submitter#submit" }
 
               button aria-label="plus" class="bg-gray-200 dark:bg-gray-800 text-gray-400 dark:text-gray-600 rounded-r cursor-pointer outline-none #{'hover:bg-gray-300 dark:hover:bg-gray-700' if !ff.object.product_variant.stock || ff.object.quantity < ff.object.product_variant.stock.to_i}" data-action="form-number-controls#increment" disabled=(available_products.exclude?(ff.object.product) || ff.object.product_variant.unavailable? || (ff.object.product_variant.stock && ff.object.quantity >= ff.object.product_variant.stock.to_i))
                 div class="mx-2 flex items-center"
-                  = inline_svg_tag('members/plus.svg', class: 'w-4 h-4 flex-shrink-0 stroke-current')
+                  = icon 'plus', class: 'w-4 h-4'
 
   div class='mt-6 md:mt-4 flex flex-row justify-end flex-wrap md:flex-nowrap'
     - if Current.org.shop_member_percentages?
@@ -71,7 +71,7 @@
           = cur(f.object.amount)
 
     div class='w-24 mt-2.5 text-sm text-gray-400 dark:text-gray-600 flex flex-row justify-end' title=t('.order_total_weight')
-      = inline_svg_tag('members/scale.svg', class: 'w-4 h-4 stroke-current')
+      = icon 'scale', class: 'w-4 h-4'
       span class='ml-1'
         = kg(f.object.weight_in_kg)
 
@@ -92,7 +92,7 @@ div class='w-full mt-8 flex flex-col md:flex-row md:justify-end'
 div class='mt-12 flex flex-row justify-center md:justify-end'
   = button_to members_shop_order_path(@order), method: :delete, form: { data: { turbo: false, controller: "confirmation", confirmation_message_value: t('.destroy_cart_confirm'), action: "submit->confirmation#confirm" } }, class: 'focus:outline-none focus:ring-green-500 focus:border-green-500 focus:z-10 text-base cursor-pointer' do
       div class='flex flex-row items-center'
-        = inline_svg_tag('members/trash.svg', class: 'w-4 h-4 stroke-current')
+        = icon 'trash', class: 'w-4 h-4'
         span class='ml-1 text-sm font-normal'
           = t('.destroy_cart')
 
diff --git a/app/views/members/shop/orders/show.html.slim b/app/views/members/shop/orders/show.html.slim
index 6d6bbe096..ada807189 100644
--- a/app/views/members/shop/orders/show.html.slim
+++ b/app/views/members/shop/orders/show.html.slim
@@ -36,7 +36,7 @@
   div class="mt-4 mb-6"
     = link_to rails_blob_path(@order.invoice.pdf_file, disposition: 'attachment') do
       div class="mx-auto w-max px-4 py-1 flex flex-row items-center text-gray-500 rounded-full border border-gray-300 hover:border-green-300 hover:text-green-500 "
-        = inline_svg_tag 'members/document_download.svg', class: 'w-5 h-5'
+        = icon 'document-arrow-down', class: 'w-5 h-5'
         span class='ml-1'
           = t('.download_invoice_html', number: @order.invoice.id)
 
diff --git a/app/views/members/shop/products/_product.html.slim b/app/views/members/shop/products/_product.html.slim
index 805678a47..728a485ca 100644
--- a/app/views/members/shop/products/_product.html.slim
+++ b/app/views/members/shop/products/_product.html.slim
@@ -14,7 +14,7 @@ div class=''
           = product.producer.name
         - if product.producer.website_url?
           = link_to product.producer.website_url, target: :blank, class: "ml-1 flex flex-row items-center" do
-            = inline_svg_tag 'members/link.svg'
+            = icon 'link', class: 'h-4 w-4'
 
   - if product.description?
     div class='mt-2 text-sm'
diff --git a/app/views/members/shop/products/_variant.html.slim b/app/views/members/shop/products/_variant.html.slim
index a46589d3b..74e569319 100644
--- a/app/views/members/shop/products/_variant.html.slim
+++ b/app/views/members/shop/products/_variant.html.slim
@@ -17,7 +17,7 @@ div class="flex flex-row items-center #{'text-gray-300 dark:text-gray-700' if li
   div class="ml-2 flex-none"
     - if !live_stock || live_stock.positive?
       = button_to members_shop_order_order_items_path(@order), method: :post, title: t('.add_to_basket'), class: 'bg-gray-200 dark:bg-gray-800 hover:bg-green-500 font-medium rounded-md focus:outline-none focus:ring-green-500 focus:z-10 text-sm cursor-pointer flex items-center', disabled: live_stock&.zero?, params: { variant_id: variant.id } do
-        = inline_svg_tag 'members/shopping_cart.svg', class: 'p-1 h-6 w-10 fill-stroke hover:text-white'
+        = icon 'shopping-basket', class: 'p-0.5 h-6 w-10 hover:text-white', library: "lucide"
     - else
       span class='text-gray-300 dark:text-gray-700 bg-gray-200 dark:bg-gray-800 rounded-md cursor-not-allowed flex items-center'
-        = inline_svg_tag 'members/shopping_cart.svg', class: 'p-1 h-6 w-10 fill-stroke'
+        = icon 'shopping-basket', class: 'p-0.5 h-6 w-10', library: "lucide"
diff --git a/app/views/members/shop/products/index.html.slim b/app/views/members/shop/products/index.html.slim
index b93373e76..b5bcd8802 100644
--- a/app/views/members/shop/products/index.html.slim
+++ b/app/views/members/shop/products/index.html.slim
@@ -46,7 +46,7 @@
     div class='mt-12 flex flex-row justify-center'
       = link_to members_shop_next_path, class: 'cursor-pointer underline' do
         div class='flex flex-row items-center'
-          = inline_svg_tag('members/shopping_cart.svg', class: 'w-5 h-5 stroke-current')
+          = icon 'shopping-basket', class: 'w-5 h-5', library: "lucide"
           span class='ml-1 text-base font-normal'
             = t('.next_shop_delivery_link', date: l(next_shop_delivery.date, format: :long))
 
diff --git a/spec/system/members/billing_spec.rb b/spec/system/members/billing_spec.rb
index 7bc5f3fc5..223965602 100644
--- a/spec/system/members/billing_spec.rb
+++ b/spec/system/members/billing_spec.rb
@@ -21,7 +21,7 @@
     expect(page).to have_content("Factures ouvertes")
     expect(page).to have_content("1 facture ouverte")
     expect(page).to have_content(
-      [ "01.02.18", "Facture ouverte #4242 (Cotisation)", "CHF 42.00" ].join)
+      [ "01.02.18", "Facture ouverte #4242 (Cotisation) ", "CHF 42.00" ].join)
     expect(page).to have_content([ "Montant restant à payer", "CHF 42.00" ].join)
     expect(page).to have_content([ "Intervalle de paiement", "Annuel" ].join)
   end
@@ -42,9 +42,9 @@
     expect(page).to have_content(
       [ "01.05.18", "Paiement de la facture #242", "-CHF 162.00" ].join)
     expect(page).to have_content(
-      [ "12.04.18", "Facture #242 (½ Journée)", "CHF 120.00" ].join)
+      [ "12.04.18", "Facture #242 (½ Journée) ", "CHF 120.00" ].join)
     expect(page).to have_content(
-      [ "19.03.17", "Facture #103 (Cotisation)", "CHF 30.00" ].join)
+      [ "19.03.17", "Facture #103 (Cotisation) ", "CHF 30.00" ].join)
 
     expect(page).to have_content([ "Avoir", "CHF 12.00" ].join)
     expect(page).to have_content([ "Intervalle de paiement", "Annuel" ].join)