diff --git a/img/icons/blue/logout.png b/img/icons/blue/logout.png
new file mode 100644
index 000000000..6c52946df
Binary files /dev/null and b/img/icons/blue/logout.png differ
diff --git a/img/icons/hacker/logout.png b/img/icons/hacker/logout.png
new file mode 100644
index 000000000..8ae5bee69
Binary files /dev/null and b/img/icons/hacker/logout.png differ
diff --git a/img/icons/henge/logout.png b/img/icons/henge/logout.png
new file mode 100644
index 000000000..ee37bde72
Binary files /dev/null and b/img/icons/henge/logout.png differ
diff --git a/img/icons/indymediaclassic/logout.png b/img/icons/indymediaclassic/logout.png
new file mode 100644
index 000000000..968fb671e
Binary files /dev/null and b/img/icons/indymediaclassic/logout.png differ
diff --git a/img/icons/lcd/logout.png b/img/icons/lcd/logout.png
new file mode 100644
index 000000000..ae2f70b83
Binary files /dev/null and b/img/icons/lcd/logout.png differ
diff --git a/img/icons/light/logout.png b/img/icons/light/logout.png
new file mode 100644
index 000000000..6c52946df
Binary files /dev/null and b/img/icons/light/logout.png differ
diff --git a/img/icons/logout.png b/img/icons/logout.png
new file mode 100644
index 000000000..6c52946df
Binary files /dev/null and b/img/icons/logout.png differ
diff --git a/img/icons/night/logout.png b/img/icons/night/logout.png
new file mode 100644
index 000000000..6c52946df
Binary files /dev/null and b/img/icons/night/logout.png differ
diff --git a/img/icons/purple/logout.png b/img/icons/purple/logout.png
new file mode 100644
index 000000000..c8e134d15
Binary files /dev/null and b/img/icons/purple/logout.png differ
diff --git a/img/icons/solidaric/logout.png b/img/icons/solidaric/logout.png
new file mode 100644
index 000000000..1c1dad68a
Binary files /dev/null and b/img/icons/solidaric/logout.png differ
diff --git a/img/icons/starlight/logout.png b/img/icons/starlight/logout.png
new file mode 100644
index 000000000..199282adf
Binary files /dev/null and b/img/icons/starlight/logout.png differ
diff --git a/img/icons/zen/logout.png b/img/icons/zen/logout.png
new file mode 100644
index 000000000..4be063f93
Binary files /dev/null and b/img/icons/zen/logout.png differ
diff --git a/webinterface.py b/webinterface.py
index 9eedad2c2..4e9b0f285 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -3372,13 +3372,20 @@ def htmlProfile(defaultTimeline: str,
             '<br><a href="/login"><button class="loginButton">' + \
             translate['Login'] + '</button></a>'
     else:
+        iconsDir = getIconsDir(baseDir)
         editProfileStr = \
-            '<a href="' + usersPath + \
-            '/editprofile"><button class="button"><span>' + \
-            translate['Edit'] + ' </span></button></a>'
+            '<a class="imageAnchor" href="' + usersPath + '/editprofile">' + \
+            '<img loading="lazy" src="/' + iconsDir + \
+            '/logout.png" title="' + translate['Edit'] + \
+            '" alt="| ' + translate['Edit'] + '" class="timelineicon"/></a>\n'
+
         logoutStr = \
-            '<a href="/logout"><button class="button"><span>' + \
-            translate['Logout'] + ' </span></button></a>'
+            '<a class="imageAnchor" href="/logout">' + \
+            '<img loading="lazy" src="/' + iconsDir + \
+            '/logout.png" title="' + translate['Logout'] + \
+            '" alt="| ' + translate['Logout'] + \
+            '" class="timelineicon"/></a>\n'
+
         linkToTimelineStart = \
             '<a href="/users/' + nickname + '/' + defaultTimeline + \
             '"><label class="transparent">' + \