diff --git a/app/frontend/src/stylesheets/app.layout.scss b/app/frontend/src/stylesheets/app.layout.scss
index 8af5310c2..a80947ac8 100644
--- a/app/frontend/src/stylesheets/app.layout.scss
+++ b/app/frontend/src/stylesheets/app.layout.scss
@@ -124,6 +124,11 @@
     height: 94px;
     text-align: center;
   }
+
+  .public-calendar-heading-actions {
+    display: flex;
+    justify-content: right;
+  }
 }
 
 body.container {
diff --git a/app/frontend/templates/calendar/calendar.html b/app/frontend/templates/calendar/calendar.html
index 5204ada5c..909d42395 100644
--- a/app/frontend/templates/calendar/calendar.html
+++ b/app/frontend/templates/calendar/calendar.html
@@ -5,18 +5,18 @@
         <a ng-click="backPrevLocation($event)"><i class="fas fa-long-arrow-alt-left "></i></a>
       </section>
     </div>
-    <div class="col-xs-10 col-sm-10 col-md-6 b-l b-r-md hide-b-r-lg">
+    <div class="col-xs-10 col-sm-10 col-md-3 b-l b-r-md hide-b-r-lg">
       <section class="heading-title">
         <h1 translate>{{ 'app.public.calendar.calendar' }}</h1>
       </section>
     </div>
 
-    <div class="col-xs-12 col-sm-12 col-md-5 b-t hide-b-md">
-      <div class="heading-actions wrapper">
-        <button type="button" class="btn btn-default m-t m-b" ng-click="openFilterAside()">
+    <div class="col-xs-12 col-sm-12 col-md-8 b-t hide-b-md">
+      <div class="heading-actions wrapper public-calendar-heading-actions">
+        <button type="button" class="btn btn-default m-t m-b m-r" ng-click="openFilterAside()">
           <span class="fa fa-filter"></span> {{ 'app.shared.calendar.filter_calendar' | translate }}
         </button>
-        <button type="button" class="btn btn-default m-t m-b" ng-click="triggerAutoRefresh()">
+        <button type="button" class="btn btn-default m-t m-b m-r" ng-click="triggerAutoRefresh()">
           <span class="fa fa-refresh"></span> {{ 'app.shared.calendar.auto_refresh' | translate }}
         </button>
         <button type="button" class="btn btn-default m-t m-b" ng-click="triggerOnlyCalendarViewMode()">