diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index af79c4b80..4ceb92d12 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,4 +2,8 @@ module ApplicationHelper
   def page_title_tag
     tag.title @page_title || "Fizzy"
   end
+
+  def icon_tag(name, aria: { hidden: true }, size: 24, **options)
+    image_tag "#{name}.svg", aria: aria, size: size, **options
+  end
 end
diff --git a/app/views/accounts/users/_invite.html.erb b/app/views/accounts/users/_invite.html.erb
index f18982dd4..37128deb4 100644
--- a/app/views/accounts/users/_invite.html.erb
+++ b/app/views/accounts/users/_invite.html.erb
@@ -20,7 +20,7 @@
 
         <form method="dialog" class="margin-block-start flex justify-center">
           <button class="btn">
-            <%= image_tag "remove.svg", aria: { hidden: true }, size: 24 %>
+            <%= icon_tag "remove" %>
             <span class="for-screen-reader">Close</span>
           </button>
         </form>
diff --git a/app/views/accounts/users/_user.html.erb b/app/views/accounts/users/_user.html.erb
index 2abb9b665..bf377bc33 100644
--- a/app/views/accounts/users/_user.html.erb
+++ b/app/views/accounts/users/_user.html.erb
@@ -17,7 +17,7 @@
   <%= button_to account_user_path(user), method: :delete, class: "btn btn--small btn--negative flex-item-no-shrink",
         disabled: !Current.user.can_remove?(user),
         data: { turbo_confirm: "Are you sure you want to permanently remove this person from the account?" } do %>
-    <%= image_tag "minus.svg", aria: { hidden: true }, size: 24 %>
+    <%= icon_tag "minus" %>
     <span class="for-screen-reader">Remove <%= user.name %> from the account</span>
   <% end %>
 </div>
diff --git a/app/views/accounts/users/index.html.erb b/app/views/accounts/users/index.html.erb
index 07339321d..d49aebfff 100644
--- a/app/views/accounts/users/index.html.erb
+++ b/app/views/accounts/users/index.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <nav class="align-start">
     <%= link_to root_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-left" %>
       <span class="for-screen-reader">Go back</span>
     <% end %>
 
@@ -12,7 +12,7 @@
     </header>
 
     <%= link_to workflows_path, class: "btn flex-item-justify-end" do %>
-      <%= image_tag "bolt.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "bolt" %>
       <span class="for-screen-reader">Workflows</span>
     <% end %>
   </nav>
diff --git a/app/views/boosts/_boosts.html.erb b/app/views/boosts/_boosts.html.erb
index b9fcfae29..684ce110e 100644
--- a/app/views/boosts/_boosts.html.erb
+++ b/app/views/boosts/_boosts.html.erb
@@ -4,7 +4,7 @@
     <span><%= bubble.boosts_count == 1 ? "boost" : "boosts" %></span>
   </span>
   <%= tag.button class: "btn", type: :submit, style: "font-size: 0.5em" do %>
-    <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+    <%= icon_tag "add" %>
     <span class="for-screen-reader">Boost</span>
   <% end %>
 <% end %>
diff --git a/app/views/bubbles/_assignees.html.erb b/app/views/bubbles/_assignees.html.erb
index d6af2a636..603c0ef7d 100644
--- a/app/views/bubbles/_assignees.html.erb
+++ b/app/views/bubbles/_assignees.html.erb
@@ -6,7 +6,7 @@
 
     <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
       <button class="btn card__hide-on-index <%= bubble.creating? || bubble.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
-        <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "add" %>
         <span class="for-screen-reader">Assign</span>
       </button>
 
diff --git a/app/views/bubbles/_assignment.html.erb b/app/views/bubbles/_assignment.html.erb
index 489d92a60..2d6914591 100644
--- a/app/views/bubbles/_assignment.html.erb
+++ b/app/views/bubbles/_assignment.html.erb
@@ -14,7 +14,7 @@
             }, user.id %>
 
             <%= form.label "assignee_id[]", user.name, for: dom_id(user, :assign), class: "overflow-ellipsis" %>
-            <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
           </div>
         <% end %>
       <% end %>
diff --git a/app/views/bubbles/_color.html.erb b/app/views/bubbles/_color.html.erb
index 1921e14a1..b7228aebc 100644
--- a/app/views/bubbles/_color.html.erb
+++ b/app/views/bubbles/_color.html.erb
@@ -1,6 +1,6 @@
 <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close">
   <button class="btn" data-action="dialog#open:stop">
