diff --git a/Gemfile b/Gemfile
index 9d4ac1fe962..e8e14270f57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem "bootsnap", require: false
 gem "importmap-rails"
 gem "propshaft"
 gem "tailwindcss-rails"
-gem "lucide-rails", github: "maybe-finance/lucide-rails"
+gem "lucide-rails", github: "heyvito/lucide-rails"
 
 # Hotwire + UI
 gem "stimulus-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 5899aa83e9a..d8398a2a0af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
-  remote: https://github.com/maybe-finance/lucide-rails.git
-  revision: 272e5fb8418ea458da3995d6abe0ba0ceee9c9f0
+  remote: https://github.com/heyvito/lucide-rails.git
+  revision: b56d0ffee924450dabc5a857b12af654921ba906
   specs:
-    lucide-rails (0.2.0)
+    lucide-rails (0.7.1)
       railties (>= 4.1.0)
 
 GEM
diff --git a/app/components/DS/filled_icon.rb b/app/components/DS/filled_icon.rb
index 73113a0bce1..ae65bc78756 100644
--- a/app/components/DS/filled_icon.rb
+++ b/app/components/DS/filled_icon.rb
@@ -82,7 +82,7 @@ def size_classes
     end
 
     def radius_classes
-      rounded ? "rounded-full" : SIZES[size][:container_radius]
+      rounded ? "rounded-sm" : SIZES[size][:container_radius]
     end
 
     def custom_fg_color
diff --git a/app/views/categories/_color_avatar.html.erb b/app/views/categories/_color_avatar.html.erb
index b8cde18aeb6..fd8b61cfa13 100644
--- a/app/views/categories/_color_avatar.html.erb
+++ b/app/views/categories/_color_avatar.html.erb
@@ -2,7 +2,7 @@
 
 <span
       data-category-target="avatar"
-      class="w-14 h-14 flex items-center justify-center rounded-full"
+      class="w-14 h-14 flex items-center justify-center rounded-sm"
       style="background-color: color-mix(in oklab, <%= category.color %> 10%, transparent); color: <%= category.color %>">
   <%= icon(category.lucide_icon, size: "2xl", color: "current") %>
 </span>
diff --git a/app/views/family_merchants/_family_merchant.html.erb b/app/views/family_merchants/_family_merchant.html.erb
index bc69a25fb47..55c7fd1b475 100644
--- a/app/views/family_merchants/_family_merchant.html.erb
+++ b/app/views/family_merchants/_family_merchant.html.erb
@@ -3,8 +3,8 @@
 <div class="flex justify-between items-center p-4 bg-container">
   <div class="flex w-full items-center gap-2.5">
     <% if family_merchant.logo_url %>
-      <div class="w-8 h-8 rounded-full flex justify-center items-center">
-        <%= image_tag family_merchant.logo_url, class: "w-8 h-8 rounded-full" %>
+      <div class="w-8 h-8 rounded-sm flex justify-center items-center">
+        <%= image_tag family_merchant.logo_url, class: "w-8 h-8 rounded-sm" %>
       </div>
     <% else %>
       <%= render partial: "shared/color_avatar", locals: { name: family_merchant.name, color: family_merchant.color } %>
diff --git a/app/views/family_merchants/_form.html.erb b/app/views/family_merchants/_form.html.erb
index f0680ab5408..2dfb56847c1 100644
--- a/app/views/family_merchants/_form.html.erb
+++ b/app/views/family_merchants/_form.html.erb
@@ -14,7 +14,7 @@
         <% FamilyMerchant::COLORS.each do |color| %>
           <label class="relative">
             <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->color-avatar#handleColorChange" } %>
-            <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div>
+            <div class="w-6 h-6 rounded-sm cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div>
           </label>
         <% end %>
       </div>
diff --git a/app/views/shared/_color_avatar.html.erb b/app/views/shared/_color_avatar.html.erb
index be59ad7d84d..8c403af0557 100644
--- a/app/views/shared/_color_avatar.html.erb
+++ b/app/views/shared/_color_avatar.html.erb
@@ -5,7 +5,7 @@
 <% background_color = "color-mix(in srgb, #{color} 5%, white)" %>
 <% border_color = "color-mix(in srgb, #{color} 10%, white)" %>
 <span data-color-avatar-target="avatar"
-      class="w-8 h-8 flex items-center justify-center rounded-full"
+      class="w-8 h-8 flex items-center justify-center rounded-sm"
       style="background-color: <%= background_color %>; border-color: <%= border_color %>; color: <%= color %>">
   <%= letter.upcase %>
 </span>
diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index afc047de533..b04c93b8c4d 100644
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -50,7 +50,7 @@
   </div>
   <div class="flex items-center gap-4">
     <%= select_tag :per_page,
-                   options_for_select(["10", "20", "30", "50"], pagy.limit),
+                   options_for_select(["10", "20", "30", "50", "100", "200"], pagy.limit),
                    data: { controller: "selectable-link" },
                    class: "py-1.5 pr-8 text-sm text-primary font-medium bg-container-inset border border-secondary rounded-lg focus:border-secondary focus:ring-secondary focus-visible:ring-secondary" %>
   </div>
diff --git a/app/views/transactions/_transaction.html.erb b/app/views/transactions/_transaction.html.erb
index 9b87c7aff10..c40a5ffedab 100644
--- a/app/views/transactions/_transaction.html.erb
+++ b/app/views/transactions/_transaction.html.erb
@@ -20,7 +20,7 @@
           <%= content_tag :div, class: ["flex items-center gap-2"] do %>
             <% if transaction.merchant&.logo_url.present? %>
               <%= image_tag transaction.merchant.logo_url,
-                  class: "w-6 h-6 rounded-full",
+                  class: "w-6 h-6 rounded-sm",
                   loading: "lazy" %>
             <% else %>
               <%= render DS::FilledIcon.new(