diff --git a/registration/code/EditProfileForm.php b/registration/code/EditProfileForm.php
index f818f30..78c8f56 100644
--- a/registration/code/EditProfileForm.php
+++ b/registration/code/EditProfileForm.php
@@ -62,6 +62,7 @@ class EditProfileForm extends SafeXSSForm {
 	    $PhotoField->setCanAttachExisting(false);
 	    $PhotoField->setAllowedMaxFileNumber(1);
 	    $PhotoField->setAllowedFileCategories('image');
+	    $PhotoField->setTemplateFileButtons('CustomUploadField_FrontEndFIleButtons');
 	    $PhotoField->setFolderName('profile-images');
 	    $sizeMB = 1; // 1 MB
 	    $size = $sizeMB * 1024 * 1024; // 1 MB in bytes
diff --git a/themes/openstack/templates/Layout/Includes/CustomUploadField_FrontEndFIleButtons.ss b/themes/openstack/templates/Layout/Includes/CustomUploadField_FrontEndFIleButtons.ss
new file mode 100644
index 0000000..d09b86b
--- /dev/null
+++ b/themes/openstack/templates/Layout/Includes/CustomUploadField_FrontEndFIleButtons.ss
@@ -0,0 +1,9 @@
+<button class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<% _t('UploadField.REMOVEINFO', 'Remove this file from here, but do not delete it from the file store') %>" data-icon="plug-disconnect-prohibition">
+    <% _t('UploadField.REMOVE', 'Remove') %></button>
+<% if $canDelete %>
+    <button data-href="$UploadFieldDeleteLink" class="ss-uploadfield-item-delete ss-ui-button ui-corner-all" title="<% _t('UploadField.DELETEINFO', 'Permanently delete this file from the file store') %>" data-icon="minus-circle"><% _t('UploadField.DELETE', 'Delete from files') %></button>
+<% end_if %>
+<% if $UploadField.canAttachExisting %>
+    <button class="ss-uploadfield-item-choose-another ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<% _t('UploadField.CHOOSEANOTHERINFO', 'Replace this file with another one from the file store') %>" data-icon="network-cloud">
+        <% _t('UploadField.CHOOSEANOTHERFILE', 'Choose another file') %></button>
+<% end_if %>