-    <%= image_tag "art.svg", aria: { hidden: true }, size: 24 %>
+    <%= icon_tag "art" %>
     <span class="for-screen-reader">Change color</span>
   </button>
 
@@ -19,7 +19,7 @@
 
     <form method="dialog">
       <button class="btn txt-small" title="Close (esc)">
-        <%= image_tag "remove.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "remove" %>
         <span class="for-screen-reader">Close</span>
       </button>
     </form>
diff --git a/app/views/bubbles/_image.html.erb b/app/views/bubbles/_image.html.erb
index 495600b01..6c5d4e84c 100644
--- a/app/views/bubbles/_image.html.erb
+++ b/app/views/bubbles/_image.html.erb
@@ -1,12 +1,12 @@
 <% if bubble.image.attached? %>
   <%= button_to bucket_bubble_image_path(bubble.bucket, bubble), method: :delete, class: "btn" do %>
-    <%= image_tag "picture-remove.svg", aria: { hidden: true }, size: 24 %>
+    <%= icon_tag "picture-remove" %>
     <span class="for-screen-reader">Clear background image</span>
   <% end %>
 <% else %>
   <%= form_with model: bubble, url: bucket_bubble_path(bubble.bucket, bubble), data: { controller: "form" } do |form| %>
     <label class="btn">
-      <%= image_tag "picture-add.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "picture-add" %>
       <span class="for-screen-reader">Add background image</span>
       <%= form.file_field :image, class: "input",
             accept: "image/png, image/jpeg, image/jpg, image/webp",
diff --git a/app/views/bubbles/_tagging.html.erb b/app/views/bubbles/_tagging.html.erb
index ded9eae50..e37696cc2 100644
--- a/app/views/bubbles/_tagging.html.erb
+++ b/app/views/bubbles/_tagging.html.erb
@@ -6,7 +6,7 @@
       <%= form_with url: bucket_bubble_tagging_toggles_path(bubble.bucket, bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %>
         <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %>
         <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %>
-          <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+          <%= icon_tag "add" %>
           <span class="for-screen-reader">Add a tag</span>
         <% end %>
       <% end %>
@@ -22,7 +22,7 @@
             }, tag.id %>
 
             <%= form.label "tag_id[]", tag.hashtag, for: dom_id(tag, :tag), class: "overflow-ellipsis" %>
-            <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
           </div>
         <% end %>
       <% end %>
diff --git a/app/views/bubbles/_tags.html.erb b/app/views/bubbles/_tags.html.erb
index bfd05a235..9903f9af5 100644
--- a/app/views/bubbles/_tags.html.erb
+++ b/app/views/bubbles/_tags.html.erb
@@ -14,7 +14,7 @@
 
     <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
       <button class="tag-picker__button btn card__hide-on-index <%= bubble.creating? || bubble.drafted? ? "fill-highlight" : "fill-transparent" %>" data-action="click->dialog#open:stop">
-        <%= image_tag "tag.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "tag" %>
         <span class="for-screen-reader">Add a tag</span>
       </button>
 
diff --git a/app/views/bubbles/index.html.erb b/app/views/bubbles/index.html.erb
index 1439f6f32..cfdd9f554 100644
--- a/app/views/bubbles/index.html.erb
+++ b/app/views/bubbles/index.html.erb
@@ -6,7 +6,7 @@
 <% content_for :header do %>
   <nav class="align-start">
     <%= link_to root_path, class: "btn", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "home.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "home" %>
       <span class="for-screen-reader">Home</span>
     <% end %>
 
@@ -18,12 +18,12 @@
 
     <% if bucket = @filter.buckets.first %>
       <%= link_to edit_bucket_path(bucket), class: "btn flex-item-justify-end" do %>
-        <%= image_tag "settings.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "settings" %>
         <span class="for-screen-reader">Settings for <%= bucket.name %></span>
       <% end %>
 
       <%= button_to bucket_bubbles_path(bucket), method: :post, class: "btn" do %>
-        <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "add" %>
         <span class="for-screen-reader">Create a new bubble</span>
       <% end %>
     <% else %>
@@ -46,4 +46,4 @@
   <ul class="unpad margin-none flex flex-column txt-align-start">
     <%= render partial: "bubbles/list/bubble", collection: @bubbles.offset(@display_count), as: :bubble, cached: true %>
   </ul>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb
index 9ab3323db..769dc3c01 100644
--- a/app/views/bubbles/show.html.erb
+++ b/app/views/bubbles/show.html.erb
@@ -21,7 +21,7 @@
 
   <nav class="align-start max-width">
     <%= link_to root_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "home.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "home" %>
       <span class="for-screen-reader">Home</span>
     <% end %>
 
