diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
index 71105e58..64a49cbf 100644
--- a/app/views/dashboard/index.html.erb
+++ b/app/views/dashboard/index.html.erb
@@ -1,11 +1,7 @@
 <div class="flex justify-between mb-4">
   <h1 class="text-4xl font-bold">Dashboard</h1>
   <%= link_to new_template_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: :modal } do %>
-    <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round">
-      <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-      <line x1="12" y1="5" x2="12" y2="19" />
-      <line x1="5" y1="12" x2="19" y2="12" />
-    </svg>
+    <%= svg_icon('plus', class: 'w-6 h-6') %>
     <span class="hidden md:block">Create Template</span>
   <% end %>
 </div>
@@ -20,15 +16,7 @@
         <div >
           <p class="text-sm opacity-70 mb-1">Created by <%= template.author.full_name %></p>
           <p class="flex items-center gap-1 text-xs opacity-50">
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" fill="none" stroke-linecap="round" stroke-linejoin="round">
-              <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-              <path d="M4 7a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2h-12a2 2 0 0 1 -2 -2v-12z" />
-              <path d="M16 3v4" />
-              <path d="M8 3v4" />
-              <path d="M4 11h16" />
-              <path d="M11 15h1" />
-              <path d="M12 15v3" />
-            </svg>
+            <%= svg_icon('calendar', class: 'w-4 h-4') %>
             <span><%= l(template.created_at, format: :long) %></span>
           </p>
         </div>
diff --git a/app/views/devise/shared/_error_messages.html.erb b/app/views/devise/shared/_error_messages.html.erb
index aa9ea769..ddc4b7fa 100644
--- a/app/views/devise/shared/_error_messages.html.erb
+++ b/app/views/devise/shared/_error_messages.html.erb
@@ -1,7 +1,7 @@
 <% if resource.errors.any? %>
   <div id="error_explanation" data-turbo-cache="false">
     <div class="alert">
