diff --git a/Resources/Private/Partials/ProfileEdit/ProfileImage.html b/Resources/Private/Partials/ProfileEdit/ProfileImage.html
index 90c3ea5..f37623b 100644
--- a/Resources/Private/Partials/ProfileEdit/ProfileImage.html
+++ b/Resources/Private/Partials/ProfileEdit/ProfileImage.html
@@ -1,38 +1,64 @@
-<html data-namespace-typo3-fluid="true"
-      xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+<html
+    data-namespace-typo3-fluid="true"
+    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
 >
-
-<div class="row mb-1">
-    <div class="col-12">
-        <h2>Profile Image</h2>
-    </div>
-    <div class="col-md-4">
-        <f:if condition="{profile.image}">
-            <f:form.hidden property="image" value="{profile.image}" />
-            <f:image image="{profile.image}" maxHeight="300" class="img-thumbnail" />
-        </f:if>
-
-        <f:form.validationResults for="profile.image">
-            <f:if condition="{validationResults.flattenedErrors}">
-                <ul class="errors">
-                    <f:for each="{validationResults.flattenedErrors}" as="errors" key="propertyPath">
-                        <f:for each="{errors}" as="error">
-                            <li>{error}</li>
-                        </f:for>
-                    </f:for>
-                </ul>
+    <div class="row mb-1">
+        <div class="col-12">
+            <h2>Profile Image</h2>
+        </div>
+        <div class="col-md-4">
+            <f:if condition="{profile.image}">
+                <f:then>
+                    <f:image
+                        image="{profile.image}"
+                        maxHeight="300"
+                        class="img-thumbnail"
+                    />
+                    <f:link.action
+                        action="removeImage"
+                        arguments="{profile: profile}"
+                        class="btn btn-danger"
+                    >
+                        Remove image
+                    </f:link.action>
+                </f:then>
+                <f:else>
+                    <f:form.validationResults for="profile.image">
+                        <f:if condition="{validationResults.flattenedErrors}">
+                            <ul class="errors">
+                                <f:for
+                                    each="{validationResults.flattenedErrors}"
+                                    as="errors"
+                                    key="propertyPath"
+                                >
+                                    <f:for
+                                        each="{errors}"
+                                        as="error"
+                                    >
+                                        <li>{error}</li>
+                                    </f:for>
+                                </f:for>
+                            </ul>
+                        </f:if>
+                    </f:form.validationResults>
+                    <label
+                        for="profile-image"
+                        class="visually-hidden"
+                    >
+                        Update profile image
+                    </label>
+                    <f:form.upload
+                        property="image"
+                        class="form-control"
+                        id="profile-image"
+                    />
+                    <f:if condition="{maxFileUploadsInBytes}">
+                        <small>
+                            Max file upload size: <f:format.bytes value="{maxFileUploadsInBytes}" />
+                        </small>
+                    </f:if>
+                </f:else>
             </f:if>
-        </f:form.validationResults>
-
-        <label for="profile-image" class="visually-hidden">Update profile image</label>
-        <f:form.upload property="image" class="form-control" id="profile-image" />
-        <f:if condition="{maxFileUploadsInBytes}">
-            <small>
-                Max file upload size: <f:format.bytes value="{maxFileUploadsInBytes}" />
-            </small>
-        </f:if>
-
+        </div>
     </div>
-</div>
-
 </html>
