diff --git a/app/assets/stylesheets/avatars.css b/app/assets/stylesheets/avatars.css
index e80737055..34a75c0bc 100644
--- a/app/assets/stylesheets/avatars.css
+++ b/app/assets/stylesheets/avatars.css
@@ -54,3 +54,8 @@
     }
   }
 }
+
+.avatar__form {
+  display: grid;
+  grid-template-columns: 1fr auto 1fr;
+}
diff --git a/app/controllers/users/avatars_controller.rb b/app/controllers/users/avatars_controller.rb
index aec5e1eae..29b4c5996 100644
--- a/app/controllers/users/avatars_controller.rb
+++ b/app/controllers/users/avatars_controller.rb
@@ -13,6 +13,11 @@ class Users::AvatarsController < ApplicationController
     end
   end
 
+  def destroy
+    @user.avatar.destroy
+    redirect_to user_path(@user)
+  end
+
   private
     def set_user
       @user = Current.account.users.find(params[:user_id])
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 5ef66db39..8b4714384 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -12,12 +12,23 @@
 <div class="panel shadow center">
   <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| %>
-      <label class="btn avatar input--file txt-xx-large center fill-white">
-        <%= image_tag user_avatar_path(@user), aria: { hidden: "true" }, size: 128, data: { upload_preview_target: "image" } %>
-        <%= form.file_field :avatar, id: "file", class: "input", accept: "image/*",
-            data: { upload_preview_target: "input", action: "upload-preview#previewImage" } %>
-        <span class="for-screen-reader">Profile avatar for <%= @user.name %></span>
-      </label>
+      <div class="align-center center avatar__form gap">
+        <span class="btn btn--placeholder txt-small"></span>
+
+        <label class="btn avatar input--file txt-xx-large center fill-white">
+          <%= image_tag user_avatar_path(@user), aria: { hidden: "true" }, size: 128, data: { upload_preview_target: "image" } %>
+          <%= form.file_field :avatar, id: "file", class: "input", accept: "image/*",
+              data: { upload_preview_target: "input", action: "upload-preview#previewImage" } %>
+          <span class="for-screen-reader">Profile avatar for <%= @user.name %></span>
+        </label>
+
+        <% if @user.avatar.attached? %>
+          <%= tag.button type: :submit, form: "avatar-delete-form", class: "btn btn--negative txt-small", data: { turbo_confirm: "Are you sure you want to remove your avatar? This can't be undone." } do %>
+            <%= image_tag "minus.svg", aria: { hidden: "true" }, size: 20 %>
+            <span class="for-screen-reader">Delete avatar</span>
+          <% end %>
+        <% end %>
+      </div>
 
       <div class="flex align-center gap">
         <%= translation_button :user_name %>
@@ -45,5 +56,7 @@
           <span class="for-screen-reader">Sign in</span>
       </button>
     <% end %>
+
+    <%= form_with url: user_avatar_url(@user), method: :delete, id: "avatar-delete-form" %>
   </div>
 </div>