@@ -40,7 +40,7 @@
             method: :delete,
             class: "btn",
             data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
-        <%= image_tag "trash.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "trash" %>
         <span class="for-screen-reader">Delete</span>
       <% end %>
     </div>
@@ -97,4 +97,4 @@
 <%= link_to "Go back", "#", class: "btn", hidden: true,
       data: { controller: "back-navigation hotkey", 
               action: "keydown.esc@document->hotkey#click", 
-              back_navigation_fallback_destination_value: bubbles_path(bucket_id: @bubble.bucket) } %>
\ No newline at end of file
+              back_navigation_fallback_destination_value: bubbles_path(bucket_id: @bubble.bucket) } %>
diff --git a/app/views/buckets/_bucket.html.erb b/app/views/buckets/_bucket.html.erb
index d6a589ac5..82149d71e 100644
--- a/app/views/buckets/_bucket.html.erb
+++ b/app/views/buckets/_bucket.html.erb
@@ -20,7 +20,7 @@
     <% end %>
 
     <%= link_to edit_bucket_path(bucket), class: "btn txt-small bucket__button" do %>
-      <%= image_tag "settings.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "settings" %>
       <span class="for-screen-reader">Settings for <%= bucket.name %></span>
     <% end %>
   </div>
diff --git a/app/views/buckets/edit.html.erb b/app/views/buckets/edit.html.erb
index ab671d304..4fa78823a 100644
--- a/app/views/buckets/edit.html.erb
+++ b/app/views/buckets/edit.html.erb
@@ -3,13 +3,13 @@
 <% content_for :header do %>
   <nav>
     <%= link_to bubbles_path(bucket_ids: [ @bbucket ]), class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-left" %>
       <span class="for-screen-reader">Go back</span>
     <% end %>
 
     <%= form_with model: @bucket, class: "flex-item-justify-end", method: :delete do |form| %>
       <%= form.button class: "btn btn--negative", data: { turbo_confirm: "Are you sure you want to delete this?" } do %>
-        <%= image_tag "minus.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "minus" %>
         <span class="for-screen-reader">Delete <%= @bucket.name %></span>
       <% end %>
     <% end %>
@@ -68,7 +68,7 @@
     </section>
 
     <button type="submit" id="log_in" class="btn btn--reversed center txt-medium">
-      <%= image_tag "check.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "check" %>
       <span class="for-screen-reader">Save</span>
     </button>
 
diff --git a/app/views/buckets/new.html.erb b/app/views/buckets/new.html.erb
index 6d733c6bd..0d138731e 100644
--- a/app/views/buckets/new.html.erb
+++ b/app/views/buckets/new.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <nav>
     <%= link_to root_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-left" %>
       <span class="for-screen-reader">Go back</span>
     <% end %>
   </nav>
@@ -17,7 +17,7 @@
     </label>
 
     <button type="submit" id="log_in" class="btn btn--reversed center">
-      <%= image_tag "check.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "check" %>
       <span class="for-screen-reader">Save</span>
     </button>
     <%= link_to "Cancel and go back", root_path, data: { form_target: "cancel", turbo_frame: "_top" }, hidden: true %>
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
index 931e7886b..a47b29369 100644
--- a/app/views/comments/edit.html.erb
+++ b/app/views/comments/edit.html.erb
@@ -14,7 +14,7 @@
 
           <%= tag.button type: :submit, class: "btn btn--negative flex-item-justify-end", form: dom_id(@comment, :delete_form),
               data: { turbo_confirm: "Are you sure you want to delete this comment?" } do %>
-            <%= image_tag "trash.svg", aria: { hidden: true }, size: 16 %>
+            <%= icon_tag "trash", size: 16 %>
             <span class="for-screen-reader">Delete</span>
           <% end %>
         </div>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index b319cf9fa..bca5bbeb7 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -22,9 +22,9 @@
 					}, bucket.id %>
 
 					<%= form.label "bucket_ids[]", bucket.name, for: dom_id(bucket, :filter), class: "overflow-ellipsis" %>
-					<%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+					<%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
 				</div>
 			<% end %>
 		<% end %>
 	</dialog>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index a6216bbbf..3144288ed 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -10,7 +10,7 @@
     </div>
 
     <%= link_to account_users_path, class: "btn flex-item-justify-end" do %>
-      <%= image_tag "settings.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "settings" %>
       <span class="for-screen-reader">Account settings</span>
     <% end %>
   </nav>
