diff --git a/img/icons/calendar.png b/img/icons/calendar.png
new file mode 100644
index 00000000..7f555840
Binary files /dev/null and b/img/icons/calendar.png differ
diff --git a/img/icons/hacker/calendar.png b/img/icons/hacker/calendar.png
new file mode 100644
index 00000000..ec38fbba
Binary files /dev/null and b/img/icons/hacker/calendar.png differ
diff --git a/img/icons/light/calendar.png b/img/icons/light/calendar.png
new file mode 100644
index 00000000..7f555840
Binary files /dev/null and b/img/icons/light/calendar.png differ
diff --git a/img/icons/purple/calendar.png b/img/icons/purple/calendar.png
new file mode 100644
index 00000000..9883afbb
Binary files /dev/null and b/img/icons/purple/calendar.png differ
diff --git a/translations/cy.json b/translations/cy.json
index a0206c67..cdf92e87 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -143,5 +143,6 @@
     "This is a group account": "This is a group account",
     "Date": "Date",
     "Time": "Time",
-    "Location": "Location"
+    "Location": "Location",
+    "Calendar": "Calendar"
 }
diff --git a/translations/de.json b/translations/de.json
index b94c8389..76c6cc2c 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -143,5 +143,6 @@
     "This is a group account": "This is a group account",
     "Date": "Date",
     "Time": "Time",
-    "Location": "Location"
+    "Location": "Location",
+    "Calendar": "Calendar"
 }
diff --git a/translations/en.json b/translations/en.json
index f1b45d04..32315cb2 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -143,5 +143,6 @@
     "This is a group account": "This is a group account",
     "Date": "Date",
     "Time": "Time",
-    "Location": "Location"
+    "Location": "Location",
+    "Calendar": "Calendar"
 }
diff --git a/translations/es.json b/translations/es.json
index 430b43ff..f35e66ac 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -143,5 +143,6 @@
     "This is a group account": "This is a group account",
     "Date": "Date",
     "Time": "Time",
-    "Location": "Location"
+    "Location": "Location",
+    "Calendar": "Calendar"
 }
diff --git a/translations/fr.json b/translations/fr.json
index e4e89760..115d6c1a 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -143,5 +143,6 @@
     "This is a group account": "This is a group account",
     "Date": "Date",
     "Time": "Time",
-    "Location": "Location"
+    "Location": "Location",
+    "Calendar": "Calendar"
 }
diff --git a/translations/ga.json b/translations/ga.json
index 315d76e8..3d0edd05 100644
--- a/translations/ga.json
+++ b/translations/ga.json
@@ -143,5 +143,6 @@
     "This is a group account": "This is a group account",
     "Date": "Date",
     "Time": "Time",
-    "Location": "Location"
+    "Location": "Location",
+    "Calendar": "Calendar"
 }
diff --git a/translations/it.json b/translations/it.json
index f7d8b66a..0c28d97a 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -143,5 +143,6 @@
     "This is a group account": "This is a group account",
     "Date": "Date",
     "Time": "Time",
-    "Location": "Location"
+    "Location": "Location",
+    "Calendar": "Calendar"
 }
diff --git a/webinterface.py b/webinterface.py
index 34595346..76aea8ef 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -934,7 +934,7 @@ def htmlNewPost(translate: {},baseDir: str, \
     if endpoint!='newshare' and endpoint!='newreport':
         dateAndLocation= \
             '<div class="container">' \
-            '<p><img  class="emojicalendar" src="/emoji/1F5D3.png"/>' \
+            '<p><img  class="emojicalendar" src="/icons/calendar.png"/>' \
             '<label class="labels">'+translate['Date']+': </label>' \
             '<input type="date" name="eventDate">' \
             '<label class="labelsright">'+translate['Time']+':' \
@@ -2166,6 +2166,7 @@ def htmlTimeline(translate: {},pageNumber: int, \
         moderationButtonStr+newPostButtonStr+ \
         '    <a href="'+actor+'/search"><img src="/'+iconsDir+'/search.png" title="'+translate['Search and follow']+'" alt="'+translate['Search and follow']+'" class="timelineicon"/></a>'+ \
         '    <a href="'+actor+'/'+boxName+'"><img src="/'+iconsDir+'/refresh.png" title="'+translate['Refresh']+'" alt="'+translate['Refresh']+'" class="timelineicon"/></a>'+ \
+        '    <a href="'+actor+'/calendar"><img src="/'+iconsDir+'/calendar.png" title="'+translate['Calendar']+'" alt="'+translate['Calendar']+'" class="timelineicon"/></a>'+ \
         followApprovals+ \
         '</div>'