diff --git a/img/icons/edit_notify.png b/img/icons/edit_notify.png
new file mode 100644
index 00000000..03eb4644
Binary files /dev/null and b/img/icons/edit_notify.png differ
diff --git a/img/icons/hacker/edit_notify.png b/img/icons/hacker/edit_notify.png
new file mode 100644
index 00000000..e0a5e991
Binary files /dev/null and b/img/icons/hacker/edit_notify.png differ
diff --git a/img/icons/henge/edit_notify.png b/img/icons/henge/edit_notify.png
new file mode 100644
index 00000000..760f0afe
Binary files /dev/null and b/img/icons/henge/edit_notify.png differ
diff --git a/img/icons/indymedia/edit_notify.png b/img/icons/indymedia/edit_notify.png
new file mode 100644
index 00000000..5687aab1
Binary files /dev/null and b/img/icons/indymedia/edit_notify.png differ
diff --git a/img/icons/lcd/edit_notify.png b/img/icons/lcd/edit_notify.png
new file mode 100644
index 00000000..22b8d3e5
Binary files /dev/null and b/img/icons/lcd/edit_notify.png differ
diff --git a/img/icons/light/edit_notify.png b/img/icons/light/edit_notify.png
new file mode 100644
index 00000000..9b063faf
Binary files /dev/null and b/img/icons/light/edit_notify.png differ
diff --git a/img/icons/night/edit_notify.png b/img/icons/night/edit_notify.png
new file mode 100644
index 00000000..4b7d3554
Binary files /dev/null and b/img/icons/night/edit_notify.png differ
diff --git a/img/icons/purple/edit_notify.png b/img/icons/purple/edit_notify.png
new file mode 100644
index 00000000..19b53e58
Binary files /dev/null and b/img/icons/purple/edit_notify.png differ
diff --git a/img/icons/solidaric/edit_notify.png b/img/icons/solidaric/edit_notify.png
new file mode 100644
index 00000000..f41f31d9
Binary files /dev/null and b/img/icons/solidaric/edit_notify.png differ
diff --git a/img/icons/starlight/edit_notify.png b/img/icons/starlight/edit_notify.png
new file mode 100644
index 00000000..1faf4aed
Binary files /dev/null and b/img/icons/starlight/edit_notify.png differ
diff --git a/img/icons/zen/edit_notify.png b/img/icons/zen/edit_notify.png
new file mode 100644
index 00000000..627daa8b
Binary files /dev/null and b/img/icons/zen/edit_notify.png differ
diff --git a/newswire.py b/newswire.py
index 0c055905..3a9f044f 100644
--- a/newswire.py
+++ b/newswire.py
@@ -377,7 +377,12 @@ def addBlogsToNewswire(baseDir: str, newswire: {},
         OrderedDict(sorted(moderationDict.items(), reverse=True))
     # save the moderation queue details for later display
     newswireModerationFilename = baseDir + '/accounts/newswiremoderation.txt'
-    saveJson(sortedModerationDict, newswireModerationFilename)
+    if sortedModerationDict:
+        saveJson(sortedModerationDict, newswireModerationFilename)
+    else:
+        # remove the file if there is nothing to moderate
+        if os.path.isfile(newswireModerationFilename):
+            os.remove(newswireModerationFilename)
 
 
 def getDictFromNewswire(session, baseDir: str) -> {}:
diff --git a/webinterface.py b/webinterface.py
index 0eec71b3..7eb2bd90 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -5406,15 +5406,26 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
         htmlStr += '\n      <center>\n'
 
     if moderator:
-        # show the edit icon
-        htmlStr += \
-            '        <a href="' + \
-            '/users/' + nickname + '/editnewswire">' + \
-            '<img class="' + editImageClass + \
-            '" loading="lazy" alt="' + \
-            translate['Edit newswire'] + '" title="' + \
-            translate['Edit newswire'] + '" src="/' + \
-            iconsDir + '/edit.png" /></a>\n'
+        if os.path.isfile(baseDir + '/accounts/newswiremoderation.txt'):
+            # show the edit icon highlighted
+            htmlStr += \
+                '        <a href="' + \
+                '/users/' + nickname + '/editnewswire">' + \
+                '<img class="' + editImageClass + \
+                '" loading="lazy" alt="' + \
+                translate['Edit newswire'] + '" title="' + \
+                translate['Edit newswire'] + '" src="/' + \
+                iconsDir + '/edit_notify.png" /></a>\n'
+        else:
+            # show the edit icon
+            htmlStr += \
+                '        <a href="' + \
+                '/users/' + nickname + '/editnewswire">' + \
+                '<img class="' + editImageClass + \
+                '" loading="lazy" alt="' + \
+                translate['Edit newswire'] + '" title="' + \
+                translate['Edit newswire'] + '" src="/' + \
+                iconsDir + '/edit.png" /></a>\n'
 
     htmlStr += \
         '        <a href="/newswire.xml">' + \