diff --git a/assets/img/zulip.svg b/assets/img/zulip.svg
index 5bef7d9a29bd15..440ebb78884c69 100644
--- a/assets/img/zulip.svg
+++ b/assets/img/zulip.svg
@@ -1,10 +1,18 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="49.99 49.99 673.14 673.14">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="68.96 55.62 1742.12 450.43">
   <linearGradient id="a" x1="0" y1="0" x2="0" y2="1">
     <stop offset="0" stop-color="#50adff" />
     <stop offset="1" stop-color="#7877fc" />
   </linearGradient>
+  <linearGradient id="b" x1="0" y1="-1" x2="0" y2="2">
+    <stop offset="0" stop-color="#50adff" />
+    <stop offset="1" stop-color="#7877fc" />
+  </linearGradient>
   <path
-    d="M688.52 150.67c0 33.91-15.23 64.04-38.44 82.31L424.79 434.17c-4.18 3.59-9.62-2.19-6.61-7.03l82.64-165.46c2.31-4.63-.69-10.33-5.44-10.33H174.86c-49.64 0-90.26-45.31-90.26-100.68 0-55.37 40.62-100.68 90.26-100.68h423.39c49.65 0 90.27 45.31 90.27 100.68zM174.86 723.13h423.39c49.64 0 90.26-45.31 90.26-100.68 0-55.37-40.62-100.68-90.26-100.68H277.73c-4.75 0-7.76-5.7-5.44-10.33l82.64-165.46c3.01-4.83-2.42-10.62-6.61-7.03L123.04 540.14c-23.21 18.27-38.44 48.4-38.44 82.31 0 55.37 40.62 100.68 90.26 100.68z"
     fill="url(#a)"
+    d="M473.09 122.97c0 22.69-10.19 42.85-25.72 55.08L296.61 312.69c-2.8 2.4-6.44-1.47-4.42-4.7l55.3-110.72c1.55-3.1-.46-6.91-3.64-6.91H129.36c-33.22 0-60.4-30.32-60.4-67.37 0-37.06 27.18-67.37 60.4-67.37h283.33c33.22-.02 60.4 30.3 60.4 67.35zM129.36 506.05h283.33c33.22 0 60.4-30.32 60.4-67.37 0-37.06-27.18-67.37-60.4-67.37H198.2c-3.18 0-5.19-3.81-3.64-6.91l55.3-110.72c2.02-3.23-1.62-7.1-4.42-4.7L94.68 383.6c-15.53 12.22-25.72 32.39-25.72 55.08 0 37.05 27.18 67.37 60.4 67.37z"
+  />
+  <path
+    d="m651.86 381.9 124.78-179.6v-1.56H663.52v-48.98h190.09v34.21L731.55 363.24v1.56h124.01v48.98h-203.7V381.9zm338.98-230.14V302.6c0 45.09 17.1 68.03 47.43 68.03 31.1 0 48.2-21.77 48.2-68.03V151.76h59.09V298.7c0 80.86-40.82 119.34-109.24 119.34-66.09 0-104.96-36.54-104.96-120.12V151.76h59.48zm244.91 0h59.48v212.25h104.18v49.76h-163.66V151.76zm297 0v262.01h-59.48V151.76h59.48zm90.18 3.5c18.27-3.11 43.93-5.44 80.08-5.44 36.54 0 62.59 7 80.08 20.99 16.72 13.22 27.99 34.99 27.99 60.64 0 25.66-8.55 47.43-24.1 62.2-20.21 19.05-50.15 27.6-85.13 27.6-7.77 0-14.77-.39-20.21-1.17v93.69h-58.7V155.26zm58.7 118.96c5.05 1.17 11.27 1.55 19.83 1.55 31.49 0 50.92-15.94 50.92-42.76 0-24.1-16.72-38.49-46.26-38.49-12.05 0-20.21 1.17-24.49 2.33v77.37z"
+    fill="url(#b)"
   />
 </svg>