@@ -38,7 +38,7 @@
     <div class="flex align-start gap min-width" >
       <h2 class="txt-normal txt-uppercase overflow-ellipsis">Collections</h2>
       <%= link_to new_bucket_path, class: "btn txt-xx-small flex-item-justify-end flex-item-no-shrink", style: "view-transition-name: new-bucket" do %>
-        <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "add" %>
         <span class="for-screen-reader">New</span>
       <% end %>
     </div>
diff --git a/app/views/filters/_assignees.html.erb b/app/views/filters/_assignees.html.erb
index d03fe5ccf..500d5c720 100644
--- a/app/views/filters/_assignees.html.erb
+++ b/app/views/filters/_assignees.html.erb
@@ -32,7 +32,7 @@
           }, "unassigned" %>
 
           <%= form.label :assignment_status, "No one", class: "overflow-ellipsis" %>
-          <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+          <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
         </div>
         
         <% Current.account.users.active.order(:name).each do |user| %>
@@ -44,10 +44,10 @@
             }, user.id %>
 
             <%= form.label "assignee_ids[]", user.name, for: dom_id(user, :filter), class: "overflow-ellipsis" %>
-            <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
           </div>
         <% end %>
       <% end %>
     </dialog>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/filters/_buckets.html.erb b/app/views/filters/_buckets.html.erb
index a6ce05184..20449c917 100644
--- a/app/views/filters/_buckets.html.erb
+++ b/app/views/filters/_buckets.html.erb
@@ -26,9 +26,9 @@
           }, bucket.id %>
 
           <%= form.label "bucket_ids[]", bucket.name, for: dom_id(bucket, :filter), class: "overflow-ellipsis" %>
-          <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+          <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
         </div>
       <% end %>
     <% end %>
   </dialog>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/filters/_creators.html.erb b/app/views/filters/_creators.html.erb
index 83fc7c69f..557778c09 100644
--- a/app/views/filters/_creators.html.erb
+++ b/app/views/filters/_creators.html.erb
@@ -34,7 +34,7 @@
           }, Current.user.id %>
 
           <%= form.label :creator_ids, "Me", for: form.field_id(:creator_ids, Current.user.id), class: "overflow-ellipsis" %>
-          <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+          <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
         </div>
 
         <% Current.account.users.active.without(Current.user).order(:name).each do |user| %>
@@ -47,7 +47,7 @@
             }, user.id %>
 
             <%= form.label :creator_ids, user.name, for: form.field_id(:creator_ids, user.id), class: "overflow-ellipsis" %>
-            <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
           </div>
         <% end %>
       <% end %>
diff --git a/app/views/filters/_dialog.html.erb b/app/views/filters/_dialog.html.erb
index f55779b1a..ecf1c1b9a 100644
--- a/app/views/filters/_dialog.html.erb
+++ b/app/views/filters/_dialog.html.erb
@@ -4,13 +4,13 @@
       <span class="btn btn--placeholder txt-small" aria-hidden="true"></span>
 
       <h2 class="txt-large flex align-center gap-half margin-none">
-        <%= image_tag "filter.svg", aria: { hidden: true }, size: 30 %>
+        <%= icon_tag "filter", size: 30 %>
         <span>Filter</span>
       </h2>
 
       <form method="dialog">
         <button class="btn panel__close txt-small" title="Close (esc)">
-          <%= image_tag "remove.svg", aria: { hidden: true }, size: 24 %>
+          <%= icon_tag "remove" %>
           <span class="for-screen-reader">Close</span>
         </button>
       </form>
@@ -26,7 +26,7 @@
 
         <button class="btn">
           <span class="for-screen-reader">Apply</span>
-          <%= image_tag "arrow-right.svg", aria: { hidden: true }, size: 24 %>
+          <%= icon_tag "arrow-right" %>
         </button>
       <% end %>
     </div>
@@ -51,7 +51,7 @@
               <%= label_tag "bucket_ids_#{bucket.id}", class: "btn filter__button" do %>
                 <%= check_box_tag "bucket_ids[]", bucket.id, filter.buckets.include?(bucket), id: "bucket_ids_#{bucket.id}", hidden: true %>
                 <span><%= bucket.name %></span>
-                <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+                <%= icon_tag "close" %>
               <% end %>
             </li>
           <% end %>
@@ -63,7 +63,7 @@
             <%= label_tag "indexed_by_#{filter.default_indexed_by}", class: "btn filter__button" do %>
               <%= radio_button_tag "indexed_by", filter.default_indexed_by, filter.default_indexed_by?, hidden: true %>
               <span>Most active</span>
