Index: src/views/pages/account.ejs
===================================================================
--- src/views/pages/account.ejs	(revision ab544fd29596ce8734fe93bc1d317872adc0b665)
+++ src/views/pages/account.ejs	(revision 6150acbfa4adc6922392b762dfb73620334102a3)
@@ -17,11 +17,19 @@
 
     <div class="ax-profile-id">
-      <div class="ax-profile-avatar">
-        <% if (account.avatar_url) { %>
-          <img src="<%= account.avatar_url %>" alt="">
-        <% } else { %>
-          <span><%= account.username.charAt(0).toUpperCase() %></span>
-        <% } %>
-      </div>
+      <form action="/account/avatar" method="post" enctype="multipart/form-data" class="ax-avatar-form">
+        <label class="ax-avatar-wrap" title="Klik om je foto te wijzigen">
+          <span class="ax-profile-avatar">
+            <% if (account.avatar_url) { %>
+              <img src="<%= account.avatar_url %>" alt="">
+            <% } else { %>
+              <span><%= account.username.charAt(0).toUpperCase() %></span>
+            <% } %>
+          </span>
+          <span class="ax-avatar-edit" aria-hidden="true">
+            <svg viewBox="0 0 24 24" width="15" height="15" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"/><circle cx="12" cy="13" r="4"/></svg>
+          </span>
+          <input type="file" name="avatar" accept="image/jpeg,image/png,image/webp,image/gif" onchange="this.form.submit()" hidden>
+        </label>
+      </form>
       <div class="ax-profile-meta">
         <div class="ax-profile-name"><%= account.username %></div>
@@ -30,27 +38,11 @@
           <div class="ax-profile-joined">Lid sinds <%= formatDate(account.created_at) %></div>
         <% } %>
+        <% if (account.avatar_url) { %>
+          <form action="/account/avatar/remove" method="post" class="ax-avatar-remove">
+            <button type="submit" class="ax-linkbtn">Foto verwijderen</button>
+          </form>
+        <% } %>
       </div>
     </div>
-
-    <form action="/account/avatar" method="post" enctype="multipart/form-data" class="ax-form">
-      <label class="ax-field ax-file">
-        <span>Avatar uploaden <small>(jpg/png/webp/gif, max 5 MB)</small></span>
-        <span class="ax-file-control">
-          <span class="ax-btn ax-btn-secondary ax-file-btn">📷 Kies bestand</span>
-          <span class="ax-file-name" data-empty>Geen bestand gekozen</span>
-          <input type="file" name="avatar" accept="image/jpeg,image/png,image/webp,image/gif" required>
-        </span>
-      </label>
-      <div class="ax-form-actions">
-        <button type="submit" class="ax-btn ax-btn-primary">⬆ Uploaden</button>
-        <% if (account.avatar_url) { %>
-          <%# Separate <form> block kept inline since it submits to a different endpoint. %>
-          <button type="button" class="ax-btn" onclick="document.getElementById('avatar-remove-form').submit()">Avatar verwijderen</button>
-        <% } %>
-      </div>
-    </form>
-    <% if (account.avatar_url) { %>
-      <form action="/account/avatar/remove" method="post" id="avatar-remove-form" hidden></form>
-    <% } %>
 
     <form action="/account/profile" method="post" class="ax-form ax-form-bio">
@@ -60,5 +52,5 @@
       </label>
       <div class="ax-form-actions">
-        <button type="submit" class="ax-btn ax-btn-primary">💾 Bio opslaan</button>
+        <button type="submit" class="ax-btn ax-btn-primary">Bio opslaan</button>
       </div>
     </form>
@@ -85,5 +77,5 @@
       </div>
       <div class="ax-form-actions">
-        <button type="submit" class="ax-btn ax-btn-primary">🔒 Wachtwoord wijzigen</button>
+        <button type="submit" class="ax-btn ax-btn-primary">Wachtwoord wijzigen</button>
       </div>
     </form>
@@ -216,6 +208,11 @@
   margin-bottom: 1rem;
 }
+.ax-avatar-form { margin: 0; flex-shrink: 0; }
+.ax-avatar-wrap {
+  position: relative; display: block;
+  width: 84px; height: 84px; cursor: pointer;
+}
 .ax-profile-avatar {
-  width: 64px; height: 64px;
+  width: 84px; height: 84px;
   border-radius: 50%;
   overflow: hidden;
@@ -224,8 +221,26 @@
   display: inline-flex; align-items: center; justify-content: center;
   font-family: var(--font-display, serif);
-  font-size: 1.6rem; font-weight: 600;
-  flex-shrink: 0;
-}
+  font-size: 1.7rem; font-weight: 600;
+  border: 1px solid var(--rule);
+  transition: border-color 120ms;
+}
+.ax-avatar-wrap:hover .ax-profile-avatar { border-color: var(--accent); }
 .ax-profile-avatar img { width: 100%; height: 100%; object-fit: cover; }
+.ax-avatar-edit {
+  position: absolute; right: -2px; bottom: -2px;
+  width: 28px; height: 28px; border-radius: 50%;
+  background: var(--accent); color: #fff;
+  display: flex; align-items: center; justify-content: center;
+  border: 3px solid var(--paper);
+  transition: transform 120ms;
+}
+.ax-avatar-wrap:hover .ax-avatar-edit { transform: scale(1.08); }
+.ax-avatar-remove { margin-top: 0.45rem; }
+.ax-linkbtn {
+  background: none; border: 0; padding: 0; cursor: pointer;
+  color: var(--ink-muted, var(--ink-soft)); font-size: 0.8rem; text-decoration: underline;
+  font-family: var(--font-ui, system-ui), sans-serif;
+}
+.ax-linkbtn:hover { color: #c33; }
 .ax-profile-meta { min-width: 0; }
 .ax-profile-name { font-weight: 600; font-size: 1.1rem; }