-      <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
+      <%= svg_icon('x_circle', class: 'stroke-current shrink-0 h-6 w-6')  %>
       <div>
         <h3 class="font-bold">
           <%= I18n.t('errors.messages.not_saved',
diff --git a/app/views/icons/_calendar.html.erb b/app/views/icons/_calendar.html.erb
new file mode 100644
index 00000000..a396d7f6
--- /dev/null
+++ b/app/views/icons/_calendar.html.erb
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="#000000" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+  <path d="M4 7a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2h-12a2 2 0 0 1 -2 -2v-12z" />
+  <path d="M16 3v4" />
+  <path d="M8 3v4" />
+  <path d="M4 11h16" />
+  <path d="M11 15h1" />
+  <path d="M12 15v3" />
+</svg>
diff --git a/app/views/icons/_clipboard.html.erb b/app/views/icons/_clipboard.html.erb
new file mode 100644
index 00000000..078c71b7
--- /dev/null
+++ b/app/views/icons/_clipboard.html.erb
@@ -0,0 +1,5 @@
+ <svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+  <path d="M9 5h-2a2 2 0 0 0 -2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2 -2v-12a2 2 0 0 0 -2 -2h-2" />
+  <path d="M9 3m0 2a2 2 0 0 1 2 -2h2a2 2 0 0 1 2 2v0a2 2 0 0 1 -2 2h-2a2 2 0 0 1 -2 -2z" />
+</svg>
diff --git a/app/views/icons/_info_circle.html.erb b/app/views/icons/_info_circle.html.erb
new file mode 100644
index 00000000..9ee66ae1
--- /dev/null
+++ b/app/views/icons/_info_circle.html.erb
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" fill="none" viewBox="0 0 24 24"><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"></path></svg>
diff --git a/app/views/icons/_paperclip.html.erb b/app/views/icons/_paperclip.html.erb
new file mode 100644
index 00000000..f9a8abd2
--- /dev/null
+++ b/app/views/icons/_paperclip.html.erb
@@ -0,0 +1,3 @@
+ <svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+  <path fill-rule="evenodd" d="M15.621 4.379a3 3 0 00-4.242 0l-7 7a3 3 0 004.241 4.243h.001l.497-.5a.75.75 0 011.064 1.057l-.498.501-.002.002a4.5 4.5 0 01-6.364-6.364l7-7a4.5 4.5 0 016.368 6.36l-3.455 3.553A2.625 2.625 0 119.52 9.52l3.45-3.451a.75.75 0 111.061 1.06l-3.45 3.451a1.125 1.125 0 001.587 1.595l3.454-3.553a3 3 0 000-4.242z" clip-rule="evenodd" />
+</svg>
diff --git a/app/views/icons/_plus.html.erb b/app/views/icons/_plus.html.erb
new file mode 100644
index 00000000..ef6c49ba
--- /dev/null
+++ b/app/views/icons/_plus.html.erb
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <line x1="12" y1="5" x2="12" y2="19" />
+  <line x1="5" y1="12" x2="19" y2="12" />
+</svg>
diff --git a/app/views/icons/_x_circle.html.erb b/app/views/icons/_x_circle.html.erb
new file mode 100644
index 00000000..a7a5104c
--- /dev/null
+++ b/app/views/icons/_x_circle.html.erb
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 805efd5e..f3e4261e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,7 +18,7 @@
       <div id="flash" class="absolute top-0 w-full h-0">
         <div class="max-w-xl mx-auto mt-1.5">
           <div class="alert py-3">
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info flex-shrink-0 w-6 h-6"><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"></path></svg>
+             <%= svg_icon('info_circle', class: 'stroke-info flex-shrink-0 w-6 h-6') %>
             <div>
               <span><%= flash[:notice] || flash[:alert] %></span>
             </div>
diff --git a/app/views/storage_settings/_disk_form.html.erb b/app/views/storage_settings/_disk_form.html.erb
index 9a0e886f..e69f286e 100644
--- a/app/views/storage_settings/_disk_form.html.erb
+++ b/app/views/storage_settings/_disk_form.html.erb
@@ -2,7 +2,7 @@
   <%= ff.hidden_field :service, value: 'disk' %>
 <% end %>
 <div class="alert my-4">
-  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-current flex-shrink-0 w-6 h-6"><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"></path></svg>
+  <%= svg_icon('info_circle', class: 'stroke-current flex-shrink-0 w-6 h-6') %>
   <div>
     <h3 class="font-bold">Store all files on disk</h3>
     <p class="text-gray-700">
diff --git a/app/views/submissions/index.html.erb b/app/views/submissions/index.html.erb
index c7bcf7e4..8b715478 100644
--- a/app/views/submissions/index.html.erb
+++ b/app/views/submissions/index.html.erb
@@ -10,11 +10,7 @@
       </buttun>
       <input id="share-link-input" autocomplete="off" type="text" class="input input-bordered w-full join-item" value="<%= start_form_url(slug: @template.slug) %>" disabled>
       <clipboard-copy class="btn btn-neutral btn-square join-item text-white font-bold" for="share-link-input">
-        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-          <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-          <path d="M9 5h-2a2 2 0 0 0 -2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2 -2v-12a2 2 0 0 0 -2 -2h-2" />
-          <path d="M9 3m0 2a2 2 0 0 1 2 -2h2a2 2 0 0 1 2 2v0a2 2 0 0 1 -2 2h-2a2 2 0 0 1 -2 -2z" />
-        </svg>
+        <%= svg_icon('clipboard', class: 'w-6 h-6') %>
       </clipboard-copy>
     </div>
   </div>
@@ -22,11 +18,7 @@
 <div class="flex justify-between mb-4">
   <h1 class="text-3xl font-bold">Recepients</h1>
   <%= link_to new_template_submission_path(@template), class: 'btn btn-primary btn-sm gap-2', data: { turbo_frame: 'modal' } do %>
-    <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round">
-      <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-      <line x1="12" y1="5" x2="12" y2="19" />
-      <line x1="5" y1="12" x2="19" y2="12" />
-    </svg>
+    <%= svg_icon('plus', class: 'w-6 h-6') %>
     <span class="hidden md:block">Add Recepients</span>
   <% end %>
 </div>
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index aa62f643..7fbd943d 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -54,9 +54,7 @@
                     <% attachment = ActiveStorage::Attachment.find_by(uuid:) %>
                     <li class="flex items-center justify-between py-4 pl-4 pr-5 text-sm leading-6">
                       <div class="flex w-0 flex-1 items-center">
-                        <svg class="h-5 w-5 flex-shrink-0 text-gray-300" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                          <path fill-rule="evenodd" d="M15.621 4.379a3 3 0 00-4.242 0l-7 7a3 3 0 004.241 4.243h.001l.497-.5a.75.75 0 011.064 1.057l-.498.501-.002.002a4.5 4.5 0 01-6.364-6.364l7-7a4.5 4.5 0 016.368 6.36l-3.455 3.553A2.625 2.625 0 119.52 9.52l3.45-3.451a.75.75 0 111.061 1.06l-3.45 3.451a1.125 1.125 0 001.587 1.595l3.454-3.553a3 3 0 000-4.242z" clip-rule="evenodd" />
-                        </svg>
+                        <%= svg_icon('paperclip', class: 'h-5 w-5 flex-shrink-0 text-gray-300') %>
                         <div class="ml-4 flex min-w-0 flex-1 gap-2">
                           <span class="truncate font-medium">
                             <%= attachment.filename %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 1d6d4c22..ba83585d 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -4,11 +4,7 @@
     <div class="flex justify-between mb-4">
       <h1 class="text-4xl font-bold">Team</h1>
       <%= link_to new_user_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: 'modal' } do %>
-        <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round">
-          <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-          <line x1="12" y1="5" x2="12" y2="19" />
-          <line x1="5" y1="12" x2="19" y2="12" />
-        </svg>
+        <%= svg_icon('plus', class: 'w-6 h-6') %>
         <span>New User</span>
       <% end %>
     </div>