diff --git a/epicyon-profile.css b/epicyon-profile.css
index 54c3ae39f..d183b1e09 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -762,24 +762,31 @@ input[type=checkbox]
     transform: translateY(-10%);
 }
 
+.galleryIcon {
+    position: absolute;
+    top: 15px;
+    right: 30px;
+    width: 50px;
+}
+
 .galleryContainer {
     background-color: var(--main-bg-color);
 }
 
 div.gallery {
-  margin: 5px;
-  border: 1px solid var(--gallery-border);
-  float: left;
-  width: 32%;
+    margin: 5px;
+    border: 1px solid var(--gallery-border);
+    float: left;
+    width: 32%;
 }
 
 div.gallery:hover {
-  border: 1px solid var(--gallery-hover);
+    border: 1px solid var(--gallery-hover);
 }
 
 div.gallery img {
-  width: 100%;
-  height: auto;
+    width: 100%;
+    height: auto;
 }
 
 div.imagedesc {
@@ -787,16 +794,6 @@ div.imagedesc {
     text-align: center;
 }
 
-hr {
-  display: block;
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
-  margin-left: auto;
-  margin-right: auto;
-  border-style: inset;
-  border-width: 1px;
-}
-
 @media screen and (min-width: 400px) {
     body, html {
         font-size: 22px;
diff --git a/img/icons/gallery.png b/img/icons/gallery.png
new file mode 100644
index 000000000..a717b3e98
Binary files /dev/null and b/img/icons/gallery.png differ
diff --git a/img/icons/hacker/gallery.png b/img/icons/hacker/gallery.png
new file mode 100644
index 000000000..b2365cc45
Binary files /dev/null and b/img/icons/hacker/gallery.png differ
diff --git a/img/icons/light/gallery.png b/img/icons/light/gallery.png
new file mode 100644
index 000000000..a717b3e98
Binary files /dev/null and b/img/icons/light/gallery.png differ
diff --git a/img/icons/purple/gallery.png b/img/icons/purple/gallery.png
new file mode 100644
index 000000000..f8d1022ad
Binary files /dev/null and b/img/icons/purple/gallery.png differ
diff --git a/translations/cy.json b/translations/cy.json
index a8cde1cdc..58013f1ae 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -139,5 +139,6 @@
     "Page up": "Tudalen i fyny",
     "Vote": "Bleidleisio",
     "Replies": "Atebion",
-    "Media": "Media"
+    "Media": "Media",
+    "Show original post": "Show original post"
 }
diff --git a/translations/de.json b/translations/de.json
index 6780cf270..f19cbceb9 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -139,5 +139,6 @@
     "Page up": "Bild auf",
     "Vote": "Abstimmung",
     "Replies": "Antworten",
-    "Media": "Media"
+    "Media": "Media",
+    "Show original post": "Show original post"
 }
diff --git a/translations/en.json b/translations/en.json
index 512fc5aa4..f7845d84b 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -139,5 +139,6 @@
     "Page up": "Page up",
     "Vote": "Vote",
     "Replies": "Replies",
-    "Media": "Media"
+    "Media": "Media",
+    "Show original post": "Show original post"
 }
diff --git a/translations/es.json b/translations/es.json
index 7df4a9e71..fe96f4fb1 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -139,5 +139,6 @@
     "Page up": "Página arriba",
     "Vote": "Votar",
     "Replies": "Resp",
-    "Media": "Media"
+    "Media": "Media",
+    "Show original post": "Show original post"
 }
diff --git a/translations/fr.json b/translations/fr.json
index 00d66d00d..4105ae850 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -139,5 +139,6 @@
     "Page up": "Haut de page",
     "Vote": "Vote",
     "Replies": "Réponses",
-    "Media": "Media"
+    "Media": "Media",
+    "Show original post": "Show original post"
 }
diff --git a/translations/ga.json b/translations/ga.json
index d523d5e62..28d180d45 100644
--- a/translations/ga.json
+++ b/translations/ga.json
@@ -139,5 +139,6 @@
     "Page up": "Leathanach suas",
     "Vote": "Vóta",
     "Replies": "Freagraí",
-    "Media": "Media"
+    "Media": "Media",
+    "Show original post": "Show original post"
 }
diff --git a/translations/it.json b/translations/it.json
index 4414d7a45..55ce2e6bc 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -139,5 +139,6 @@
     "Page up": "Pagina su",
     "Vote": "Voto",
     "Replies": "Risposte",
-    "Media": "Media"
+    "Media": "Media",
+    "Show original post": "Show original post"
 }
diff --git a/webinterface.py b/webinterface.py
index 9cc85d45c..6669e5f94 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1881,6 +1881,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
                                     '<div class="gallery">\n' \
                                     '  <a target="_blank" href="'+attach['url']+'">\n' \
                                     '    <img src="'+attach['url']+'" alt="'+imageDescription+'" title="'+imageDescription+'" width="600" height="400">\n' \
+                                    '    <a href="'+messageId+'"><img class="galleryicon" src="icons/gallery.png" alt="'+translate['Show original post']+'" title="'+translate['Show original post']+'"></a>\n' \
                                     '  </a>\n'
                                 #if postJsonObject['object'].get('content'):
                                 #    galleryStr+= \
@@ -2228,7 +2229,7 @@ def htmlTimeline(translate: {},pageNumber: int, \
                                          showIndividualPostIcons, \
                                          manuallyApproveFollowers,False)
         if boxName=='tlmedia':
-            tlStr+='</div><hr>\n'
+            tlStr+='</div>\n'
 
     # page down arrow
     if itemCtr>=itemsPerPage: