diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index 76513f50e..d3d00a427 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -15,9 +15,15 @@
   </fieldset>
 </div>
 
-<p class="contextual">
-  <%= link_to_previous_month(@year, @month, :accesskey => accesskey(:previous)) %> | <%= link_to_next_month(@year, @month, :accesskey => accesskey(:next)) %>
-</p>
+<span class="contextual pagination">
+  <ul class="pages">
+    <li class="previous page">
+      <%= link_to_previous_month(@year, @month, :accesskey => accesskey(:previous)) %>
+    </li><li class="next page">
+      <%= link_to_next_month(@year, @month, :accesskey => accesskey(:next)) %>
+    </li>
+  </ul>
+</span>
 
 <p class="buttons">
   <%= label_tag('month', l(:label_month)) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0f4561de2..7d256832b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1116,6 +1116,7 @@ table.cal .starting a.issue, p.cal.legend .starting {background: url(../images/b
 table.cal .ending a.issue, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
 table.cal .starting.ending a.issue, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
 p.cal.legend span {display:block;}
+.controller-calendars p.buttons {margin-top: unset;}
 
 /***** Tooltips ******/
 .tooltip{position:relative;z-index:24;}
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index dc7698e9a..e5a4a6e94 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -57,7 +57,7 @@ class CalendarsControllerTest < Redmine::ControllerTest
         assert_select 'div#query_form_content' do
           assert_select 'fieldset#filters.collapsible'
         end
-        assert_select 'p.contextual'
+        assert_select 'span.contextual.pagination'
         assert_select 'p.buttons'
       end
     end