diff --git a/lib/html.py b/lib/html.py
index ab39575bdc4899..4c2eb693f1783f 100644
--- a/lib/html.py
+++ b/lib/html.py
@@ -38,8 +38,11 @@ def topic_page_links(
     topic_url = archive_topic_url(site_url, html_root, sanitized_stream_name, sanitized_topic_name)
 
     return f'''\
-<h2>Stream: <a href="{stream_url}">{stream_name}</a></h2>
-<h3>Topic: <a href="{topic_url}">{topic_name}</a></h3>
+<h2>
+    <a href="{stream_url}">{stream_name}</a>
+    >
+    <a href="{topic_url}">{topic_name}</a>
+</h2>
 
 <hr>
 
@@ -58,9 +61,8 @@ def format_message(
         ):
     msg_id = str(msg['id'])
 
-    zulip_link = link_to_zulip(
+    post_link = zulip_post_url(
         zulip_url,
-        zulip_icon_url,
         stream_id,
         stream_name,
         topic_name,
@@ -80,32 +82,24 @@ def format_message(
     anchor = '<a name="{0}"></a>'.format(msg_id)
     html = f'''
 {anchor}
-<h4>{zulip_link} {user_name} <a href="{anchor_url}">({date})</a>:</h4>
+<h4>
+    {user_name}
+    (<a href="{post_link}" target="_blank">{date}</a>
+    <a href="{anchor_url}" class="archive-link-color"> | Archive</a>):
+</h4>
 {msg_content}
 '''
     return html
 
-
-def link_to_zulip(
-        zulip_url,
-        zulip_icon_url,
-        stream_id,
-        stream_name,
-        topic_name,
-        msg_id,
-        ):
-    # format a link to the original post where you click on the Zulip icon
-    # (if it's available)
-    post_link = zulip_post_url(zulip_url, stream_id, stream_name, topic_name, msg_id)
-    if zulip_icon_url:
-        img_tag = f'<img src="{zulip_icon_url}" alt="view this post on Zulip" style="width:20px;height:20px;">'
-    else:
-        img_tag = ''
-    zulip_link = f'<a href="{post_link}" class="zl">{img_tag}</a>'
-    return zulip_link
-
 def last_updated_footer(stream_info):
     last_updated = format_date1(stream_info['time'])
     date_footer = f'\n<hr><p>Last updated: {last_updated} UTC</p>'
     return date_footer
 
+def homepage_link(site_url, zulip_icon_url):
+    if zulip_icon_url:
+        img_tag = f'<img src="{zulip_icon_url}" alt="homepage" style="height: 30px;max-width: 200px;">'
+    else:
+        img_tag = ''
+    homepage_url = f'<a href="{site_url}/archive/">{img_tag}</a>'
+    return homepage_url
diff --git a/lib/jekyll.py b/lib/jekyll.py
index 52909a72df931c..a3a1bbd36cc551 100644
--- a/lib/jekyll.py
+++ b/lib/jekyll.py
@@ -40,6 +40,7 @@
 
 from .html import (
     format_message,
+    homepage_link,
     last_updated_footer,
     topic_page_links,
     )
@@ -58,7 +59,7 @@ def build_website(json_root, md_root, site_url, html_root, title, zulip_url, zul
 
     streams = stream_info['streams']
     date_footer = last_updated_footer(stream_info)
-    write_main_page(md_root, site_url, html_root, title, streams, date_footer)
+    write_main_page(md_root, site_url, html_root, title, streams, date_footer, zulip_icon_url)
     write_css(md_root)
 
     for stream_name in streams:
@@ -74,6 +75,7 @@ def build_website(json_root, md_root, site_url, html_root, title, zulip_url, zul
             stream_name,
             stream_data,
             date_footer,
+            zulip_icon_url
             )
 
         for topic_name in topic_data:
@@ -94,7 +96,7 @@ def build_website(json_root, md_root, site_url, html_root, title, zulip_url, zul
 
 # writes the index page listing all streams.
 # `streams`: a dict mapping stream names to stream json objects as described in the header.
-def write_main_page(md_root, site_url, html_root, title, streams, date_footer):
+def write_main_page(md_root, site_url, html_root, title, streams, date_footer, zulip_icon_url):
     '''
     The main page in our website lists streams:
 
@@ -108,12 +110,12 @@ def write_main_page(md_root, site_url, html_root, title, streams, date_footer):
     write_main_page_header(outfile, html_root, title)
 
     content = stream_list_page(streams)
-
+    outfile.write(f'\n{homepage_link(site_url, zulip_icon_url)}\n')
     outfile.write(content)
     outfile.write(date_footer)
     outfile.close()
 
-def write_stream_topics(md_root, site_url, html_root, title, stream_name, stream, date_footer):
+def write_stream_topics(md_root, site_url, html_root, title, stream_name, stream, date_footer, zulip_icon_url):
     '''
     A stream page lists all topics for the stream:
 
@@ -135,6 +137,7 @@ def write_stream_topics(md_root, site_url, html_root, title, stream_name, stream
 
     content = topic_list_page(stream_name, stream_url, topic_data)
 
+    outfile.write(f'\n{homepage_link(site_url, zulip_icon_url)}\n')
     outfile.write(content)
     outfile.write(date_footer)
     outfile.close()
@@ -203,6 +206,7 @@ def write_topic_messages(
         topic_name,
         )
 
+    outfile.write(f'\n{homepage_link(site_url, zulip_icon_url)}\n')
     outfile.write(topic_links)
     outfile.write(f'\n<head><link href="{site_url}/style.css" rel="stylesheet"></head>\n')
 
diff --git a/style.css b/style.css
index 4d34676ea21ab0..5f08f0158df349 100644
--- a/style.css
+++ b/style.css
@@ -1 +1,6 @@
 .msg { margin-left: 2em; }
+
+.archive-link-color{
+    color: grey;
+    text-decoration: none;
+}