diff --git a/enrol/cohort/lib.php b/enrol/cohort/lib.php
index a2370d4c96ed5..6741732ceff38 100644
--- a/enrol/cohort/lib.php
+++ b/enrol/cohort/lib.php
@@ -118,7 +118,8 @@ public function get_action_icons(stdClass $instance) {
 
         if (has_capability('enrol/cohort:config', $context)) {
             $editlink = new moodle_url("/enrol/cohort/edit.php", array('courseid'=>$instance->courseid, 'id'=>$instance->id));
-            $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('i/edit', get_string('edit'), 'core', array('class'=>'icon')));
+            $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core',
+                    array('class' => 'smallicon')));
         }
 
         return $icons;
diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php
index 7ffba73f8793f..5b6ae7ecb5e09 100644
--- a/enrol/manual/lib.php
+++ b/enrol/manual/lib.php
@@ -117,7 +117,8 @@ public function get_action_icons(stdClass $instance) {
         }
         if (has_capability('enrol/manual:config', $context)) {
             $editlink = new moodle_url("/enrol/manual/edit.php", array('courseid'=>$instance->courseid));
-            $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('i/edit', get_string('edit'), 'core', array('class'=>'icon')));
+            $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core',
+                    array('class' => 'iconsmall')));
         }
 
         return $icons;
diff --git a/enrol/paypal/lib.php b/enrol/paypal/lib.php
index ca3cd7487bc50..b79dbe119f5d4 100644
--- a/enrol/paypal/lib.php
+++ b/enrol/paypal/lib.php
@@ -118,7 +118,8 @@ public function get_action_icons(stdClass $instance) {
 
         if (has_capability('enrol/paypal:config', $context)) {
             $editlink = new moodle_url("/enrol/paypal/edit.php", array('courseid'=>$instance->courseid, 'id'=>$instance->id));
-            $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('i/edit', get_string('edit'), 'core', array('class'=>'icon')));
+            $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core',
+                    array('class' => 'smallicon')));
         }
 
         return $icons;
diff --git a/enrol/self/lib.php b/enrol/self/lib.php
index b624d92b5a1e6..31679c774f7e8 100644
--- a/enrol/self/lib.php
+++ b/enrol/self/lib.php
@@ -160,7 +160,8 @@ public function get_action_icons(stdClass $instance) {
 
         if (has_capability('enrol/self:config', $context)) {
             $editlink = new moodle_url("/enrol/self/edit.php", array('courseid'=>$instance->courseid, 'id'=>$instance->id));
-            $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('i/edit', get_string('edit'), 'core', array('class'=>'icon')));
+            $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core',
+                array('class' => 'smallicon')));
         }
 
         return $icons;
diff --git a/group/groupings.php b/group/groupings.php
index 04800d24e5158..ec8b094f08c16 100644
--- a/group/groupings.php
+++ b/group/groupings.php
@@ -83,17 +83,20 @@
         }
         $line[2] = $DB->count_records('course_modules', array('course'=>$course->id, 'groupingid'=>$grouping->id));
 
-        $buttons  = "<a title=\"$stredit\" href=\"grouping.php?id=$grouping->id\"><img".
-                    " src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /></a> ";
+        $url = new moodle_url('/group/grouping.php', array('id' => $grouping->id));
+        $buttons  = html_writer::link($url, $OUTPUT->pix_icon('t/edit', $stredit, 'core',
+                array('class' => 'iconsmall')), array('title' => $stredit));
         if (empty($grouping->idnumber) || $canchangeidnumber) {
-            // It's only possible to delete groups without an idnumber unless the user has the changeidnumber capability
-            $buttons .= "<a title=\"$strdelete\" href=\"grouping.php?id=$grouping->id&amp;delete=1\"><img".
-                        " src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a> ";
+            // It's only possible to delete groups without an idnumber unless the user has the changeidnumber capability.
+            $url = new moodle_url('/group/grouping.php', array('id' => $grouping->id, 'delete' => 1));
+            $buttons .= html_writer::link($url, $OUTPUT->pix_icon('t/delete', $strdelete, 'core',
+                    array('class' => 'iconsmall')), array('title' => $strdelete));
         } else {
             $buttons .= $OUTPUT->spacer();
         }
-        $buttons .= "<a title=\"$strmanagegrping\" href=\"assign.php?id=$grouping->id\"><img".
-                    " src=\"" . $OUTPUT->pix_url('i/group') . "\" class=\"icon\" alt=\"$strmanagegrping\" /></a> ";
+        $url = new moodle_url('/group/assign.php', array('id' => $grouping->id));
+        $buttons .= html_writer::link($url, $OUTPUT->pix_icon('t/groups', $strmanagegrping, 'core',
+                array('class' => 'iconsmall')), array('title' => $strmanagegrping));
 
         $line[3] = $buttons;
         $data[] = $line;
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 819f38c0955b9..5d56f1bff96e3 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -260,7 +260,9 @@ a.skip:active {position: static;display: block;}
 .dir-rtl .mform .helplink img { margin: 0 .45em 0 0; padding: 0;}
 .mform legend .helplink img { margin-right: .2em; }
 .dir-rtl .mform legend .helplink img { margin: 0 .45em 0 .2em; }
+.urlselect label,
 .singleselect label { margin-right: .3em; }
+.dir-rtl .urlselect label,
 .dir-rtl .singleselect label { margin-left: .3em; margin-right: 0; }
 
 input#id_externalurl {direction:ltr;}