diff --git a/app/views/bubbles/filters/_bucket.html.erb b/app/views/bubbles/filters/_bucket.html.erb
index 76dc16535..376516df9 100644
--- a/app/views/bubbles/filters/_bucket.html.erb
+++ b/app/views/bubbles/filters/_bucket.html.erb
@@ -10,9 +10,4 @@
       <% end %>
     </menu>
   </dialog>
-
-  <%= link_to edit_bucket_url(bucket), class: "btn btn--plain", style: "font-size: 0.25em;" do %>
-    <%= image_tag "pencil.svg", aria: { hidden: true }, size: 24 %>
-    <span class="for-screen-reader">Edit</span>
-  <% end %>
 </div>
diff --git a/app/views/buckets/_bucket.html.erb b/app/views/buckets/_bucket.html.erb
index 5d0b444e4..81ddc48c3 100644
--- a/app/views/buckets/_bucket.html.erb
+++ b/app/views/buckets/_bucket.html.erb
@@ -14,5 +14,10 @@
 
   <div class="flex align-center justify-center flex-column gap-half center">
     <strong><%= link_to bucket.name, bucket_bubbles_path(bucket), class: "txt-x-large txt-ink" %></strong>
+
+    <%= link_to edit_bucket_url(bucket), class: "btn" do %>
+      <%= image_tag "settings.svg", aria: { hidden: true }, size: 24 %>
+      <span class="for-screen-reader">Bucket settings</span>
+    <% end %>
   </div>
 </li>
diff --git a/app/views/buckets/edit.html.erb b/app/views/buckets/edit.html.erb
index 7272b7cc1..c7ca0345d 100644
--- a/app/views/buckets/edit.html.erb
+++ b/app/views/buckets/edit.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <nav>
-    <%= link_to bucket_bubbles_path(@bucket), class: "btn flex-item-justify-start" do %>
+    <%= link_to buckets_path, class: "btn flex-item-justify-start" do %>
       <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %>
       <span class="for-screen-reader">Go back</span>
     <% end %>