-              <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+              <%= icon_tag "close" %>
             <% end %>
           </li>
 
@@ -72,7 +72,7 @@
               <label class="btn filter__button">
                 <%= radio_button_tag "indexed_by", index, filter.indexed_by == index, class: "visually-hidden" %>
                 <span><%= index.humanize %></span>
-                <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+                <%= icon_tag "close" %>
               </label>
             </li>
           <% end %>
@@ -86,7 +86,7 @@
                 <%= label_tag "stage_ids_#{stage.id}", class: "btn filter__button" do %>
                   <%= check_box_tag "stage_ids[]", stage.id, filter.stages.include?(stage), id: "stage_ids_#{stage.id}", hidden: true %>
                   <span><%= stage.name %></span>
-                  <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+                  <%= icon_tag "close" %>
                 <% end %>
               </li>
             <% end %>
@@ -96,13 +96,13 @@
         <% if (tags = Current.account.tags.order(:title)).any? %>
           <div class="filter__menu" role="group" aria-label="Tagged">
             <div class="filter__label"><strong>Tagged</strong></div>
-            
+
             <% tags.each do |tag| %>
               <div>
                 <label class="btn filter__button">
                   <%= check_box_tag "tag_ids[]", tag.id, filter.tags.include?(tag), class: "visually-hidden" %>
                   <span><%= tag.hashtag %></span>
-                  <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+                  <%= icon_tag "close" %>
                 </label>
               </div>
             <% end %>
@@ -119,7 +119,7 @@
                       action: "filter-form#clearCategory", 
                       filter_form_name_param: "assignee_ids[],assigner_ids[]" } %>
               <span>No one</span>
-              <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+              <%= icon_tag "close" %>
             </label>
           </div>
 
@@ -129,7 +129,7 @@
                     class: "visually-hidden",
                     data: { action: "filter-form#clearCategory", filter_form_name_param: "assignment_status" } %>
               <span>Me</span>
-              <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+              <%= icon_tag "close" %>
             </label>
           </div>
 
@@ -139,7 +139,7 @@
                 <%= check_box_tag "assignee_ids[]", user.id, filter.assignees.include?(user), class: "visually-hidden",
                       data: { action: "filter-form#clearCategory", filter_form_name_param: "assignment_status" } %>
                 <span><%= user.name %></span>
-                <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+                <%= icon_tag "close" %>
               </label>
             </div>
           <% end %>
@@ -153,7 +153,7 @@
               <%= check_box_tag "creator_ids[]", Current.user.id, filter.creators.include?(Current.user),
                     class: "visually-hidden" %>
               <span>Me</span>
-              <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+              <%= icon_tag "close" %>
             </label>
           </div>
 
@@ -162,7 +162,7 @@
               <label class="btn filter__button">
                 <%= check_box_tag "creator_ids[]", user.id, filter.creators.include?(user), class: "visually-hidden" %>
                 <span><%= user.name %></span>
-                <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+                <%= icon_tag "close" %>
               </label>
             </div>
           <% end %>
@@ -173,13 +173,13 @@
 
   <div class="flex align-center txt-align-center justify-space-between gap-half margin-block-start">
     <%= tag.button class: "btn", form: :filter_form, formaction: filters_path, formmethod: :post do %>
-      <%= image_tag "bubbles.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "bubbles" %>
       <span>Save collection</span>
     <% end %>
 
     <button class="btn btn--reversed" form="filter_form">
       <span>Apply</span>
-      <%= image_tag "arrow-right.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-right" %>
     </button>
   </div>
 </dialog>
diff --git a/app/views/filters/_filter.html.erb b/app/views/filters/_filter.html.erb
index d76e0a232..e058941fe 100644
--- a/app/views/filters/_filter.html.erb
+++ b/app/views/filters/_filter.html.erb
@@ -17,10 +17,10 @@
 
     <div class="flex align-center justify-center flex-column flex-wrap center gap-half position-relative full-width">
       <%= link_to bubbles_path(**filter.as_params), class: "txt-ink" do %>
-        <strong class="txt-medium"><%= image_tag "filter.svg", aria: { hidden: true }, size: 24, class: "flex-inline", style: "vertical-align: bottom" %> <%= filter.summary %></strong>
+        <strong class="txt-medium"><%= icon_tag "filter", class: "flex-inline", style: "vertical-align: bottom" %> <%= filter.summary %></strong>
       <% end %>
       <%= button_to filter_path(filter), method: :delete, class: "btn txt-small btn--negative bucket__button", data: { turbo_confirm: "Are you sure you want to delete this filter?" } do %>
