diff --git a/daemon.py b/daemon.py
index c41ae06e5..a0405fdb3 100644
--- a/daemon.py
+++ b/daemon.py
@@ -17081,7 +17081,8 @@ class PubServer(BaseHTTPRequestHandler):
                                     self.server.domain_full,
                                     self.server.text_mode_banner,
                                     access_keys,
-                                    False, self.server.system_language)
+                                    False, self.server.system_language,
+                                    self.server.default_timeline)
                 if msg:
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
@@ -17123,7 +17124,8 @@ class PubServer(BaseHTTPRequestHandler):
                                     self.server.text_mode_banner,
                                     access_keys,
                                     True,
-                                    self.server.system_language)
+                                    self.server.system_language,
+                                    self.server.default_timeline)
                 if msg:
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
diff --git a/epicyon-calendar.css b/epicyon-calendar.css
index 77bca46b3..b648199d9 100644
--- a/epicyon-calendar.css
+++ b/epicyon-calendar.css
@@ -66,6 +66,14 @@ main {
     flex-basis: 980px;
 }
 
+.imageAnchor {
+    font-family: var(--calendar-header-font);
+}
+
+.imageAnchor:focus img{
+    border: 2px solid var(--focus-color);
+}
+
 a:visited{
     color: var(--day-number);
     text-decoration: none;
diff --git a/webapp_calendar.py b/webapp_calendar.py
index 28d0a6056..04c899e49 100644
--- a/webapp_calendar.py
+++ b/webapp_calendar.py
@@ -299,7 +299,8 @@ def html_calendar(person_cache: {}, css_cache: {}, translate: {},
                   base_dir: str, path: str,
                   http_prefix: str, domain_full: str,
                   text_mode_banner: str, access_keys: {},
-                  icalendar: bool, system_language: str) -> str:
+                  icalendar: bool, system_language: str,
+                  default_timeline: str) -> str:
     """Show the calendar for a person
     """
     domain = remove_domain_port(domain_full)
@@ -429,15 +430,18 @@ def html_calendar(person_cache: {}, css_cache: {}, translate: {},
     calendar_str += \
         '  <a href="' + cal_actor + '/calendar?year=' + str(prev_year) + \
         '?month=' + str(prev_month_number) + '" ' + \
-        'accesskey="' + access_keys['Page up'] + '" tabindex="2">'
+        'accesskey="' + access_keys['Page up'] + \
+        '" tabindex="2" class="imageAnchor">'
     calendar_str += \
         '  <img loading="lazy" decoding="async" ' + \
         'alt="' + translate['Previous month'] + \
         '" title="' + translate['Previous month'] + '" src="/icons' + \
         '/prev.png" class="buttonprev"/></a>\n'
-    calendar_str += '  <a href="' + cal_actor + '/inbox" title="'
+    calendar_str += \
+        '  <a href="' + cal_actor + '/' + default_timeline + '" title="'
     calendar_str += translate['Switch to timeline view'] + '" ' + \
-        'accesskey="' + access_keys['menuTimeline'] + '" tabindex="1">'
+        'accesskey="' + access_keys['menuTimeline'] + \
+        '" tabindex="1" class="imageAnchor">'
     calendar_str += \
         '  <h1><time datetime="' + \
         str(year) + '-' + str(month_number) + '">' + month_name + \
@@ -445,7 +449,8 @@ def html_calendar(person_cache: {}, css_cache: {}, translate: {},
     calendar_str += \
         '  <a href="' + cal_actor + '/calendar?year=' + str(next_year) + \
         '?month=' + str(next_month_number) + '" ' + \
-        'accesskey="' + access_keys['Page down'] + '" tabindex="2">'
+        'accesskey="' + access_keys['Page down'] + \
+        '" tabindex="2" class="imageAnchor">'
     calendar_str += \
         '  <img loading="lazy" decoding="async" ' + \
         'alt="' + translate['Next month'] + \