diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index c616e2c21..4305f7675 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,6 +1,10 @@
 <% @page_title = "Edit your profile" %>
 
-<div class="panel shadow center">
+<% content_for :header do %>
+  <%= render "my/menus/menu" %>
+<% end %>
+
+<div class="panel shadow center" style="--panel-size: 45ch;">
   <div class="flex flex-column gap txt-medium">
     <%= form_with model: @user, method: :patch, class: "flex flex-column gap", data: { controller: "form upload-preview" } do |form| %>
       <div class="align-center center avatar__form gap">
@@ -24,18 +28,15 @@
       <div class="flex align-center gap">
         <label class="flex align-center gap input input--actor">
           <%= form.text_field :name, class: "input full-width", autocomplete: "name", placeholder: "Name", autofocus: true, required: true, data: { "1p-ignore": true, action: "keydown.esc@document->form#cancel" } %>
-          <%= icon_tag "person", class: "txt-large" %>
         </label>
       </div>
       <div class="flex align-center gap">
-        <label class="flex align-center gap input input--actor">
+        <div class="flex align-center gap input input--actor">
           <%= form.email_field :email_address, class: "input full-width", autocomplete: "username", placeholder: "Email address", required: true, readonly: true %>
-          <%= icon_tag "email", class: "txt-large" %>
-        </label>
-        <%= link_to "Change", new_user_email_address_path(@user), class: "btn btn--secondary" %>
+          <%= link_to "Change email", new_user_email_address_path(@user), class: "btn btn--plain txt-link txt-small txt-nowrap" %>
+        </div>
       </div>
       <button type="submit" id="log_in" class="btn btn--reversed center">
-        <%= icon_tag "check" %>
         <span>Save changes</span>
       </button>
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index de53c2ee9..17abf2318 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,6 +1,10 @@
 <% @page_title = @user.name %>
 
-<div class="panel shadow center txt-align-center margin-block-end-double">
+<% content_for :header do %>
+  <%= render "my/menus/menu" %>
+<% end %>
+
+<div class="panel shadow center txt-align-center margin-block-end-double" style="--panel-size: 45ch;">
   <div class="flex flex-column gap position-relative">
     <% if Current.user == @user %>
       <%= link_to edit_user_path(@user), class: "user-edit-link btn" do %>
@@ -9,8 +13,8 @@
       <% end %>
     <% end %>
 
-    <div class="avatar txt-xx-large center fill-white">
-      <%= image_tag user_avatar_path(@user), alt: "Profile avatar for #{@user.name}", size: 128 %>
+    <div class="avatar txt-xx-large center fill-white btn--circle hide-focus-ring">
+      <%= image_tag user_avatar_path(@user), alt: "Profile avatar for #{@user.name}" %>
     </div>
 
     <div class="flex flex-column gap-half margin-block-end">
@@ -32,15 +36,14 @@
 </div>
 
 <% if Current.user == @user %>
-  <div class="panel shadow center margin-block-double">
+  <div class="panel shadow center margin-block-double" style="--panel-size: 45ch;">
     <%= render "users/transfer", user: @user %>
-  </div>
 
-  <div class="panel borderless center margin-block-double">
-    <%= button_to session_path, method: :delete, class: "btn center txt-medium", data: { turbo: false } do %>
-      <%= icon_tag "logout" %>
+    <div class="center margin-block-start-double">
+      <%= button_to session_path, method: :delete, class: "btn btn--plain txt-link txt-small", data: { turbo: false } do %>
       <span>Sign out</span>
     <% end %>
+    </div>
   </div>
 <% end %>