diff --git a/public/calendar/templates/month_mini.mustache b/public/calendar/templates/month_mini.mustache
index 217b11a6c0e..b1ed26e082d 100644
--- a/public/calendar/templates/month_mini.mustache
+++ b/public/calendar/templates/month_mini.mustache
@@ -48,7 +48,7 @@
                 <a{{!
                     }} href="#"{{!
                     }} class="arrow_link previous"{{!
-                    }} title="{{#str}}monthprev, calendar{{/str}}"{{!
+                    }} title="{{#str}}monthprevwithname, calendar, {{previousperiodname}}{{/str}}"{{!
                     }} data-year="{{previousperiod.year}}"{{!
                     }} data-month="{{previousperiod.mon}}"{{!
                     }} aria-label="{{#str}}monthprevwithname, calendar, {{previousperiodname}}{{/str}}" {{!
@@ -63,7 +63,7 @@
                 <a{{!
                     }} href="#"{{!
                     }} class="arrow_link next"{{!
-                    }} title="{{#str}}monthnext, calendar{{/str}}"{{!
+                    }} title="{{#str}}monthnextwithname, calendar, {{nextperiodname}}{{/str}}"{{!
                     }} data-year="{{nextperiod.year}}"{{!
                     }} data-month="{{nextperiod.mon}}"{{!
                     }} aria-label="{{#str}}monthnextwithname, calendar, {{nextperiodname}}{{/str}}" {{!
diff --git a/public/calendar/templates/month_navigation.mustache b/public/calendar/templates/month_navigation.mustache
index 8a403af6600..3508a854cd3 100644
--- a/public/calendar/templates/month_navigation.mustache
+++ b/public/calendar/templates/month_navigation.mustache
@@ -36,10 +36,11 @@
         <a{{!
             }} href="{{previousperiodlink}}"{{!
             }} class="arrow_link previous"{{!
-            }} title="{{#str}}monthprev, calendar{{/str}}"{{!
+            }} {{#viewinginblock}}title="{{#str}}monthprevwithname, calendar, {{previousperiodname}}{{/str}}" {{/viewinginblock}} {{!
             }} data-year="{{previousperiod.year}}"{{!
             }} data-month="{{previousperiod.mon}}"{{!
             }} data-drop-zone="nav-link" {{!
+            }} aria-label="{{#str}}monthprevwithname, calendar, {{previousperiodname}}{{/str}}" {{!
         }}>
             <span class="arrow" aria-hidden="true">{{{larrow}}}</span>
             &nbsp;
@@ -56,10 +57,11 @@
         <a{{!
             }} href="{{nextperiodlink}}"{{!
             }} class="arrow_link next"{{!
-            }} title="{{#str}}monthnext, calendar{{/str}}"{{!
+            }} {{#viewinginblock}}title="{{#str}}monthnextwithname, calendar, {{nextperiodname}}{{/str}}" {{/viewinginblock}} {{!
             }} data-year="{{nextperiod.year}}"{{!
             }} data-month="{{nextperiod.mon}}"{{!
             }} data-drop-zone="nav-link" {{!
+            }} aria-label="{{#str}}monthnextwithname, calendar, {{nextperiodname}}{{/str}}" {{!
         }}>
             <span class="arrow_text">{{nextperiodname}}</span>
             &nbsp;