diff --git a/app/helpers/hotkeys_helper.rb b/app/helpers/hotkeys_helper.rb
index 3e75081f9..810a0f83e 100644
--- a/app/helpers/hotkeys_helper.rb
+++ b/app/helpers/hotkeys_helper.rb
@@ -5,7 +5,7 @@ module HotkeysHelper
       if key == "ctrl" && platform.mac?
         "⌘"
       elsif key == "enter"
-        "⏎"
+        platform.mac? ? "return" : "enter"
       elsif key == "shift"
         "⇧"
       else
diff --git a/app/views/account/join_codes/edit.html.erb b/app/views/account/join_codes/edit.html.erb
index 44854c6d0..7f22b9318 100644
--- a/app/views/account/join_codes/edit.html.erb
+++ b/app/views/account/join_codes/edit.html.erb
@@ -2,8 +2,9 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to account_join_code_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
+    <%= link_to account_join_code_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
       <span class="overflow-ellipsis flex align-center">
+        <%= icon_tag "arrow-left" %>
         <strong>Back to Invite link</strong>
         <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
       </span>
diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb
index d16006019..e9fd72d71 100644
--- a/app/views/account/join_codes/show.html.erb
+++ b/app/views/account/join_codes/show.html.erb
@@ -2,8 +2,9 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to account_settings_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
+    <%= link_to account_settings_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
       <span class="overflow-ellipsis flex align-center">
+        <%= icon_tag "arrow-left" %>
         <strong>Back to Account Settings</strong>
         <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
       </span>
@@ -30,7 +31,7 @@
     <% end %>
   </div>
 
-  <div class="center flex align-center gap">
+  <div class="center flex flex-wrap justify-center align-center gap">
     <%= tag.button class: "btn btn--link", data: {
           controller: "copy-to-clipboard", action: "copy-to-clipboard#copy",
           copy_to_clipboard_success_class: "btn--success", copy_to_clipboard_content_value: url } do %>
diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb
index 8d1426f5a..1485867f9 100644
--- a/app/views/cards/comments/_new.html.erb
+++ b/app/views/cards/comments/_new.html.erb
@@ -18,7 +18,6 @@
           <%= form.button class: "comment__submit btn btn--reversed",
               data: { form_target: "submit" }, disabled: true do %>
             <span>Post</span>
-            <kbd class="txt-x-small hide-on-touch"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
           <% end %>
         </span>
       <% end %>
diff --git a/app/views/cards/comments/edit.html.erb b/app/views/cards/comments/edit.html.erb
index 5b020de6d..2eafce124 100644
--- a/app/views/cards/comments/edit.html.erb
+++ b/app/views/cards/comments/edit.html.erb
@@ -11,9 +11,9 @@
           <%= form.rich_textarea :body, required: true, autofocus: true, placeholder: new_comment_placeholder(@card) do %>
             <%= general_prompts(@card.board) %>
           <% end %>
-          <div class="flex gap-half justify-start">
+          <div class="flex gap-half justify-start align-center">
             <%= form.button class: "btn btn--reversed", type: :submit do %>
-              <span>Save changes</span>
+              <span>Save</span>
             <% end %>
             <%= link_to card_comment_path(@card, @comment), class: "btn", data: { form_target: "cancel" } do %>
               <span>Cancel</span>
diff --git a/app/views/cards/container/footer/_draft.html.erb b/app/views/cards/container/footer/_draft.html.erb
index dbc95a6da..2516a3e21 100644
--- a/app/views/cards/container/footer/_draft.html.erb
+++ b/app/views/cards/container/footer/_draft.html.erb
@@ -3,7 +3,6 @@
         form: { data: { controller: "form" } },
         data: { form_target: "submit", controller: "clicker", action: "keydown.ctrl+enter@document->clicker#click keydown.meta+enter@document->clicker#click" } do %>
     <span>Create card</span>
-    <kbd class="txt-x-small hide-on-touch"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
   <% end %>
 
   <%= button_to card_publish_path(card), method: :post, class: "btn btn--reversed", name: "creation_type", value: "add_another",
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 5ac5e7807..1646c3944 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -2,8 +2,9 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to user_path(@user), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
+    <%= link_to user_path(@user), class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
       <span class="overflow-ellipsis flex align-center">
+        <%= icon_tag "arrow-left" %>
         <strong>Back to profile</strong>
         <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
       </span>
diff --git a/app/views/users/email_addresses/new.html.erb b/app/views/users/email_addresses/new.html.erb
index 193911672..8b0f1cbcf 100644
--- a/app/views/users/email_addresses/new.html.erb
+++ b/app/views/users/email_addresses/new.html.erb
@@ -2,8 +2,9 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to edit_user_path(@user, script_name: @user.account.slug), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
+    <%= link_to edit_user_path(@user, script_name: @user.account.slug), class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
       <span class="overflow-ellipsis flex align-center">
+        <%= icon_tag "arrow-left" %>
         <strong>Back to My profile</strong>
         <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
       </span>
diff --git a/app/views/webhooks/show.html.erb b/app/views/webhooks/show.html.erb
index 4dbef81d3..673df0df3 100644
--- a/app/views/webhooks/show.html.erb
+++ b/app/views/webhooks/show.html.erb
@@ -2,8 +2,9 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to board_webhooks_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
+    <%= link_to board_webhooks_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
       <span class="overflow-ellipsis flex align-center">
+        <%= icon_tag "arrow-left" %>
         <strong>Back to Webhooks</strong>
         <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
       </span>
diff --git a/test/helpers/hotkeys_helper_test.rb b/test/helpers/hotkeys_helper_test.rb
index 7201d7566..ec96f6c9c 100644
--- a/test/helpers/hotkeys_helper_test.rb
+++ b/test/helpers/hotkeys_helper_test.rb
@@ -18,13 +18,13 @@ class HotkeysHelperTest < ActionView::TestCase
   test "mac enter" do
     emulate_mac
 
-    assert_equal "⏎+J", hotkey_label([ "enter", "J" ])
+    assert_equal "Return+J", hotkey_label([ "enter", "J" ])
   end
 
   test "linux enter" do
     emulate_linux
 
-    assert_equal "⏎+J", hotkey_label([ "enter", "J" ])
+    assert_equal "Enter+J", hotkey_label([ "enter", "J" ])
   end
 
   test "mac hyper" do