diff --git a/theme/standard/config.php b/theme/standard/config.php
index ffe2c2679cc..13465c54fd3 100644
--- a/theme/standard/config.php
+++ b/theme/standard/config.php
@@ -155,7 +155,7 @@ $THEME->custompix = false;
 
 ///$THEME->rarrow = '►' //OR '→';
 ///$THEME->larrow = '◄' //OR '←';
-///$CFG->block_search_button = $THEME->rarrow .'<span class="accesshide">'.get_string('search').'</span>';
+///$CFG->block_search_button = link_arrow_right(get_string('search'), $url='', $accesshide=true);
 ///
 /// Accessibility: Right and left arrow-like characters are
 /// used in the breadcrumb trail, course navigation menu 
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index c914eb26570..105d13a4fbc 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1530,8 +1530,10 @@ table.minicalendar th {
 
 /*Accessibility: controls now div and span, 20:58:20% or 12:74:12% */
 .calendar-controls .previous,
-.calendar-controls .next
-{
+.calendar-controls .next,
+.calendar-controls .current {
+  display: block;
+  float: left;
   width: 12%;
 }
 .calendar-controls .previous {
@@ -1539,17 +1541,11 @@ table.minicalendar th {
 }
 .calendar-controls .current {
   text-align: center;
+  width: 76%;
 }
 .calendar-controls .next {
   text-align: right;
 }
-span.previous, span.current, span.next {
-  display: block;
-  float: left;
-}
-span.current {
-  width: 76%;
-}
 
 #calendar .maincalendar .calendar-controls .previous,
 #calendar .maincalendar .calendar-controls .next