-        <%= image_tag "minus.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "minus" %>
         <span class="for-screen-reader">Delete</span>
       <% end %>
     </div>
diff --git a/app/views/filters/_indexed_by.html.erb b/app/views/filters/_indexed_by.html.erb
index 34401948a..79271b248 100644
--- a/app/views/filters/_indexed_by.html.erb
+++ b/app/views/filters/_indexed_by.html.erb
@@ -22,7 +22,7 @@
             data: { action: "change->form#submit" } %>
 
         <%= form.label :indexed_by, "Most active", value: filter.default_indexed_by, class: "overflow-ellipsis" %>
-        <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+        <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
       </div>
 
       <% Filter::INDEXES.each do |index| %>
@@ -32,7 +32,7 @@
               data: { action: "change->form#submit" } %>
 
           <%= form.label :indexed_by, index.humanize, value: index, class: "overflow-ellipsis" %>
-          <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+          <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
         </div>
       <% end %>
     <% end %>
diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index cb05c017e..a266f33e1 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -1,6 +1,6 @@
 <div class="filters flex-inline align-center gap-half margin-block-end margin-block-start-half">
   <button class="btn btn--plain txt-small" data-action="click->dialog#toggle">
-    <%= image_tag "filter.svg", aria: { hidden: true }, size: 24 %>
+    <%= icon_tag "filter" %>
     <span class="for-screen-reader">Filter</span>
   </button>
 
@@ -18,7 +18,7 @@
 
     <% if any_filters?(filter) %>
       <%= link_to bubbles_path, class: "btn btn--remove txt-small" do %>
-        <%= image_tag "close.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "close" %>
         <span class="for-screen-reader">Clear all</span>
       <% end %>
     <% end %>
diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb
index 3798a53d0..01ea278b5 100644
--- a/app/views/filters/_stages.html.erb
+++ b/app/views/filters/_stages.html.erb
@@ -31,7 +31,7 @@
             }, stage.id %>
 
               <%= form.label :stage_ids, stage.name, for: form.field_id(:stage_ids, stage.id), class: "overflow-ellipsis" %>
-              <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+              <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
             </div>
         <% end %>
       <% end %>
diff --git a/app/views/filters/_tags.html.erb b/app/views/filters/_tags.html.erb
index fa35e8a8c..178f62098 100644
--- a/app/views/filters/_tags.html.erb
+++ b/app/views/filters/_tags.html.erb
@@ -31,10 +31,10 @@
             }, tag.id %>
 
             <%= form.label "tag_ids[]", tag.hashtag, for: dom_id(tag, :filter), class: "overflow-ellipsis" %>
-            <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
+            <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
           </div>
         <% end %>
       <% end %>
     </dialog>
   </div> 
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/first_runs/show.html.erb b/app/views/first_runs/show.html.erb
index 476fbe987..16409b528 100644
--- a/app/views/first_runs/show.html.erb
+++ b/app/views/first_runs/show.html.erb
@@ -28,7 +28,7 @@
       </label>
     </div>
     <button type="submit" id="log_in" class="btn btn--reversed center">
-      <%= image_tag "arrow-right.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-right" %>
       <span class="for-screen-reader">Create your account</span>
     </button>
   <% end %>
diff --git a/app/views/notifications/_tray.html.erb b/app/views/notifications/_tray.html.erb
index 5ec51494a..8e12e58f4 100644
--- a/app/views/notifications/_tray.html.erb
+++ b/app/views/notifications/_tray.html.erb
@@ -20,7 +20,7 @@
     <%= button_to notifications_mark_all_read_path, 
         class: "notification-tray__read_action btn btn--reversed fill-transparent borderless flex-item-justify-start shadow txt-xx-small", 
         data: { action: "click->dialog#close", turbo_frame: "notifications" } do %>
-      <%= image_tag "check.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "check" %>
       <span class="for-screen-reader">Mark all read</span>
     <% end %>
 
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index c35e37f5b..3eb51f2bb 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <nav class="align-start">
     <%= link_to root_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "home.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "home" %>
       <span class="for-screen-reader">Home</span>
     <% end %>
 
diff --git a/app/views/notifications/settings/show.html.erb b/app/views/notifications/settings/show.html.erb
index f226dfd68..a1a1cb9b5 100644
--- a/app/views/notifications/settings/show.html.erb
+++ b/app/views/notifications/settings/show.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <nav class="align-start">
     <%= link_to notifications_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-left" %>
       <span class="for-screen-reader">Go back</span>
     <% end %>
 
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 733e4c97f..89e546267 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -21,7 +21,7 @@
     </div>
 
     <button type="submit" id="log_in" class="btn btn--reversed center">
