diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 059c2d5ed76..31b51fb2c2c 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -206,34 +206,34 @@ function quiz_repaginate($layout, $perpage, $shuffle=false) {
 }
 
 /**
-* Print navigation panel for quiz attempt and review pages
-*
-* @param integer $page     The number of the current page (counting from 0).
-* @param integer $pages    The total number of pages.
-*/
+ * Print navigation panel for quiz attempt and review pages
+ *
+ * @param integer $page     The number of the current page (counting from 0).
+ * @param integer $pages    The total number of pages.
+ */
 function quiz_print_navigation_panel($page, $pages) {
     //$page++;
-    echo '<div class="pagingbar">';
-    echo '<span class="title">' . get_string('page') . ':</span>';
+    echo '<div class="paging pagingbar">';
+    echo '<span class="title">' . get_string('page') . ':</span>&nbsp;';
     if ($page > 0) {
         // Print previous link
         $strprev = get_string('previous');
-        echo '<a href="javascript:navigate(' . ($page - 1) . ');" title="'
-         . $strprev . '">(' . $strprev . ')</a>';
+        echo '&nbsp;<a href="javascript:navigate(' . ($page - 1) . ');" title="'
+         . $strprev . '">(' . $strprev . ')</a>&nbsp;';
     }
     for ($i = 0; $i < $pages; $i++) {
         if ($i == $page) {
-            echo '<span class="thispage">'.($i+1).'</span>';
+            echo '&nbsp;<span class="thispage">'.($i+1).'</span>&nbsp;';
         } else {
-            echo '<a href="javascript:navigate(' . ($i) . ');">'.($i+1).'</a>';
+            echo '&nbsp;<a href="javascript:navigate(' . ($i) . ');">'.($i+1).'</a>&nbsp;';
         }
     }
 
     if ($page < $pages - 1) {
         // Print next link
         $strnext = get_string('next');
-        echo '<a href="javascript:navigate(' . ($page + 1) . ');" title="'
-         . $strnext . '">(' . $strnext . ')</a>';
+        echo '&nbsp;<a href="javascript:navigate(' . ($page + 1) . ');" title="'
+         . $strnext . '">(' . $strnext . ')</a>&nbsp;';
     }
     echo '</div>';
 }
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 47dda3caa1f..37a0621c643 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -321,14 +321,6 @@ div.groupselector {
   text-align:center;
 }
 
-.pagingbar a {
-  padding-left: 10px;
-}
-
-.pagingbar .thispage {
-  padding-left: 10px;
-}
-
 table.formtable {
   margin: auto;
 }