diff --git a/app/views/cards/_collection_settings.html.erb b/app/views/cards/_collection_settings.html.erb
index 318eeb70c..a03b2e4bb 100644
--- a/app/views/cards/_collection_settings.html.erb
+++ b/app/views/cards/_collection_settings.html.erb
@@ -1,4 +1,4 @@
-<%= link_to edit_collection_path(collection), class: "btn tooltip" do %>
+<%= link_to edit_collection_path(collection), class: "btn tooltip", data: { controller: "tooltip" } do %>
   <%= icon_tag "settings" %>
   <span class="for-screen-reader">Settings for <%= collection.name %></span>
 <% end %>
diff --git a/app/views/cards/_webhooks.html.erb b/app/views/cards/_webhooks.html.erb
index 2bdddaa3d..079308b29 100644
--- a/app/views/cards/_webhooks.html.erb
+++ b/app/views/cards/_webhooks.html.erb
@@ -1,4 +1,4 @@
-<%= link_to collection_webhooks_path(collection_id: collection), class: ["btn tooltip", {"btn--reversed": collection.webhooks.any?}] do %>
+<%= link_to collection_webhooks_path(collection_id: collection), class: ["btn tooltip", {"btn--reversed": collection.webhooks.any?}], data: { controller: "tooltip" } do %>
   <%= icon_tag "world" %>
   <span class="for-screen-reader">Webhooks</span>
 <% end %>
diff --git a/app/views/cards/container/_gild.html.erb b/app/views/cards/container/_gild.html.erb
index dc4298348..a489f08cd 100644
--- a/app/views/cards/container/_gild.html.erb
+++ b/app/views/cards/container/_gild.html.erb
@@ -1,10 +1,10 @@
 <% if card.golden? %>
-  <%= button_to card_goldness_path(card), method: :delete, class: "btn btn--reversed tooltip" do %>
+  <%= button_to card_goldness_path(card), method: :delete, class: "btn btn--reversed tooltip", data: { controller: "tooltip" } do %>
     <%= icon_tag "golden-ticket" %>
     <span class="for-screen-reader">Demote to normal</span>
   <% end %>
 <% else %>
-  <%= button_to card_goldness_path(card), class: "btn tooltip" do %>
+  <%= button_to card_goldness_path(card), class: "btn tooltip", data: { controller: "tooltip" } do %>
     <%= icon_tag "golden-ticket" %>
     <span class="for-screen-reader">Promote to golden</span>
   <% end %>
diff --git a/app/views/cards/container/_image.html.erb b/app/views/cards/container/_image.html.erb
index de2341aa1..ed11fd5c8 100644
--- a/app/views/cards/container/_image.html.erb
+++ b/app/views/cards/container/_image.html.erb
@@ -1,11 +1,11 @@
 <% if card.image.attached? %>
-  <%= button_to card_image_path(card), method: :delete, class: "btn tooltip" do %>
+  <%= button_to card_image_path(card), method: :delete, class: "btn tooltip", data: { controller: "tooltip" } do %>
     <%= icon_tag "picture-remove" %>
     <span class="for-screen-reader">Remove background image</span>
   <% end %>
 <% elsif !card.closed? %>
   <%= form_with model: card, url: card_path(card), data: { controller: "form" } do |form| %>
-    <label class="btn input--file tooltip">
+    <label class="btn input--file tooltip" data-controller="tooltip">
       <%= icon_tag "picture-add" %>
       <span class="for-screen-reader">Add background image</span>
       <%= form.file_field :image, class: "input",
diff --git a/app/views/cards/container/footer/_draft.html.erb b/app/views/cards/container/footer/_draft.html.erb
index bb35e16b5..8518c8e69 100644
--- a/app/views/cards/container/footer/_draft.html.erb
+++ b/app/views/cards/container/footer/_draft.html.erb
@@ -1,6 +1,6 @@
 <div class="card-perma__notch card-perma__notch--bottom">
   <%= button_to "Create card", card_publish_path(card), name: "creation_type", value: "add", class: "btn" %>
-  <%= button_to "Create and add another", card_publish_path(card), method: :post, class: "btn btn--reversed tooltip", name: "creation_type", value: "add_another", 
+  <%= button_to "Create and add another", card_publish_path(card), method: :post, class: "btn btn--reversed", name: "creation_type", value: "add_another",
         title: "Create and add another (ctrl+shift+enter)", form: { data: { turbo: false } }, data: { controller: "hotkey", action: "keydown.ctrl+shift+enter@document->hotkey#click" } %>
   <%= button_to "Save as a draft", card_path(card), name: "card[status]", value: "drafted", method: :put, class: "btn btn--reversed" %>
 </div>
diff --git a/app/views/cards/display/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb
index 895b29bd9..ce44f0448 100644
--- a/app/views/cards/display/common/_assignees.html.erb
+++ b/app/views/cards/display/common/_assignees.html.erb
@@ -4,7 +4,7 @@
   <% end %>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
-    <button class="btn card__hide-on-index tooltip" data-action="click->dialog#open:stop" style="--btn-background: var(--card-bg-color);">
+    <button class="btn card__hide-on-index tooltip" data-action="click->dialog#open:stop" style="--btn-background: var(--card-bg-color);" data-controller="tooltip">
       <%= icon_tag "person-add" %>
       <span class="for-screen-reader">Assign</span>
     </button>
diff --git a/app/views/cards/display/perma/_background.html.erb b/app/views/cards/display/perma/_background.html.erb
index 4db03ddcc..3e0cfaf06 100644
--- a/app/views/cards/display/perma/_background.html.erb
+++ b/app/views/cards/display/perma/_background.html.erb
@@ -1,5 +1,5 @@
 <%= render "cards/display/common/background", card: card do %>