-      <%= image_tag "arrow-right.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-right" %>
       <span class="for-screen-reader">Sign in</span>
     </button>
   <% end %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 13dbde439..16f2f6ad2 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -12,7 +12,7 @@
         </span>
 
         <%= button_to tag_path(tag), class: "btn txt-small", method: :delete, data: { turbo_confirm: "Are you sure?" } do %>
-          <%= image_tag "remove.svg", aria: { hidden: true }, size: 24 %>
+          <%= icon_tag "remove" %>
           <span class="for-screen-reader">Delete</span>
         <% end %>
       </li>
diff --git a/app/views/users/_transfer.html.erb b/app/views/users/_transfer.html.erb
index 314d8ff39..68b35cbe4 100644
--- a/app/views/users/_transfer.html.erb
+++ b/app/views/users/_transfer.html.erb
@@ -22,7 +22,7 @@
 
         <form method="dialog" class="margin-block-start flex justify-center">
           <button class="btn">
-            <%= image_tag "remove.svg", aria: { hidden: true }, size: 24 %>
+            <%= icon_tag "remove" %>
             <span class="for-screen-reader">Close</span>
           </button>
         </form>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 9953d4927..af3cb11ba 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <nav>
     <%= link_to user_path(@user), class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-left" %>
       <span class="for-screen-reader">Back</span>
     <% end %>
   </nav>
@@ -53,7 +53,7 @@
           </label>
         </div>
         <button type="submit" id="log_in" class="btn btn--reversed center">
-          <%= image_tag "check.svg", aria: { hidden: true }, size: 24 %>
+          <%= icon_tag "check" %>
             <span class="for-screen-reader">Sign in</span>
         </button>
 
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index c0f464cb6..d3ff5851f 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -34,7 +34,7 @@
       </label>
     </div>
     <button type="submit" id="log_in" class="btn btn--reversed center">
-      <%= image_tag "arrow-right.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-right" %>
       <span class="for-screen-reader">Sign in</span>
     </button>
   <% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 0b568c112..18aaadd5d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -3,13 +3,13 @@
 <% content_for :header do %>
   <nav>
     <%= link_to "javascript:window.history.back()", class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-left" %>
       <span class="for-screen-reader">Back</span>
     <% end %>
 
     <% if Current.user == @user %>
       <%= link_to edit_user_path(@user), class: "btn flex-item-justify-end", data: { turbo_frame: dom_id(@user) } do %>
-        <%= image_tag "pencil.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "pencil" %>
         <span class="for-screen-reader">Edit</span>
       <% end %>
     <% end %>
@@ -49,7 +49,7 @@
 
   <div class="panel shadow center margin-block-double">
     <%= button_to session_path, method: :delete, class: "btn center txt-medium" do %>
-      <%= image_tag "logout.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "logout" %>
       <span class="for-screen-reader">Sign out</span>
     <% end %>
   </div>
diff --git a/app/views/workflows/_workflow.html.erb b/app/views/workflows/_workflow.html.erb
index b6307822a..cba18f2e1 100644
--- a/app/views/workflows/_workflow.html.erb
+++ b/app/views/workflows/_workflow.html.erb
@@ -15,7 +15,7 @@
         <%= render partial: "workflows/stages/stage", collection: workflow.stages %>
 
         <%= link_to new_workflow_stage_path(workflow), class: "btn btn--small" do %>
-          <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+          <%= icon_tag "add" %>
           <span class="for-screen-reader">New stage</span>
         <% end %>
       <% end %>
diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb
index a1ca8aec1..c954b26e5 100644
--- a/app/views/workflows/edit.html.erb
+++ b/app/views/workflows/edit.html.erb
@@ -8,17 +8,17 @@
     <% end %>
 
     <%= tag.button type: :submit, class: "btn btn--small btn--positive", form: dom_id(@workflow, :form) do %>
-      <%= image_tag "check.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "check" %>
       <span class="for-screen-reader">Save</span>
     <% end %>
 
     <%= link_to workflow_path(@workflow), class: "btn btn--small", data: { turbo_frame: dom_id(@workflow) } do %>
-      <%= image_tag "remove-med.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "remove-med" %>
       <span class="for-screen-reader">Cancel</span>
     <% end %>
 
     <%= button_to workflow_path(@workflow), method: :delete, class: "btn btn--small btn--negative", data: { turbo_frame: :workflows, turbo_confirm: "Are you sure you want to delete this workflow?" } do %>
