diff --git a/daemon.py b/daemon.py
index 3d368f87b..f85c9f111 100644
--- a/daemon.py
+++ b/daemon.py
@@ -5779,6 +5779,7 @@ class PubServer(BaseHTTPRequestHandler):
                                 removeScheduledPosts(self.server.baseDir,
                                                      nickname,
                                                      self.server.domain)
+
                         approveFollowers = False
                         if fields.get('approveFollowers'):
                             if fields['approveFollowers'] == 'on':
@@ -5788,6 +5789,26 @@ class PubServer(BaseHTTPRequestHandler):
                             actorJson['manuallyApprovesFollowers'] = \
                                 approveFollowers
                             actorChanged = True
+
+                        if fields.get('removeCustomFont'):
+                            if fields['removeCustomFont'] == 'on':
+                                if os.path.isfile(self.server.baseDir +
+                                                  '/fonts/custom.woff'):
+                                    os.remove(self.server.baseDir +
+                                              '/fonts/custom.woff')
+                                elif os.path.isfile(self.server.baseDir +
+                                                    '/fonts/custom.woff2'):
+                                    os.remove(self.server.baseDir +
+                                              '/fonts/custom.woff2')
+                                elif os.path.isfile(self.server.baseDir +
+                                                    '/fonts/custom.otf'):
+                                    os.remove(self.server.baseDir +
+                                              '/fonts/custom.otf')
+                                elif os.path.isfile(self.server.baseDir +
+                                                    '/fonts/custom.ttf'):
+                                    os.remove(self.server.baseDir +
+                                              '/fonts/custom.ttf')
+
                         if fields.get('mediaInstance'):
                             self.server.mediaInstance = False
                             self.server.defaultTimeline = 'inbox'
diff --git a/webinterface.py b/webinterface.py
index aa360de1c..88873b080 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1158,6 +1158,14 @@ def htmlEditProfile(translate: {}, baseDir: str, path: str,
         themesDropdown += \
             '  <input type="file" id="customFont" name="customFont"'
         themesDropdown += '      accept="' + fontFormats + '">'
+        if os.path.isfile(baseDir + '/fonts/custom.woff') or \
+           os.path.isfile(baseDir + '/fonts/custom.woff2') or \
+           os.path.isfile(baseDir + '/fonts/custom.otf') or \
+           os.path.isfile(baseDir + '/fonts/custom.ttf'):
+            themesDropdown += \
+                '      <input type="checkbox" class="profilecheckbox" ' + \
+                'name="removeCustomFont">' + \
+                translate['Remove the custom font'] + '<br>'
         themesDropdown += '</div>'
         themeName = getConfigParam(baseDir, 'theme')
         themesDropdown = \