-  <%= link_to card.image.presence, class: "btn fill-transparent flex-item-justify-end tooltip", data: { action: "lightbox#open:prevent", lightbox_target: "image" } do %>
+  <%= link_to card.image.presence, class: "btn fill-transparent flex-item-justify-end tooltip", data: { controller: "tooltip", action: "lightbox#open:prevent", lightbox_target: "image" } do %>
     <%= icon_tag "picture-zoom" %>
     <span class="for-screen-reader">Zoom background image</span>
   <% end %>
diff --git a/app/views/cards/display/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb
index 76d69a8d0..0f10b176e 100644
--- a/app/views/cards/display/perma/_tags.html.erb
+++ b/app/views/cards/display/perma/_tags.html.erb
@@ -12,7 +12,7 @@
   </div>
 
   <div class="position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" <%= "hidden" if card.closed? %>>
-    <button class="tag-picker__button btn card__hide-on-index tooltip" data-action="click->dialog#open:stop" style="--btn-background: var(--card-bg-color);">
+    <button class="tag-picker__button btn card__hide-on-index tooltip" data-action="click->dialog#open:stop" style="--btn-background: var(--card-bg-color);" data-controller="tooltip">
       <%= icon_tag "tag" %>
       <span class="for-screen-reader">Add a tag</span>
     </button>
diff --git a/app/views/cards/pins/_pin_button.html.erb b/app/views/cards/pins/_pin_button.html.erb
index c09e0e5f5..50f3aa704 100644
--- a/app/views/cards/pins/_pin_button.html.erb
+++ b/app/views/cards/pins/_pin_button.html.erb
@@ -1,10 +1,10 @@
 <div id="<%= dom_id(card, :pin_button) %>">
   <% if card.pinned_by? Current.user %>
-    <%= button_to card_pin_path(card), method: :delete, class: "btn btn--reversed tooltip" do %>
+    <%= button_to card_pin_path(card), method: :delete, class: "btn btn--reversed tooltip", data: { controller: "tooltip" } do %>
       <%= icon_tag "pinned" %> <span class="for-screen-reader">Un-pin this card</span>
     <% end %>
   <% else %>
-    <%= button_to card_pin_path(card), class: "btn tooltip" do %>
+    <%= button_to card_pin_path(card), class: "btn tooltip", data: { controller: "tooltip" } do %>
       <%= icon_tag "unpinned" %> <span class="for-screen-reader">Pin this card</span>
     <% end %>
   <% end %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index 07247152e..7f2ec678b 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -29,7 +29,7 @@
 
   <%= render "layouts/lightbox" do %>
     <% if @card.image.attached? %>
-      <%= button_to card_image_path(@card), method: :delete, class: "btn tooltip" do %>
+      <%= button_to card_image_path(@card), method: :delete, class: "btn tooltip", data: { controller: "tooltip" } do %>
         <%= icon_tag "trash" %>
         <span class="for-screen-reader">Remove background image</span>
       <% end %>
diff --git a/app/views/cards/watches/show.html.erb b/app/views/cards/watches/show.html.erb
index 1f845294c..4a2f9f1b3 100644
--- a/app/views/cards/watches/show.html.erb
+++ b/app/views/cards/watches/show.html.erb
@@ -1,11 +1,11 @@
 <%= turbo_frame_tag dom_id(@card, :watch) do %>
   <% if @card.watched_by? Current.user %>
-      <%= button_to card_watch_path(@card), method: :delete, class: "btn btn--reversed tooltip" do %>
+      <%= button_to card_watch_path(@card), method: :delete, class: "btn btn--reversed tooltip", data: { controller: "tooltip" } do %>
         <%= icon_tag "bell" %>
         <span class="for-screen-reader">Stop watching</span>
       <% end %>
   <% else %>
-      <%= button_to card_watch_path(@card), class: "btn tooltip" do %>
+      <%= button_to card_watch_path(@card), class: "btn tooltip", data: { controller: "tooltip" } do %>
         <%= icon_tag "bell-off" %>
         <span class="for-screen-reader">Watch this</span>
       <% end %>
diff --git a/app/views/layouts/_lightbox.html.erb b/app/views/layouts/_lightbox.html.erb
index e1b077c84..c42e72c94 100644
--- a/app/views/layouts/_lightbox.html.erb
+++ b/app/views/layouts/_lightbox.html.erb
@@ -8,7 +8,7 @@
 
   <div class="lightbox__actions">
     <%= yield %>
-    <button class="btn fill-white tooltip" data-action="dialog#close keydown.esc->dialog#close:stop" data-controller="hotkey">
+    <button class="btn fill-white tooltip" data-action="dialog#close keydown.esc->dialog#close:stop" data-controller="hotkey tooltip">
       <%= icon_tag "remove" %>
       <span class="for-screen-reader">Close (esc)</span>
     </button>
diff --git a/app/views/workflows/stages/_color.html.erb b/app/views/workflows/stages/_color.html.erb
index 14c789e22..7542e218b 100644
--- a/app/views/workflows/stages/_color.html.erb
+++ b/app/views/workflows/stages/_color.html.erb
@@ -6,7 +6,7 @@
 
   <dialog class="color-picker shadow" data-dialog-target="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
     <form method="dialog">
-      <button class="btn txt-small tooltip">
+      <button class="btn txt-small tooltip" data-controller="tooltip">
         <%= icon_tag "remove" %>
         <span class="for-screen-reader">Close (esc)</span>
       </button>