-      <%= image_tag "minus.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "minus" %>
       <span class="for-screen-reader">Delete <%= @workflow.name %></span>
     <% end %>
   </div>
diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb
index 7f7f2ae59..2c1443f9a 100644
--- a/app/views/workflows/index.html.erb
+++ b/app/views/workflows/index.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <nav>
     <%= link_to account_users_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-left" %>
       <span class="for-screen-reader">Go back</span>
     <% end %>
     <span class="btn btn--placeholder"></span>
@@ -11,7 +11,7 @@
     <h1 class="txt-large"><%= @page_title %></h1>
 
     <%= link_to new_workflow_path, class: "btn flex-item-justify-end" do %>
-      <%= image_tag "add.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "add" %>
       <span class="for-screen-reader">Create a new workflow</span>
     <% end %>
   </nav>
diff --git a/app/views/workflows/new.html.erb b/app/views/workflows/new.html.erb
index ad6fb3a6b..4af546990 100644
--- a/app/views/workflows/new.html.erb
+++ b/app/views/workflows/new.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <nav>
     <%= link_to workflows_path, class: "btn flex-item-justify-start", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "arrow-left" %>
       <span class="for-screen-reader">Go back</span>
     <% end %>
     <h1 class="txt-large center"><%= @page_title %></h1>
@@ -16,7 +16,7 @@
     <%= form_with model: @workflow, url: workflows_path, data: { controller: "form" } do |form| %>
       <%= form.text_field :name, required: true, autofocus: true, class: "input txt-large", placeholder: "Name your Workflow…", data: { action: "keydown.esc@document->form#cancel" } %>
       <%= form.button type: :submit, class: "btn btn--reversed center margin-block-start txt-large" do %>
-        <%= image_tag "check.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "check" %>
         <span class="for-screen-reader">Create Workflow</span>
       <% end %>
       <%= link_to "Go back", workflows_path, data: { form_target: "cancel", turbo_frame: "_top" }, hidden: true %>
diff --git a/app/views/workflows/stages/edit.html.erb b/app/views/workflows/stages/edit.html.erb
index e63d6fed7..ea0f81d80 100644
--- a/app/views/workflows/stages/edit.html.erb
+++ b/app/views/workflows/stages/edit.html.erb
@@ -6,19 +6,19 @@
 
   <div class="flex align-center gap-half">
     <%= tag.button type: :submit, class: "btn btn--small btn--positive", form: dom_id(@stage, :form) do %>
-      <%= image_tag "check.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "check" %>
       <span class="for-screen-reader">Save</span>
     <% end %>
 
     <%= link_to workflow_path(@workflow), class: "btn btn--small", data: { turbo_frame: dom_id(@workflow) } do %>
-      <%= image_tag "remove-med.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "remove-med" %>
       <span class="for-screen-reader">Cancel</span>
     <% end %>
 
     <% if @stage.workflow.stages.many? %>
       <%= button_to workflow_stage_path(@stage.workflow, @stage), method: :delete, class: "btn btn--negative btn--small",
           data: { turbo_frame: dom_id(@workflow), turbo_confirm: "Are you sure you want to delete this stage?" } do %>
-        <%= image_tag "minus.svg", aria: { hidden: true }, size: 24 %>
+        <%= icon_tag "minus" %>
         <span class="for-screen-reader">Delete <%= @stage.name %></span>
       <% end %>
     <% end %>
diff --git a/app/views/workflows/stages/new.html.erb b/app/views/workflows/stages/new.html.erb
index ae3bd8bda..f788d9bb3 100644
--- a/app/views/workflows/stages/new.html.erb
+++ b/app/views/workflows/stages/new.html.erb
@@ -2,11 +2,11 @@
   <%= form_with model: @stage, url: workflow_stages_path(@stage.workflow), class: "flex align-center gap-half", data: { controller: "form" } do |form| %>
     <%= form.text_field :name, required: true, autofocus: true, class: "input", data: { action: "keydown.esc@document->form#cancel" } %>
     <%= form.button type: :submit, class: "btn btn--positive txt-small" do %>
-      <%= image_tag "check.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "check" %>
       <span class="for-screen-reader">Add stage</span>
     <% end %>
     <%= link_to workflow_path(@workflow), class: "btn btn--small", data: { form_target: "cancel", controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
-      <%= image_tag "remove-med.svg", aria: { hidden: true }, size: 24 %>
+      <%= icon_tag "remove-med" %>
       <span class="for-screen-reader">Cancel</span>
     <% end %>
   <% end %>