diff --git a/admin/blocks.php b/admin/blocks.php
index d75e698a2f3..66789755edb 100644
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -168,10 +168,10 @@
 
         if ($blocks[$blockid]->visible) {
             $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
-                       '<img src="'.$OUTPUT->old_icon_url('i/hide') . '" class="icon" alt="'.$strhide.'" /></a>';
+                       '<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon" alt="'.$strhide.'" /></a>';
         } else {
             $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
-                       '<img src="'.$OUTPUT->old_icon_url('i/show') . '" class="icon" alt="'.$strshow.'" /></a>';
+                       '<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon" alt="'.$strshow.'" /></a>';
             $class = ' class="dimmed_text"'; // Leading space required!
         }
 
diff --git a/admin/filters.php b/admin/filters.php
index 763adffe37b..9249be943b9 100644
--- a/admin/filters.php
+++ b/admin/filters.php
@@ -233,7 +233,7 @@ function action_url($filterpath, $action) {
 function action_icon($url, $icon, $straction) {
     global $CFG, $OUTPUT;
     return '<a href="' . $url . '" title="' . $straction . '">' .
-            '<img src="' . $OUTPUT->old_icon_url('t/' . $icon) . '" alt="' . $straction . '" /></a> ';
+            '<img src="' . $OUTPUT->pix_url('t/' . $icon) . '" alt="' . $straction . '" /></a> ';
 }
 
 function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) {
@@ -256,7 +256,7 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings)
 
     // Re-order
     $updown = '';
-    $spacer = '<img src="' . $OUTPUT->old_icon_url('spacer') . '" class="iconsmall" alt="" /> ';
+    $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
     if ($filterinfo->active != TEXTFILTER_DISABLED) {
         if (!$isfirstrow) {
             $updown .= action_icon(action_url($filter, 'up'), 'up', get_string('up'));
diff --git a/admin/lang.php b/admin/lang.php
index 1bb3f04d92f..b80df3dd60a 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -611,9 +611,9 @@
                     if (LANG_DISPLAY_MISSING_LINKS) {
                         $missingtarget = '<a name="missing'.$missingcounter.'"></a>';
                         $missingnext = '<a href="#missing'.($missingcounter+1).'">'.
-                        '<img src="' . $OUTPUT->old_icon_url('t/down') . '" class="iconsmall" alt="'.$strnext.'" /></a>';
+                        '<img src="' . $OUTPUT->pix_url('t/down') . '" class="iconsmall" alt="'.$strnext.'" /></a>';
                         $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
-                        '<img src="' . $OUTPUT->old_icon_url('t/up') . '" class="iconsmall" alt="'.$strprev.'" /></a>';
+                        '<img src="' . $OUTPUT->pix_url('t/up') . '" class="iconsmall" alt="'.$strprev.'" /></a>';
                     }
                 } else {
                     // the string is translated in the pack being processed
@@ -624,9 +624,9 @@
                         if (LANG_DISPLAY_MISSING_LINKS) {
                             $missingtarget = '<a name="missing'.$missingcounter.'"></a>';
                             $missingnext = '<a href="#missing'.($missingcounter+1).'">'.
-                            '<img src="' . $OUTPUT->old_icon_url('t/down') . '" class="iconsmall" alt="'.$strnext.'" /></a>';
+                            '<img src="' . $OUTPUT->pix_url('t/down') . '" class="iconsmall" alt="'.$strnext.'" /></a>';
                             $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
-                            '<img src="' . $OUTPUT->old_icon_url('t/up') . '" class="iconsmall" alt="'.$strprev.'" /></a>';
+                            '<img src="' . $OUTPUT->pix_url('t/up') . '" class="iconsmall" alt="'.$strprev.'" /></a>';
                         }
                     }
                 }
diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 6d0fb49f461..6008680d0dd 100644
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -151,7 +151,7 @@ foreach ($columns as $column) {
     } else {
         $columndir = $dir == "ASC" ? "DESC" : "ASC";
         $columnicon = $dir == "ASC" ? "down" : "up";
-        $columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />";
+        $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
     }
     $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }
diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php
index aa8a8aab740..8901d446c7e 100644
--- a/admin/mnet/enr_courses.php
+++ b/admin/mnet/enr_courses.php
@@ -32,7 +32,7 @@
     echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
            . '<table class="generaltable">';
 
-    $icon  = "<img src=\"" . $OUTPUT->old_icon_url('i/course') . "\"".
+    $icon  = "<img src=\"" . $OUTPUT->pix_url('i/course') . "\"".
     " class=\"icon\" alt=\"".get_string("course")."\" />";
 
     foreach ($courses as $course) {
diff --git a/admin/modules.php b/admin/modules.php
index c6af968d666..6642d96434c 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -129,7 +129,7 @@
     foreach ($modulebyname as $modulename => $module) {
 
         // took out hspace="\10\", because it does not validate. don't know what to replace with.
-        $icon = "<img src=\"" . $OUTPUT->old_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
+        $icon = "<img src=\"" . $OUTPUT->pix_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
 
         $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=".sesskey()."\">$strdelete</a>";
 
@@ -151,11 +151,11 @@
 
         if ($module->visible) {
             $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
-                       "<img src=\"" . $OUTPUT->old_icon_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" /></a>";
+                       "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" /></a>";
             $class = "";
         } else {
             $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
-                       "<img src=\"" . $OUTPUT->old_icon_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" /></a>";
+                       "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" /></a>";
             $class = " class=\"dimmed_text\"";
         }
         if ($module->name == "forum") {
diff --git a/admin/qtypes.php b/admin/qtypes.php
index f09612a0260..be03869b264 100644
--- a/admin/qtypes.php
+++ b/admin/qtypes.php
@@ -229,7 +229,7 @@
                 $rowclass = 'dimmed_text';
             }
         } else {
-            $icons = '<img src="' . $OUTPUT->old_icon_url('spacer') . '" alt="" class="spacer" />';
+            $icons = '<img src="' . $OUTPUT->pix_url('spacer') . '" alt="" class="spacer" />';
         }
 
         // Move icons.
@@ -282,7 +282,7 @@ function icon_html($action, $qtypename, $icon, $alt, $tip) {
     $html = ' <form action="' . admin_url('qtypes.php') . '" method="post"><div>';
     $html .= '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
     $html .= '<input type="image" name="' . $action . '" value="' . $qtypename .
-            '" src="' . $OUTPUT->old_icon_url($icon) . '" alt="' . $alt . '" ' . $tip . '/>';
+            '" src="' . $OUTPUT->pix_url($icon) . '" alt="' . $alt . '" ' . $tip . '/>';
     $html .= '</div></form>';
     return $html;
 }
diff --git a/admin/report/configlog/index.php b/admin/report/configlog/index.php
index 86dc2893709..2d2f9ad9c96 100644
--- a/admin/report/configlog/index.php
+++ b/admin/report/configlog/index.php
@@ -46,7 +46,7 @@ foreach ($columns as $column=>$strcolumn) {
         } else {
             $columnicon = $dir == 'ASC' ? 'down':'up';
         }
-        $columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />";
+        $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
 
     }
     $hcolumns[$column] = "<a href=\"index.php?sort=$column&amp;dir=$columndir&amp;page=$page&amp;perpage=$perpage\">".$strcolumn."</a>$columnicon";
diff --git a/admin/roles/lib.php b/admin/roles/lib.php
index 76fd7af06d6..5e96bc121e9 100644
--- a/admin/roles/lib.php
+++ b/admin/roles/lib.php
@@ -421,7 +421,7 @@ abstract class capability_table_with_risks extends capability_table_base {
     function get_risk_icon($type) {
         global $OUTPUT;
         if (!isset($this->riskicons[$type])) {
-            $iconurl = $OUTPUT->old_icon_url('i/' . str_replace('risk', 'risk_', $type));
+            $iconurl = $OUTPUT->pix_url('i/' . str_replace('risk', 'risk_', $type));
 
             $link = html_link::make($this->risksurl, '<img src="' . $iconurl . '" alt="' . get_string($type . 'short', 'admin') . '" />');
             $link->add_action(new popup_action('click', $link->url, 'docspopup'));
diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index 633c8ae529c..623a503e4d6 100755
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -274,9 +274,9 @@
 function get_action_icon($url, $icon, $alt, $tooltip) {
     global $OUTPUT;
     return '<a title="' . $tooltip . '" href="'. $url . '">' .
-            '<img src="' . $OUTPUT->old_icon_url('t/' . $icon) . '" class="iconsmall" alt="' . $alt . '" /></a> ';
+            '<img src="' . $OUTPUT->pix_url('t/' . $icon) . '" class="iconsmall" alt="' . $alt . '" /></a> ';
 }
 function get_spacer() {
     global $OUTPUT;
-    return '<img src="' . $OUTPUT->old_icon_url('spacer') . '" class="iconsmall" alt="" /> ';
+    return '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
 }
diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php
index b7d3aa66d6f..0fddff7a909 100644
--- a/admin/roles/usersroles.php
+++ b/admin/roles/usersroles.php
@@ -201,9 +201,9 @@ function print_report_tree($contextid, $contexts, $systemcontext, $fullname) {
                 $strcheck = get_string('checkuserspermissionshere', 'role', $a);
             }
             echo ' <a title="' . $strgoto . '" href="' . $raurl . '"><img class="iconsmall" src="' .
-                    $OUTPUT->old_icon_url('t/edit') . '" alt="' . $stredit . '" /></a> ';
+                    $OUTPUT->pix_url('t/edit') . '" alt="' . $stredit . '" /></a> ';
             echo ' <a title="' . $strcheck . '" href="' . $churl . '"><img class="iconsmall" src="' .
-                    $OUTPUT->old_icon_url('t/preview') . '" alt="' . $strcheckpermissions . '" /></a> ';
+                    $OUTPUT->pix_url('t/preview') . '" alt="' . $strcheckpermissions . '" /></a> ';
             echo "</p>\n";
         }
     }
diff --git a/admin/user.php b/admin/user.php
index 4b78f94669c..ad8a4ab92bf 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -140,7 +140,7 @@
             } else {
                 $columnicon = $dir == "ASC" ? "down":"up";
             }
-            $columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />";
+            $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
 
         }
         $$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir\">".$string[$column]."</a>$columnicon";
diff --git a/admin/user/user_bulk_display.php b/admin/user/user_bulk_display.php
index 1530eedddf3..58c11b725cd 100755
--- a/admin/user/user_bulk_display.php
+++ b/admin/user/user_bulk_display.php
@@ -56,7 +56,7 @@ foreach ($columns as $column) {
         $columndir = 'asc';
     } else {
         $columndir = $dir == 'asc' ? 'desc' : 'asc';
-        $columnicon = ' <img src="'.$OUTPUT->old_icon_url('t/'.($dir == 'asc' ? 'down' : 'up' )).'f" alt="" />';
+        $columnicon = ' <img src="'.$OUTPUT->pix_url('t/'.($dir == 'asc' ? 'down' : 'up' )).'f" alt="" />';
     }
     $table->head[] = '<a href="user_bulk_display.php?sort='.$column.'&amp;dir='.$columndir.'">'.$strtitle.'</a>'.$columnicon;
     $table->align[] = 'left';
diff --git a/admin/user/user_bulk_enrol.php b/admin/user/user_bulk_enrol.php
index 859a715d3f9..48ab6f2da4e 100644
--- a/admin/user/user_bulk_enrol.php
+++ b/admin/user/user_bulk_enrol.php
@@ -61,7 +61,7 @@ foreach ($columns as $column) {
         $columndir = 'asc';
     } else {
         $columndir = ($dir == 'asc') ? 'desc' : 'asc';
-        $columnicon = ' <img src="'.$OUTPUT->old_icon_url('t/'.($dir == 'asc' ? 'down' : 'up' )).'" alt="" />';
+        $columnicon = ' <img src="'.$OUTPUT->pix_url('t/'.($dir == 'asc' ? 'down' : 'up' )).'" alt="" />';
     }
     $table->head[] = '<a href="user_bulk_enrol.php?sort='.$column.'&amp;dir='.$columndir.'">'.$strtitle.'</a>'.$columnicon;
     $table->align[] = 'left';
diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php
index 3b8a8206992..498992667db 100644
--- a/blocks/activity_modules/block_activity_modules.php
+++ b/blocks/activity_modules/block_activity_modules.php
@@ -51,10 +51,10 @@ class block_activity_modules extends block_list {
         foreach ($modfullnames as $modname => $modfullname) {
             if ($modname === 'resources') {
                 $this->content->items[] = '<a href="'.$CFG->wwwroot.'/course/resources.php?id='.$course->id.'">'.$modfullname.'</a>';
-                $this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('f/html') . '" class="icon" alt="" />';
+                $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('f/html') . '" class="icon" alt="" />';
             } else {
                 $this->content->items[] = '<a href="'.$CFG->wwwroot.'/mod/'.$modname.'/index.php?id='.$course->id.'">'.$modfullname.'</a>';
-                $this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('icon', $modname) . '" class="icon" alt="" />';
+                $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('icon', $modname) . '" class="icon" alt="" />';
             }
         }
 
diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php
index ec7b4a27757..f07f47fe4df 100644
--- a/blocks/admin/block_admin.php
+++ b/blocks/admin/block_admin.php
@@ -32,7 +32,7 @@ class block_admin extends block_list {
 
     /// Course editing on/off
         if ($course->id !== SITEID and has_capability('moodle/course:update', $this->page->context)) {
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/edit') . '" class="icon" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/edit') . '" class="icon" alt="" />';
             if ($this->page->user_is_editing()) {
                 $this->content->items[]='<a href="view.php?id='.$course->id.'&amp;edit=off&amp;sesskey='.sesskey().'">'.get_string('turneditingoff').'</a>';
             } else {
@@ -40,17 +40,17 @@ class block_admin extends block_list {
             }
 
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/edit.php?id='.$course->id.'">'.get_string('settings').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/settings') . '" class="icon" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/settings') . '" class="icon" alt="" />';
         }
 
     /// Assign roles to the course
         if ($course->id != SITEID) {
             if (has_capability('moodle/role:assign', $this->page->context)) {
                 $this->content->items[]='<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$this->page->context->id.'">'.get_string('assignroles', 'role').'</a>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/roles') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/roles') . '" class="icon" alt="" />';
             } else if (get_overridable_roles($this->page->context, ROLENAME_ORIGINAL)) {
                 $this->content->items[]='<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$this->page->context->id.'">'.get_string('overridepermissions', 'role').'</a>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/roles') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/roles') . '" class="icon" alt="" />';
             }
         }
 
@@ -75,7 +75,7 @@ class block_admin extends block_list {
 
             if ($reportavailable) {
                 $this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/report/index.php?id='.$course->id.'">'.get_string('grades').'</a>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/grades') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/grades') . '" class="icon" alt="" />';
             }
         }
 
@@ -83,7 +83,7 @@ class block_admin extends block_list {
         if (!empty($CFG->enableoutcomes)) {
             if ($course->id!==SITEID and has_capability('moodle/course:update', $this->page->context)) {
                 $this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/edit/outcome/course.php?id='.$course->id.'">'.get_string('outcomes', 'grades').'</a>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/outcomes') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/outcomes') . '" class="icon" alt="" />';
             }
         }
 
@@ -92,11 +92,11 @@ class block_admin extends block_list {
             if (has_capability('moodle/course:managemetacourse', $this->page->context)) {
                 $strchildcourses = get_string('childcourses');
                 $this->content->items[]='<a href="importstudents.php?id='.$course->id.'">'.$strchildcourses.'</a>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/course') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/course') . '" class="icon" alt="" />';
             } else if (has_capability('moodle/role:assign', $this->page->context)) {
                 $strchildcourses = get_string('childcourses');
                 $this->content->items[]='<span class="dimmed_text">'.$strchildcourses.'</span>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/course') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/course') . '" class="icon" alt="" />';
             }
         }
 
@@ -105,37 +105,37 @@ class block_admin extends block_list {
         if (($course->id!==SITEID) && ($course->groupmode || !$course->groupmodeforce) && has_capability('moodle/course:managegroups', $this->page->context)) {
             $strgroups = get_string('groups');
             $this->content->items[]='<a title="'.$strgroups.'" href="'.$CFG->wwwroot.'/group/index.php?id='.$course->id.'">'.$strgroups.'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/group') . '" class="icon" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/group') . '" class="icon" alt="" />';
         }
 
     /// Backup this course
         if ($course->id!==SITEID and has_capability('moodle/site:backup', $this->page->context)) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/backup/backup.php?id='.$course->id.'">'.get_string('backup').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/backup') . '" class="icon" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/backup') . '" class="icon" alt="" />';
         }
 
     /// Restore to this course
         if ($course->id !== SITEID and has_capability('moodle/site:restore', $this->page->context)) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$course->id.'&amp;wdir=/backupdata">'.get_string('restore').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/restore') . '" class="icon" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/restore') . '" class="icon" alt="" />';
         }
 
     /// Import data from other courses
         if ($course->id !== SITEID and has_capability('moodle/site:import', $this->page->context)) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/import.php?id='.$course->id.'">'.get_string('import').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/restore') . '" class="icon" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/restore') . '" class="icon" alt="" />';
         }
 
     /// Reset this course
         if ($course->id!==SITEID and has_capability('moodle/course:reset', $this->page->context)) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/reset.php?id='.$course->id.'">'.get_string('reset').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/return') . '" class="icon" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/return') . '" class="icon" alt="" />';
         }
 
     /// View course reports
         if ($course->id !== SITEID and has_capability('moodle/site:viewreports', $this->page->context)) { // basic capability for listing of reports
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/report.php?id='.$course->id.'">'.get_string('reports').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/stats') . '" class="icon" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/stats') . '" class="icon" alt="" />';
         }
 
     /// Manage questions
@@ -161,7 +161,7 @@ class block_admin extends block_list {
             if ($questionlink) {
                 $this->content->items[]='<a href="'.$CFG->wwwroot.'/question/'.$questionlink.
                         '?courseid='.$course->id.'">'.get_string('questions', 'quiz').'</a>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/questions') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/questions') . '" class="icon" alt="" />';
             }
         }
 
@@ -170,13 +170,13 @@ class block_admin extends block_list {
         $editabletypes = repository::get_editable_types($this->page->context);
         if ($course->id !== SITEID && has_capability('moodle/course:update', $this->page->context) && !empty($editabletypes)) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/repository/manage_instances.php?contextid='.$this->page->context->id.'">'.get_string('repositories').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/repository') . '" alt=""/>';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/repository') . '" alt=""/>';
         }
 
     /// Manage files
         if ($course->id !== SITEID and has_capability('moodle/course:managefiles', $this->page->context)) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$course->id.'">'.get_string('files').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/files') . '" class="icon" alt=""/>';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/files') . '" class="icon" alt=""/>';
         }
 
     /// Authorize hooks
@@ -189,24 +189,24 @@ class block_admin extends block_list {
                 }
             }
             $this->content->items[] = $paymenturl;
-            $this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('i/payment') . '" class="icon" alt="" />';
+            $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('i/payment') . '" class="icon" alt="" />';
         }
 
     /// Unenrol link
         if (empty($course->metacourse) && ($course->id!==SITEID)) {
             if (has_capability('moodle/legacy:guest', $this->page->context, NULL, false)) {   // Are a guest now
                 $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/enrol.php?id='.$course->id.'">'.get_string('enrolme', '', format_string($course->shortname)).'</a>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/user') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/user') . '" class="icon" alt="" />';
             } else if (has_capability('moodle/role:unassignself', $this->page->context, NULL, false) and get_user_roles($this->page->context, $USER->id, false)) {  // Have some role
                 $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/unenrol.php?id='.$course->id.'">'.get_string('unenrolme', '', format_string($course->shortname)).'</a>';
-                $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/user') . '" class="icon" alt="" />';
+                $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/user') . '" class="icon" alt="" />';
             }
         }
 
     /// Link to the user own profile (except guests)
         if (!isguestuser() and isloggedin()) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/user/view.php?id='.$USER->id.'&amp;course='.$course->id.'">'.get_string('profile').'</a>';
-            $this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/user') . '" alt="" />';
+            $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/user') . '" alt="" />';
         }
 
         return $this->content;
diff --git a/blocks/admin_tree/block_admin_tree.php b/blocks/admin_tree/block_admin_tree.php
index a0d9ed73339..5351f210b49 100644
--- a/blocks/admin_tree/block_admin_tree.php
+++ b/blocks/admin_tree/block_admin_tree.php
@@ -35,7 +35,7 @@ class block_admin_tree extends block_base {
         $strfolderopened = s(get_string('folderopened'));
 
         $this->tempcontent .= '<div class="depth'.$this->currentdepth.'"><a name="d'.$this->divcounter.'">';
-        $this->tempcontent .= '<img id="vh_div'.$this->divcounter.'indicator" src="'.$OUTPUT->old_icon_url('i/open') . '" alt="'.$strfolderopened.'" /> ';
+        $this->tempcontent .= '<img id="vh_div'.$this->divcounter.'indicator" src="'.$OUTPUT->pix_url('i/open') . '" alt="'.$strfolderopened.'" /> ';
         $this->tempcontent .= $visiblename.'</a></div><div id="vh_div'.$this->divcounter.'">'."\n";
         $this->currentdepth++;
         $this->divcounter++;
@@ -61,7 +61,7 @@ class block_admin_tree extends block_base {
                 if ($content->is_hidden()) {
                     $class .= ' hidden';
                 }
-                $this->create_item($content->visiblename, $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section='.$content->name,$OUTPUT->old_icon_url('i/item'), $class);
+                $this->create_item($content->visiblename, $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section='.$content->name,$OUTPUT->pix_url('i/item'), $class);
             }
         } else if ($content instanceof admin_externalpage) {
             // show hidden pages in tree if hidden page active
@@ -75,7 +75,7 @@ class block_admin_tree extends block_base {
                 if ($content->is_hidden()) {
                     $class .= ' hidden';
                 }
-                $this->create_item($content->visiblename, $content->url, $OUTPUT->old_icon_url('i/item'), $class);
+                $this->create_item($content->visiblename, $content->url, $OUTPUT->pix_url('i/item'), $class);
             }
         } else if ($content instanceof admin_category) {
             if ($content->check_access() and !$content->is_hidden()) {
@@ -141,7 +141,7 @@ class block_admin_tree extends block_base {
             $this->page->requires->js('blocks/admin_tree/admintree.js');
             $this->page->requires->js_function_call('admin_tree.init',
                     array($this->divcounter - 1, $this->expandnodes,
-                    $OUTPUT->old_icon_url('i/open'), $OUTPUT->old_icon_url('i/closed'),
+                    $OUTPUT->pix_url('i/open'), $OUTPUT->pix_url('i/closed'),
                     get_string('folderopened'), get_string('folderclosed')));
 
             $this->content = new object();
diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php
index f2363f47dd9..010f9147c7c 100644
--- a/blocks/course_list/block_course_list.php
+++ b/blocks/course_list/block_course_list.php
@@ -24,7 +24,7 @@ class block_course_list extends block_list {
         $this->content->icons = array();
         $this->content->footer = '';
 
-        $icon  = "<img src=\"" . $OUTPUT->old_icon_url('i/course') . "\"".
+        $icon  = "<img src=\"" . $OUTPUT->pix_url('i/course') . "\"".
                  " class=\"icon\" alt=\"".get_string("coursecategory")."\" />";
 
         $adminseesall = true;
@@ -116,7 +116,7 @@ class block_course_list extends block_list {
             return;
         }
 
-        $icon  = '<img src="'.$OUTPUT->old_icon_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />';
+        $icon  = '<img src="'.$OUTPUT->pix_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />';
 
         // only for logged in users!
         if (!isloggedin() || isguestuser()) {
diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php
index 5605632e49d..38ea88709bd 100644
--- a/blocks/course_summary/block_course_summary.php
+++ b/blocks/course_summary/block_course_summary.php
@@ -35,7 +35,7 @@ class block_course_summary extends block_base {
             } else {
                 $editpage = $CFG->wwwroot.'/course/edit.php?id='.$this->page->course->id;
             }
-            $this->content->text .= "<div class=\"editbutton\"><a href=\"$editpage\"><img src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" alt=\"".get_string('edit')."\" /></a></div>";
+            $this->content->text .= "<div class=\"editbutton\"><a href=\"$editpage\"><img src=\"" . $OUTPUT->pix_url('t/edit') . "\" alt=\"".get_string('edit')."\" /></a></div>";
         }
         $this->content->footer = '';
 
diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php
index 175d9bc2981..b71955c751a 100644
--- a/blocks/global_navigation_tree/block_global_navigation_tree.php
+++ b/blocks/global_navigation_tree/block_global_navigation_tree.php
@@ -163,7 +163,7 @@ class block_global_navigation_tree extends block_tree {
         $reloadicon->link->url = $this->page->url;
         $reloadicon->link->url->param('regenerate','navigation');
         $reloadicon->link->add_class('customcommand');
-        $reloadicon->image->src = $OUTPUT->old_icon_url('t/reload');
+        $reloadicon->image->src = $OUTPUT->pix_url('t/reload');
         $reloadicon->alt = get_string('reload');
         $reloadicon->title = get_string('reload');
         $this->content->footer .= $OUTPUT->action_icon($reloadicon);
@@ -175,12 +175,12 @@ class block_global_navigation_tree extends block_tree {
             $moveicon->link->add_classes('moveto customcommand requiresjs');
             $moveicon->link->url = $this->page->url;
             if ($this->docked) {
-                $moveicon->image->src = $OUTPUT->old_icon_url('t/movetoblock');
+                $moveicon->image->src = $OUTPUT->pix_url('t/movetoblock');
                 $moveicon->image->alt = $toggleblockdisplay;
                 $moveicon->image->title = $toggleblockdisplay;
                 $moveicon->link->url->param('undock', $this->instance->id);
             } else {
-                $moveicon->image->src = $OUTPUT->old_icon_url('t/movetosidetab');
+                $moveicon->image->src = $OUTPUT->pix_url('t/movetosidetab');
                 $moveicon->image->alt = $togglesidetabdisplay;
                 $moveicon->image->title = $togglesidetabdisplay;
                 $moveicon->link->url->param('dock', $this->instance->id);
diff --git a/blocks/loancalc/block_loancalc.php b/blocks/loancalc/block_loancalc.php
index 7ba24018407..4416ad9bc12 100644
--- a/blocks/loancalc/block_loancalc.php
+++ b/blocks/loancalc/block_loancalc.php
@@ -11,7 +11,7 @@ class block_loancalc extends block_base {
     function get_content() {
         global $CFG, $OUTPUT;
 
-        $calc = $OUTPUT->old_icon_url('i/calc');
+        $calc = $OUTPUT->pix_url('i/calc');
 
         $this->content->text = '
         <script type="text/javascript">
diff --git a/blocks/messages/block_messages.php b/blocks/messages/block_messages.php
index 3f176f5f9e4..512a5dd8f43 100644
--- a/blocks/messages/block_messages.php
+++ b/blocks/messages/block_messages.php
@@ -47,7 +47,7 @@ class block_messages extends block_base {
                 $this->content->text .= '<li class="listentry"><div class="user"><a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.SITEID.'" title="'.$timeago.'">';
                 $this->content->text .= $OUTPUT->user_picture(moodle_user_picture::make($user, SITEID));
                 $this->content->text .= fullname($user).'</a></div>';
-                $this->content->text .= '<div class="message"><a href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\'; return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'.$OUTPUT->old_icon_url('t/message') . '" alt="" />&nbsp;'.$user->count.'</a>';
+                $this->content->text .= '<div class="message"><a href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\'; return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'.$OUTPUT->pix_url('t/message') . '" alt="" />&nbsp;'.$user->count.'</a>';
                 $this->content->text .= '</div></li>';
             }
             $this->content->text .= '</ul>';
diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php
index bafebf03fa4..87ec46580b2 100644
--- a/blocks/mnet_hosts/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/block_mnet_hosts.php
@@ -82,7 +82,7 @@ class block_mnet_hosts extends block_list {
 
         if ($hosts) {
             foreach ($hosts as $host) {
-            $icon  = '<img src="'.$OUTPUT->old_icon_url('i/'.$host->application.'_host') . '"'.
+            $icon  = '<img src="'.$OUTPUT->pix_url('i/'.$host->application.'_host') . '"'.
                 ' class="icon" alt="'.get_string('server', 'block_mnet_hosts').'" />';
 
                 $this->content->icons[]=$icon;
diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php
index aa951a9de3b..cc0b245e56e 100644
--- a/blocks/online_users/block_online_users.php
+++ b/blocks/online_users/block_online_users.php
@@ -154,7 +154,7 @@ class block_online_users extends block_base {
                 }
                 if ($canshowicon and ($USER->id != $user->id) and  $user->username != 'guest') {  // Only when logged in and messaging active etc
                     $this->content->text .= '<div class="message"><a title="'.get_string('messageselectadd').'" href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\';return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);">'
-                        .'<img class="iconsmall" src="'.$OUTPUT->old_icon_url('t/message') . '" alt="'. get_string('messageselectadd') .'" /></a></div>';
+                        .'<img class="iconsmall" src="'.$OUTPUT->pix_url('t/message') . '" alt="'. get_string('messageselectadd') .'" /></a></div>';
                 }
                 $this->content->text .= "</li>\n";
             }
diff --git a/blocks/participants/block_participants.php b/blocks/participants/block_participants.php
index 3390868662a..1931a9b0dfd 100644
--- a/blocks/participants/block_participants.php
+++ b/blocks/participants/block_participants.php
@@ -37,7 +37,7 @@ class block_participants extends block_list {
 
         $this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
                                   $CFG->wwwroot.'/user/index.php?contextid='.$currentcontext->id.'">'.get_string('participants').'</a>';
-        $this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('i/users') . '" class="icon" alt="" />';
+        $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('i/users') . '" class="icon" alt="" />';
 
         return $this->content;
     }
diff --git a/blocks/rss_client/managefeeds.php b/blocks/rss_client/managefeeds.php
index 8181c9b9e62..afac104e834 100644
--- a/blocks/rss_client/managefeeds.php
+++ b/blocks/rss_client/managefeeds.php
@@ -120,14 +120,14 @@ foreach($feeds as $feed) {
     $editaction = new moodle_action_icon();
     $editaction->link->url = $CFG->wwwroot .'/blocks/rss_client/editfeed.php?rssid=' . $feed->id . $extraparams;
     $editaction->link->title = get_string('edit');
-    $editaction->image->src = $OUTPUT->old_icon_url('t/edit');
+    $editaction->image->src = $OUTPUT->pix_url('t/edit');
     $editaction->image->alt = get_string('edit');
 
     $deleteaction = new moodle_action_icon();
     $deleteaction->link->url = $CFG->wwwroot .'/blocks/rss_client/managefeeds.php?deleterssid=' . $feed->id .
             '&sesskey=' . sesskey() . $extraparams;
     $deleteaction->link->title = get_string('delete');
-    $deleteaction->image->src = $OUTPUT->old_icon_url('t/delete');
+    $deleteaction->image->src = $OUTPUT->pix_url('t/delete');
     $deleteaction->image->alt = get_string('delete');
     $deleteaction->link->add_confirm_action(get_string('deletefeedconfirm', 'block_rss_client'));
 
diff --git a/blocks/settings_navigation_tree/block_settings_navigation_tree.php b/blocks/settings_navigation_tree/block_settings_navigation_tree.php
index 6ceb6e9dac6..131b87f9a5f 100644
--- a/blocks/settings_navigation_tree/block_settings_navigation_tree.php
+++ b/blocks/settings_navigation_tree/block_settings_navigation_tree.php
@@ -145,7 +145,7 @@ class block_settings_navigation_tree extends block_tree {
             $url->param('regenerate','navigation');
             $reloadicon->link->url = $url;
             $reloadicon->link->add_class('customcommand');
-            $reloadicon->image->src = $OUTPUT->old_icon_url('t/reload');
+            $reloadicon->image->src = $OUTPUT->pix_url('t/reload');
             $reloadicon->alt = get_string('reload');
             $reloadicon->title = get_string('reload');
 
@@ -158,12 +158,12 @@ class block_settings_navigation_tree extends block_tree {
                 $moveicon->link->add_classes('moveto customcommand requiresjs');
                 $moveicon->link->url = $this->page->url;
                 if ($this->docked) {
-                    $moveicon->image->src = $OUTPUT->old_icon_url('t/movetoblock');
+                    $moveicon->image->src = $OUTPUT->pix_url('t/movetoblock');
                     $moveicon->image->alt = $toggleblockdisplay;
                     $moveicon->image->title = $toggleblockdisplay;
                     $moveicon->link->url->param('undock', $this->instance->id);
                 } else {
-                    $moveicon->image->src = $OUTPUT->old_icon_url('t/movetosidetab');
+                    $moveicon->image->src = $OUTPUT->pix_url('t/movetosidetab');
                     $moveicon->image->alt = $togglesidetabdisplay;
                     $moveicon->image->title = $togglesidetabdisplay;
                     $moveicon->link->url->param('dock', $this->instance->id);
diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index 14d802ad115..093e3b73b12 100644
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -50,9 +50,9 @@ class block_site_main_menu extends block_list {
                             ' href="'.$CFG->wwwroot.'/mod/'.$cm->modname.'/view.php?id='.$cm->id.'">'.$instancename.'</a>';
                         //Accessibility: incidental image - should be empty Alt text
                         if (!empty($cm->icon)) {
-                            $icon = $OUTPUT->old_icon_url($cm->icon);
+                            $icon = $OUTPUT->pix_url($cm->icon);
                         } else {
-                            $icon = $OUTPUT->old_icon_url('icon', $cm->modname);
+                            $icon = $OUTPUT->pix_url('icon', $cm->modname);
                         }
                         $this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
                     }
@@ -80,7 +80,7 @@ class block_site_main_menu extends block_list {
         $editbuttons = '';
 
         if ($ismoving) {
-            $this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('t/move') . '" class="iconsmall" alt="" />';
+            $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('t/move') . '" class="iconsmall" alt="" />';
             $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
         }
 
@@ -110,7 +110,7 @@ class block_site_main_menu extends block_list {
                             continue;
                         }
                         $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
-                            '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->old_icon_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
+                            '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->pix_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
                         $this->content->icons[] = '';
                     }
                     $instancename = $modinfo->cms[$modnumber]->name;
@@ -122,9 +122,9 @@ class block_site_main_menu extends block_list {
                         $extra = '';
                     }
                     if (!empty($modinfo->cms[$modnumber]->icon)) {
-                        $icon = $OUTPUT->old_icon_url($modinfo->cms[$modnumber]->icon);
+                        $icon = $OUTPUT->pix_url($modinfo->cms[$modnumber]->icon);
                     } else {
-                        $icon = $OUTPUT->old_icon_url('icon', $mod->modname);
+                        $icon = $OUTPUT->pix_url('icon', $mod->modname);
                     }
 
                     if ($mod->modname == 'label') {
@@ -142,7 +142,7 @@ class block_site_main_menu extends block_list {
 
         if ($ismoving) {
             $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
-                                      '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->old_icon_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
+                                      '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->pix_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
             $this->content->icons[] = '';
         }
 
diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index 2ed93ade2a8..6ce2d133d36 100644
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -52,9 +52,9 @@ class block_social_activities extends block_list {
                             ' href="'.$CFG->wwwroot.'/mod/'.$cm->modname.'/view.php?id='.$cm->id.'">'.$instancename.'</a>';
                         //Accessibility: incidental image - should be empty Alt text
                         if (!empty($cm->icon)) {
-                            $icon = $OUTPUT->old_icon_url($cm->icon);
+                            $icon = $OUTPUT->pix_url($cm->icon);
                         } else {
-                            $icon = $OUTPUT->old_icon_url('icon', $cm->modname);
+                            $icon = $OUTPUT->pix_url('icon', $cm->modname);
                         }
                         $this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
                     }
@@ -89,7 +89,7 @@ class block_social_activities extends block_list {
         $editbuttons = '';
 
         if ($ismoving) {
-            $this->content->icons[] = '&nbsp;<img align="bottom" src="'.$OUTPUT->old_icon_url('t/move') . '" class="iconsmall" alt="" />';
+            $this->content->icons[] = '&nbsp;<img align="bottom" src="'.$OUTPUT->pix_url('t/move') . '" class="iconsmall" alt="" />';
             $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
         }
 
@@ -119,7 +119,7 @@ class block_social_activities extends block_list {
                             continue;
                         }
                         $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
-                            '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->old_icon_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
+                            '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->pix_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
                         $this->content->icons[] = '';
                     }
                     $instancename = $modinfo->cms[$modnumber]->name;
@@ -131,9 +131,9 @@ class block_social_activities extends block_list {
                         $extra = '';
                     }
                     if (!empty($modinfo->cms[$modnumber]->icon)) {
-                        $icon = $OUTPUT->old_icon_url($modinfo->cms[$modnumber]->icon);
+                        $icon = $OUTPUT->pix_url($modinfo->cms[$modnumber]->icon);
                     } else {
-                        $icon = $OUTPUT->old_icon_url('icon', $mod->modname);
+                        $icon = $OUTPUT->pix_url('icon', $mod->modname);
                     }
 
                     if ($mod->modname == 'label') {
@@ -151,7 +151,7 @@ class block_social_activities extends block_list {
 
         if ($ismoving) {
             $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
-                                      '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->old_icon_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
+                                      '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->pix_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
             $this->content->icons[] = '';
         }
 
diff --git a/blocks/tags/block_tags.php b/blocks/tags/block_tags.php
index 4d8222e7fbe..2211e142d57 100644
--- a/blocks/tags/block_tags.php
+++ b/blocks/tags/block_tags.php
@@ -234,7 +234,7 @@ class block_tags extends block_base {
                     $arrowtitle = get_string('arrowtitle', $tagslang);
                     $coursetaghelpbutton = $OUTPUT->help_icon(moodle_help_icon::make('addtags', 'adding tags', $tagslang));
                     $sesskey = sesskey();
-                    $arrowright = $OUTPUT->old_icon_url('t/arrow_left');
+                    $arrowright = $OUTPUT->pix_url('t/arrow_left');
                     $this->content->footer .= <<<EOT
                         <hr />
                         <form action="{$CFG->wwwroot}/tag/coursetags_add.php" method="post" id="coursetag"
diff --git a/blog/external_blogs.php b/blog/external_blogs.php
index 796f970a91c..5628a65b2e1 100644
--- a/blog/external_blogs.php
+++ b/blog/external_blogs.php
@@ -72,12 +72,12 @@ if (!empty($blogs)) {
     $table->head = array(get_string('name'), get_string('url'), get_string('timefetched', 'blog'), get_string('valid', 'blog'), get_string('actions'));
 
     foreach ($blogs as $blog) {
-        $validicon = html_image::make($OUTPUT->old_icon_url('i/tick_green_big'));
+        $validicon = html_image::make($OUTPUT->pix_url('i/tick_green_big'));
         $validicon->alt = get_string('feedisvalid', 'blog');
         $validicon->title = get_string('feedisvalid', 'blog');
 
         if ($blog->failedlastsync) {
-            $validicon->src = $OUTPUT->old_icon_url('i/cross_red_big');
+            $validicon->src = $OUTPUT->pix_url('i/cross_red_big');
             $validicon->alt = get_string('feedisinvalid', 'blog');
             $validicon->title = get_string('feedisinvalid', 'blog');
         }
@@ -85,13 +85,13 @@ if (!empty($blogs)) {
         $editicon = new moodle_action_icon;
         $editicon->link->url = new moodle_url($CFG->wwwroot.'/blog/external_blog_edit.php', array('id' => $blog->id));
         $editicon->link->title = get_string('editexternalblog', 'blog');
-        $editicon->image->src = $OUTPUT->old_icon_url('t/edit');
+        $editicon->image->src = $OUTPUT->pix_url('t/edit');
         $editicon->image->alt = get_string('editexternalblog', 'blog');
 
         $deleteicon = new moodle_action_icon;
         $deleteicon->link->url = new moodle_url($CFG->wwwroot.'/blog/external_blogs.php', array('delete' => $blog->id, 'sesskey' => sesskey()));
         $deleteicon->link->title = get_string('deleteexternalblog', 'blog');
-        $deleteicon->image->src = $OUTPUT->old_icon_url('t/delete');
+        $deleteicon->image->src = $OUTPUT->pix_url('t/delete');
         $deleteicon->image->alt = get_string('deleteexternalblog', 'blog');
         $deleteicon->add_confirm_action(get_string('externalblogdeleteconfirm', 'blog'));
         $icons = $OUTPUT->action_icon($editicon) . $OUTPUT->action_icon($deleteicon);
diff --git a/blog/locallib.php b/blog/locallib.php
index d63df1ebcb5..565ea9c0613 100644
--- a/blog/locallib.php
+++ b/blog/locallib.php
@@ -239,7 +239,7 @@ class blog_entry {
                 if ($contextrec->contextlevel ==  CONTEXT_COURSE) {
                     $associcon = new moodle_action_icon();
                     $associcon->link->url = new moodle_url($CFG->wwwroot.'/course/view.php', array('id' => $contextrec->instanceid));
-                    $associcon->image->src = $OUTPUT->old_icon_url('i/course');
+                    $associcon->image->src = $OUTPUT->pix_url('i/course');
                     $associcon->linktext = $DB->get_field('course', 'shortname', array('id' => $contextrec->instanceid));
                     $assocstr .= $OUTPUT->action_icon($associcon);
                     $hascourseassocs = true;
@@ -262,7 +262,7 @@ class blog_entry {
 
                     $associcon = new moodle_action_icon();
                     $associcon->link->url = new moodle_url($CFG->wwwroot.'/mod/'.$modname.'/view.php', array('id' => $modinfo->id));
-                    $associcon->image->src = $OUTPUT->old_icon_url('icon', $modname);
+                    $associcon->image->src = $OUTPUT->pix_url('icon', $modname);
                     $associcon->linktext = $DB->get_field($modname, 'name', array('id' => $modinfo->instance));
                     $assocstr .= $OUTPUT->action_icon($associcon);
                     $assocstr .= ', ';
@@ -499,7 +499,7 @@ class blog_entry {
             $type     = mimeinfo_from_type("type", $mimetype);
 
             $image = new html_image();
-            $image->src = $OUTPUT->old_icon_url("/f/$icon");
+            $image->src = $OUTPUT->pix_url("/f/$icon");
             $image->add_class('icon');
             $image->alt = $filename;
 
diff --git a/blog/rsslib.php b/blog/rsslib.php
index 56078143aca..11cd91ce99b 100755
--- a/blog/rsslib.php
+++ b/blog/rsslib.php
@@ -35,7 +35,7 @@ function blog_rss_print_link($filtertype, $filterselect, $tagid=0, $tooltiptext=
     }
 
     $path .= '/rss.xml';
-    $rsspix = $OUTPUT->old_icon_url('i/rss');
+    $rsspix = $OUTPUT->pix_url('i/rss');
 
     require_once($CFG->libdir.'/filelib.php');
     $path = get_file_url($path, null, 'rssfile');
diff --git a/calendar/lib.php b/calendar/lib.php
index 15c5756c6ba..ce1deadc5aa 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -247,20 +247,20 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
                 }
                 $event = $events[$eventid];
                 if(!empty($event->modulename)) {
-                    $popupicon = $OUTPUT->old_icon_url('icon', $event->modulename) . '';
+                    $popupicon = $OUTPUT->pix_url('icon', $event->modulename) . '';
                     $popupalt  = $event->modulename;
 
                 } else if ($event->courseid == SITEID) {                                // Site event
-                    $popupicon = $OUTPUT->old_icon_url('c/site');
+                    $popupicon = $OUTPUT->pix_url('c/site');
                     $popupalt  = '';
                 } else if ($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) {      // Course event
-                    $popupicon = $OUTPUT->old_icon_url('c/course');
+                    $popupicon = $OUTPUT->pix_url('c/course');
                     $popupalt  = '';
                 } else if ($event->groupid) {                                      // Group event
-                    $popupicon = $OUTPUT->old_icon_url('c/group');
+                    $popupicon = $OUTPUT->pix_url('c/group');
                     $popupalt  = '';
                 } else if ($event->userid) {                                       // User event
-                    $popupicon = $OUTPUT->old_icon_url('c/user');
+                    $popupicon = $OUTPUT->pix_url('c/user');
                     $popupalt  = '';
                 }
                 $popupcontent .= '<div><img class="icon" src="'.$popupicon.'" alt="'.$popupalt.'" /><a href="'.$dayhref.'#event_'.$event->id.'">'.format_string($event->name, true).'</a></div>';
@@ -505,7 +505,7 @@ function calendar_add_event_metadata($event) {
 
         $modulename = get_string('modulename', $event->modulename);
         $eventtype = get_string($event->eventtype, $event->modulename);
-        $icon = $OUTPUT->old_icon_url('icon', $event->modulename) . '';
+        $icon = $OUTPUT->pix_url('icon', $event->modulename) . '';
 
         $event->icon = '<img height="16" width="16" src="'.$icon.'" alt="'.$eventtype.'" title="'.$modulename.'" style="vertical-align: middle;" />';
         $event->referer = '<a href="'.$CFG->wwwroot.'/mod/'.$event->modulename.'/view.php?id='.$module->id.'">'.$event->name.'</a>';
@@ -514,18 +514,18 @@ function calendar_add_event_metadata($event) {
 
 
     } else if($event->courseid == SITEID) {                              // Site event
-        $event->icon = '<img height="16" width="16" src="'.$OUTPUT->old_icon_url('c/site') . '" alt="'.get_string('globalevent', 'calendar').'" style="vertical-align: middle;" />';
+        $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/site') . '" alt="'.get_string('globalevent', 'calendar').'" style="vertical-align: middle;" />';
         $event->cssclass = 'event_global';
     } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) {          // Course event
         calendar_get_course_cached($coursecache, $event->courseid);
-        $event->icon = '<img height="16" width="16" src="'.$OUTPUT->old_icon_url('c/course') . '" alt="'.get_string('courseevent', 'calendar').'" style="vertical-align: middle;" />';
+        $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/course') . '" alt="'.get_string('courseevent', 'calendar').'" style="vertical-align: middle;" />';
         $event->courselink = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$event->courseid.'">'.$coursecache[$event->courseid]->fullname.'</a>';
         $event->cssclass = 'event_course';
     } else if ($event->groupid) {                                    // Group event
-        $event->icon = '<img height="16" width="16" src="'.$OUTPUT->old_icon_url('c/group') . '" alt="'.get_string('groupevent', 'calendar').'" style="vertical-align: middle;" />';
+        $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/group') . '" alt="'.get_string('groupevent', 'calendar').'" style="vertical-align: middle;" />';
         $event->cssclass = 'event_group';
     } else if($event->userid) {                                      // User event
-        $event->icon = '<img height="16" width="16" src="'.$OUTPUT->old_icon_url('c/user') . '" alt="'.get_string('userevent', 'calendar').'" style="vertical-align: middle;" />';
+        $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/user') . '" alt="'.get_string('userevent', 'calendar').'" style="vertical-align: middle;" />';
         $event->cssclass = 'event_user';
     }
     return $event;
@@ -590,11 +590,11 @@ function calendar_print_event($event, $showactions=true) {
             $deletelink = ''; // deleting activities directly from calendar is dangerous/confusing - see MDL-11843
         }
         echo ' <a href="'.$editlink.'"><img
-                  src="'.$OUTPUT->old_icon_url('t/edit') . '" alt="'.get_string('tt_editevent', 'calendar').'"
+                  src="'.$OUTPUT->pix_url('t/edit') . '" alt="'.get_string('tt_editevent', 'calendar').'"
                   title="'.get_string('tt_editevent', 'calendar').'" /></a>';
         if ($deletelink) {
             echo ' <a href="'.$deletelink.'"><img
-                      src="'.$OUTPUT->old_icon_url('t/delete') . '" alt="'.get_string('tt_deleteevent', 'calendar').'"
+                      src="'.$OUTPUT->pix_url('t/delete') . '" alt="'.get_string('tt_deleteevent', 'calendar').'"
                       title="'.get_string('tt_deleteevent', 'calendar').'" /></a>';
         }
         echo '</div>';
@@ -848,17 +848,17 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
 
     $content .= '<tr>';
     if($SESSION->cal_show_global) {
-        $content .= '<td class="eventskey event_global" style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
+        $content .= '<td class="eventskey event_global" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
         $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showglobal'.$getvars.'" title="'.get_string('tt_hideglobal', 'calendar').'">'.get_string('global', 'calendar').'</a></td>'."\n";
     } else {
-        $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
+        $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
         $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showglobal'.$getvars.'" title="'.get_string('tt_showglobal', 'calendar').'">'.get_string('global', 'calendar').'</a></td>'."\n";
     }
     if($SESSION->cal_show_course) {
-        $content .= '<td class="eventskey event_course" style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidecourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
+        $content .= '<td class="eventskey event_course" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidecourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
         $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showcourses'.$getvars.'" title="'.get_string('tt_hidecourse', 'calendar').'">'.get_string('course', 'calendar').'</a></td>'."\n";
     } else {
-        $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_showcourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
+        $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_showcourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
         $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showcourses'.$getvars.'" title="'.get_string('tt_showcourse', 'calendar').'">'.get_string('course', 'calendar').'</a></td>'."\n";
 
     }
@@ -870,10 +870,10 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
         if($groupevents) {
             // This course MIGHT have group events defined, so show the filter
             if($SESSION->cal_show_groups) {
-                $content .= '<td class="eventskey event_group" style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidegroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
+                $content .= '<td class="eventskey event_group" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidegroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
                 $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showgroups'.$getvars.'" title="'.get_string('tt_hidegroups', 'calendar').'">'.get_string('group', 'calendar').'</a></td>'."\n";
             } else {
-                $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showgroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
+                $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showgroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
                 $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showgroups'.$getvars.'" title="'.get_string('tt_showgroups', 'calendar').'">'.get_string('group', 'calendar').'</a></td>'."\n";
             }
         } else {
@@ -881,10 +881,10 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
             $content .= '<td style="width: 11px;"></td><td>&nbsp;</td>'."\n";
         }
         if($SESSION->cal_show_user) {
-            $content .= '<td class="eventskey event_user" style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
+            $content .= '<td class="eventskey event_user" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
             $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showuser'.$getvars.'" title="'.get_string('tt_hideuser', 'calendar').'">'.get_string('user', 'calendar').'</a></td>'."\n";
         } else {
-            $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
+            $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
             $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showuser'.$getvars.'" title="'.get_string('tt_showuser', 'calendar').'">'.get_string('user', 'calendar').'</a></td>'."\n";
         }
     }
diff --git a/calendar/view.php b/calendar/view.php
index 18ed3b547ec..2cfbb9d1018 100644
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -191,7 +191,7 @@ if (!empty($CFG->enablecalendarexport)) {
         $usernameencoded = urlencode($USER->username);
 
         echo "<a href=\"export_execute.php?preset_what=all&amp;preset_time=recentupcoming&amp;username=$usernameencoded&amp;authtoken=$authtoken\">"
-             .'<img src="'.$OUTPUT->old_icon_url('i/ical') . '" height="14" width="36" '
+             .'<img src="'.$OUTPUT->pix_url('i/ical') . '" height="14" width="36" '
              .'alt="'.get_string('ical', 'calendar').'" '
              .'title="'.get_string('quickdownloadcalendar', 'calendar').'" />'
              .'</a>';
diff --git a/course/category.php b/course/category.php
index 50034cdcb43..34c98a4d2a5 100644
--- a/course/category.php
+++ b/course/category.php
@@ -324,7 +324,7 @@
                 echo '<td>';
                 if (has_capability('moodle/course:update', $coursecontext)) {
                     echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.$acourse->id.'">'.
-                            '<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.$stredit.'" /></a> ';
+                            '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.$stredit.'" /></a> ';
                 } else {
                     echo $spacer;
                 }
@@ -332,14 +332,14 @@
                 // role assignment link
                 if (has_capability('moodle/role:assign', $coursecontext)) {
                     echo '<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$coursecontext->id.'">'.
-                            '<img src="'.$OUTPUT->old_icon_url('i/roles') . '" class="iconsmall" alt="'.get_string('assignroles', 'role').'" /></a> ';
+                            '<img src="'.$OUTPUT->pix_url('i/roles') . '" class="iconsmall" alt="'.get_string('assignroles', 'role').'" /></a> ';
                 } else {
                     echo $spacer;
                 }
 
                 if (can_delete_course($acourse->id)) {
                     echo '<a title="'.$strdelete.'" href="delete.php?id='.$acourse->id.'">'.
-                            '<img src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.$strdelete.'" /></a> ';
+                            '<img src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.$strdelete.'" /></a> ';
                 } else {
                     echo $spacer;
                 }
@@ -349,11 +349,11 @@
                     if (!empty($acourse->visible)) {
                         echo '<a title="'.$strhide.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                             '&amp;perpage='.$perpage.'&amp;hide='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
-                            '<img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a> ';
+                            '<img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a> ';
                     } else {
                         echo '<a title="'.$strshow.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                             '&amp;perpage='.$perpage.'&amp;show='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
-                            '<img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a> ';
+                            '<img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a> ';
                     }
                 } else {
                     echo $spacer;
@@ -361,7 +361,7 @@
 
                 if (has_capability('moodle/site:backup', $coursecontext)) {
                     echo '<a title="'.$strbackup.'" href="../backup/backup.php?id='.$acourse->id.'">'.
-                            '<img src="'.$OUTPUT->old_icon_url('t/backup') . '" class="iconsmall" alt="'.$strbackup.'" /></a> ';
+                            '<img src="'.$OUTPUT->pix_url('t/backup') . '" class="iconsmall" alt="'.$strbackup.'" /></a> ';
                 } else {
                     echo $spacer;
                 }
@@ -369,7 +369,7 @@
                 if (has_capability('moodle/site:restore', $coursecontext)) {
                     echo '<a title="'.$strrestore.'" href="../files/index.php?id='.$acourse->id.
                          '&amp;wdir=/backupdata">'.
-                         '<img src="'.$OUTPUT->old_icon_url('t/restore') . '" class="iconsmall" alt="'.$strrestore.'" /></a> ';
+                         '<img src="'.$OUTPUT->pix_url('t/restore') . '" class="iconsmall" alt="'.$strrestore.'" /></a> ';
                 } else {
                     echo $spacer;
                 }
@@ -378,7 +378,7 @@
                     if ($up) {
                         echo '<a title="'.$strmoveup.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                              '&amp;perpage='.$perpage.'&amp;moveup='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
-                             '<img src="'.$OUTPUT->old_icon_url('t/up') . '" class="iconsmall" alt="'.$strmoveup.'" /></a> ';
+                             '<img src="'.$OUTPUT->pix_url('t/up') . '" class="iconsmall" alt="'.$strmoveup.'" /></a> ';
                     } else {
                         echo $spacer;
                     }
@@ -386,7 +386,7 @@
                     if ($down) {
                         echo '<a title="'.$strmovedown.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                              '&amp;perpage='.$perpage.'&amp;movedown='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
-                             '<img src="'.$OUTPUT->old_icon_url('t/down') . '" class="iconsmall" alt="'.$strmovedown.'" /></a> ';
+                             '<img src="'.$OUTPUT->pix_url('t/down') . '" class="iconsmall" alt="'.$strmovedown.'" /></a> ';
                     } else {
                         echo $spacer;
                     }
@@ -404,15 +404,15 @@
                 if (!empty($acourse->guest)) {
                     echo '<a href="view.php?id='.$acourse->id.'"><img title="'.
                          $strallowguests.'" class="icon" src="'.
-                         $OUTPUT->old_icon_url('i/guest') . '" alt="'.$strallowguests.'" /></a>';
+                         $OUTPUT->pix_url('i/guest') . '" alt="'.$strallowguests.'" /></a>';
                 }
                 if (!empty($acourse->password)) {
                     echo '<a href="view.php?id='.$acourse->id.'"><img title="'.
                          $strrequireskey.'" class="icon" src="'.
-                         $OUTPUT->old_icon_url('i/key') . '" alt="'.$strrequireskey.'" /></a>';
+                         $OUTPUT->pix_url('i/key') . '" alt="'.$strrequireskey.'" /></a>';
                 }
                 if (!empty($acourse->summary)) {
-                    $link = html_link::make("/course/info.php?id=$acourse->id", '<img alt="'.get_string('info').'" class="icon" src="'.$OUTPUT->old_icon_url('i/info') . '" />');
+                    $link = html_link::make("/course/info.php?id=$acourse->id", '<img alt="'.get_string('info').'" class="icon" src="'.$OUTPUT->pix_url('i/info') . '" />');
                     $link->add_action(new popup_action('click', $link->url, 'courseinfo'));
                     $link->title = $strsummary;
                     echo $OUTPUT->link($link);
diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 9a1e56a4899..90e1ec7c836 100644
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -109,7 +109,7 @@ if ($thissection->summary or $thissection->sequence or $PAGE->user_is_editing())
 
     if ($PAGE->user_is_editing() && has_capability('moodle/course:update', $coursecontext)) {
         echo '<a title="'.$streditsummary.'" '.
-             ' href="editsection.php?id='.$thissection->id.'"><img src="'.$OUTPUT->old_icon_url('t/edit') . '" '.
+             ' href="editsection.php?id='.$thissection->id.'"><img src="'.$OUTPUT->pix_url('t/edit') . '" '.
              ' class="icon edit" alt="'.$streditsummary.'" /></a>';
     }
     echo '</div>';
@@ -184,36 +184,36 @@ while ($section <= $course->numsections) {
 
         if ($displaysection == $section) {	// Show the zoom boxes
             echo '<a href="view.php?id='.$course->id.'&amp;topic=0#section-'.$section.'" title="'.$strshowalltopics.'">'.
-                 '<img src="'.$OUTPUT->old_icon_url('i/all') . '" class="icon" alt="'.$strshowalltopics.'" /></a><br />';
+                 '<img src="'.$OUTPUT->pix_url('i/all') . '" class="icon" alt="'.$strshowalltopics.'" /></a><br />';
         } else {
             $strshowonlytopic = get_string("showonlytopic", "", $section);
             echo '<a href="view.php?id='.$course->id.'&amp;topic='.$section.'" title="'.$strshowonlytopic.'">'.
-                 '<img src="'.$OUTPUT->old_icon_url('i/one') . '" class="icon" alt="'.$strshowonlytopic.'" /></a><br />';
+                 '<img src="'.$OUTPUT->pix_url('i/one') . '" class="icon" alt="'.$strshowonlytopic.'" /></a><br />';
         }
 
         if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
 
             if ($course->marker == $section) {  // Show the "light globe" on/off
-                echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.'<img src="'.$OUTPUT->old_icon_url('i/marked') . '" alt="'.$strmarkedthistopic.'" /></a><br />';
+                echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.'<img src="'.$OUTPUT->pix_url('i/marked') . '" alt="'.$strmarkedthistopic.'" /></a><br />';
             } else {
-                echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkthistopic.'">'.'<img src="'.$OUTPUT->old_icon_url('i/marker') . '" alt="'.$strmarkthistopic.'" /></a><br />';
+                echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkthistopic.'">'.'<img src="'.$OUTPUT->pix_url('i/marker') . '" alt="'.$strmarkthistopic.'" /></a><br />';
             }
 
             if ($thissection->visible) {        // Show the hide/show eye
                 echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strtopichide.'">'.
-                     '<img src="'.$OUTPUT->old_icon_url('i/hide') . '" class="icon hide" alt="'.$strtopichide.'" /></a><br />';
+                     '<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon hide" alt="'.$strtopichide.'" /></a><br />';
             } else {
                 echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strtopicshow.'">'.
-                     '<img src="'.$OUTPUT->old_icon_url('i/show') . '" class="icon hide" alt="'.$strtopicshow.'" /></a><br />';
+                     '<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon hide" alt="'.$strtopicshow.'" /></a><br />';
             }
             if ($section > 1) {                       // Add a arrow to move section up
                 echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.sesskey().'#section-'.($section-1).'" title="'.$strmoveup.'">'.
-                     '<img src="'.$OUTPUT->old_icon_url('t/up') . '" class="icon up" alt="'.$strmoveup.'" /></a><br />';
+                     '<img src="'.$OUTPUT->pix_url('t/up') . '" class="icon up" alt="'.$strmoveup.'" /></a><br />';
             }
 
             if ($section < $course->numsections) {    // Add a arrow to move section down
                 echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.sesskey().'#section-'.($section+1).'" title="'.$strmovedown.'">'.
-                     '<img src="'.$OUTPUT->old_icon_url('t/down') . '" class="icon down" alt="'.$strmovedown.'" /></a><br />';
+                     '<img src="'.$OUTPUT->pix_url('t/down') . '" class="icon down" alt="'.$strmovedown.'" /></a><br />';
             }
         }
         echo '</div>';
@@ -232,7 +232,7 @@ while ($section <= $course->numsections) {
 
             if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
                 echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
-                     '<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
+                     '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
             }
             echo '</div>';
 
diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 7830bcfa8fb..069fe9a2bb3 100644
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -99,7 +99,7 @@
 
         if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
             echo '<p><a title="'.$streditsummary.'" '.
-                 ' href="editsection.php?id='.$thissection->id.'"><img src="'.$OUTPUT->old_icon_url('t/edit') . '" '.
+                 ' href="editsection.php?id='.$thissection->id.'"><img src="'.$OUTPUT->pix_url('t/edit') . '" '.
                  ' class="icon edit" alt="'.$streditsummary.'" /></a></p>';
         }
         echo '</div>';
@@ -180,29 +180,29 @@
 
             if ($displaysection == $section) {
                 echo '<a href="view.php?id='.$course->id.'&amp;week=0#section-'.$section.'" title="'.$strshowallweeks.'">'.
-                     '<img src="'.$OUTPUT->old_icon_url('i/all') . '" class="icon wkall" alt="'.$strshowallweeks.'" /></a><br />';
+                     '<img src="'.$OUTPUT->pix_url('i/all') . '" class="icon wkall" alt="'.$strshowallweeks.'" /></a><br />';
             } else {
                 $strshowonlyweek = get_string("showonlyweek", "", $section);
                 echo '<a href="view.php?id='.$course->id.'&amp;week='.$section.'" title="'.$strshowonlyweek.'">'.
-                     '<img src="'.$OUTPUT->old_icon_url('i/one') . '" class="icon wkone" alt="'.$strshowonlyweek.'" /></a><br />';
+                     '<img src="'.$OUTPUT->pix_url('i/one') . '" class="icon wkone" alt="'.$strshowonlyweek.'" /></a><br />';
             }
 
             if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
                 if ($thissection->visible) {        // Show the hide/show eye
                     echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strweekhide.'">'.
-                         '<img src="'.$OUTPUT->old_icon_url('i/hide') . '" class="icon hide" alt="'.$strweekhide.'" /></a><br />';
+                         '<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon hide" alt="'.$strweekhide.'" /></a><br />';
                 } else {
                     echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strweekshow.'">'.
-                         '<img src="'.$OUTPUT->old_icon_url('i/show') . '" class="icon hide" alt="'.$strweekshow.'" /></a><br />';
+                         '<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon hide" alt="'.$strweekshow.'" /></a><br />';
                 }
                 if ($section > 1) {                       // Add a arrow to move section up
                     echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.sesskey().'#section-'.($section-1).'" title="'.$strmoveup.'">'.
-                         '<img src="'.$OUTPUT->old_icon_url('t/up') . '" class="icon up" alt="'.$strmoveup.'" /></a><br />';
+                         '<img src="'.$OUTPUT->pix_url('t/up') . '" class="icon up" alt="'.$strmoveup.'" /></a><br />';
                 }
 
                 if ($section < $course->numsections) {    // Add a arrow to move section down
                     echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.sesskey().'#section-'.($section+1).'" title="'.$strmovedown.'">'.
-                         '<img src="'.$OUTPUT->old_icon_url('t/down') . '" class="icon down" alt="'.$strmovedown.'" /></a><br />';
+                         '<img src="'.$OUTPUT->pix_url('t/down') . '" class="icon down" alt="'.$strmovedown.'" /></a><br />';
                 }
             }
             echo '</div>';
@@ -222,7 +222,7 @@
 
                 if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
                     echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
-                         '<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
+                         '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
                 }
                 echo '</div>';
 
diff --git a/course/index.php b/course/index.php
index ff82fd51900..895feba4578 100644
--- a/course/index.php
+++ b/course/index.php
@@ -327,28 +327,28 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $
 
         if (has_capability('moodle/category:manage', $category->context)) {
             echo '<a title="'.$str->edit.'" href="editcategory.php?id='.$category->id.'"><img'.
-                 ' src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.$str->edit.'" /></a> ';
+                 ' src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.$str->edit.'" /></a> ';
 
             echo '<a title="'.$str->delete.'" href="index.php?delete='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
-                 ' src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.$str->delete.'" /></a> ';
+                 ' src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.$str->delete.'" /></a> ';
 
             if (!empty($category->visible)) {
                 echo '<a title="'.$str->hide.'" href="index.php?hide='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
-                     ' src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.$str->hide.'" /></a> ';
+                     ' src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$str->hide.'" /></a> ';
             } else {
                 echo '<a title="'.$str->show.'" href="index.php?show='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
-                     ' src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.$str->show.'" /></a> ';
+                     ' src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$str->show.'" /></a> ';
             }
 
             if ($up) {
                 echo '<a title="'.$str->moveup.'" href="index.php?moveup='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
-                     ' src="'.$OUTPUT->old_icon_url('t/up') . '" class="iconsmall" alt="'.$str->moveup.'" /></a> ';
+                     ' src="'.$OUTPUT->pix_url('t/up') . '" class="iconsmall" alt="'.$str->moveup.'" /></a> ';
             } else {
                 echo $str->spacer;
             }
             if ($down) {
                 echo '<a title="'.$str->movedown.'" href="index.php?movedown='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
-                     ' src="'.$OUTPUT->old_icon_url('t/down') . '" class="iconsmall" alt="'.$str->movedown.'" /></a> ';
+                     ' src="'.$OUTPUT->pix_url('t/down') . '" class="iconsmall" alt="'.$str->movedown.'" /></a> ';
             } else {
                 echo $str->spacer;
             }
diff --git a/course/info.php b/course/info.php
index ded88b3e18d..e30301d59ae 100644
--- a/course/info.php
+++ b/course/info.php
@@ -47,11 +47,11 @@
         echo $OUTPUT->box_start('generalbox icons');
         if ($course->guest) {
             $strallowguests = get_string('allowguests');
-            echo "<div><img alt=\"\" class=\"icon guest\" src=\"" . $OUTPUT->old_icon_url('i/guest') . "\" />&nbsp;$strallowguests</div>";
+            echo "<div><img alt=\"\" class=\"icon guest\" src=\"" . $OUTPUT->pix_url('i/guest') . "\" />&nbsp;$strallowguests</div>";
         }
         if ($course->password) {
             $strrequireskey = get_string('requireskey');
-            echo "<div><img alt=\"\" class=\"icon key\" src=\"" . $OUTPUT->old_icon_url('i/key') . "\" />&nbsp;$strrequireskey</div>";
+            echo "<div><img alt=\"\" class=\"icon key\" src=\"" . $OUTPUT->pix_url('i/key') . "\" />&nbsp;$strrequireskey</div>";
         }
         echo $OUTPUT->box_end();
     }
diff --git a/course/lib.php b/course/lib.php
index cd0a31411ec..80fbbaa27cc 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1343,7 +1343,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
             if ($ismoving) {
                 echo '<a title="'.$strmovefull.'"'.
                      ' href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
-                     '<img class="movetarget" src="'.$OUTPUT->old_icon_url('movehere') . '" '.
+                     '<img class="movetarget" src="'.$OUTPUT->pix_url('movehere') . '" '.
                      ' alt="'.$strmovehere.'" /></a><br />
                      ';
             }
@@ -1383,12 +1383,12 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                 if (!empty($customicon)) {
                     if (substr($customicon, 0, 4) === 'mod/') {
                         list($modname, $iconname) = explode('/', substr($customicon, 4), 2);
-                        $icon = $OUTPUT->old_icon_url(str_replace(array('.gif', '.png'), '', $customicon), $modname);
+                        $icon = $OUTPUT->pix_url(str_replace(array('.gif', '.png'), '', $customicon), $modname);
                     } else {
-                        $icon = $OUTPUT->old_icon_url(str_replace(array('.gif', '.png'), '', $customicon));
+                        $icon = $OUTPUT->pix_url(str_replace(array('.gif', '.png'), '', $customicon));
                     }
                 } else {
-                    $icon = $OUTPUT->old_icon_url('icon', $mod->modname);
+                    $icon = $OUTPUT->pix_url('icon', $mod->modname);
                 }
 
                 //Accessibility: for files get description via icon, this is very ugly hack!
@@ -1506,7 +1506,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                     }
                 }
                 if ($completionicon) {
-                    $imgsrc = $OUTPUT->old_icon_url('i/completion-'.$completionicon);
+                    $imgsrc = $OUTPUT->pix_url('i/completion-'.$completionicon);
                     $imgalt = get_string('completion-alt-'.$completionicon,'completion');
                     if ($completion==COMPLETION_TRACKING_MANUAL && !$isediting) {
                         $imgtitle = get_string('completion-title-'.$completionicon,'completion');
@@ -1570,7 +1570,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
     if ($ismoving) {
         echo '<li><a title="'.$strmovefull.'"'.
              ' href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
-             '<img class="movetarget" src="'.$OUTPUT->old_icon_url('movehere') . '" '.
+             '<img class="movetarget" src="'.$OUTPUT->pix_url('movehere') . '" '.
              ' alt="'.$strmovehere.'" /></a></li>
              ';
     }
@@ -1952,7 +1952,7 @@ function print_category_info($category, $depth, $showcourses = false) {
     }
 
     if ($showcourses and $coursecount) {
-        $catimage = '<img src="'.$OUTPUT->old_icon_url('i/course') . '" alt="" />';
+        $catimage = '<img src="'.$OUTPUT->pix_url('i/course') . '" alt="" />';
     } else {
         $catimage = "&nbsp;";
     }
@@ -1996,23 +1996,23 @@ function print_category_info($category, $depth, $showcourses = false) {
                 echo '</td><td align="right" valign="top" class="course info">';
                 if ($course->guest ) {
                     echo '<a title="'.$strallowguests.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
-                    echo '<img alt="'.$strallowguests.'" src="'.$OUTPUT->old_icon_url('i/guest') . '" /></a>';
+                    echo '<img alt="'.$strallowguests.'" src="'.$OUTPUT->pix_url('i/guest') . '" /></a>';
                 } else {
-                    echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->old_icon_url('spacer') . '" />';
+                    echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->pix_url('spacer') . '" />';
                 }
                 if ($course->password) {
                     echo '<a title="'.$strrequireskey.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
-                    echo '<img alt="'.$strrequireskey.'" src="'.$OUTPUT->old_icon_url('i/key') . '" /></a>';
+                    echo '<img alt="'.$strrequireskey.'" src="'.$OUTPUT->pix_url('i/key') . '" /></a>';
                 } else {
-                    echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->old_icon_url('spacer') . '" />';
+                    echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->pix_url('spacer') . '" />';
                 }
                 if ($course->summary) {
-                    $link = html_link::make('/course/info.php?id='.$course->id, '<img alt="'.$strsummary.'" src="'.$OUTPUT->old_icon_url('i/info') . '" />');
+                    $link = html_link::make('/course/info.php?id='.$course->id, '<img alt="'.$strsummary.'" src="'.$OUTPUT->pix_url('i/info') . '" />');
                     $link->add_action(new popup_action('click', $link->url, 'courseinfo', array('height' => 400, 'width' => 500)));
                     $link->title = $strsummary;
                     echo $OUTPUT->link($link);
                 } else {
-                    echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->old_icon_url('spacer') . '" />';
+                    echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->pix_url('spacer') . '" />';
                 }
                 echo '</td></tr>';
             }
@@ -2215,7 +2215,7 @@ function print_course($course, $highlightterms = '') {
                     if ($ra->hidden == 0 || $canseehidden) {
                         $fullname = fullname($ra->user, $canviewfullnames);
                         if ($ra->hidden == 1) {
-                            $status = " <img src=\"" . $OUTPUT->old_icon_url('t/show') . "\" title=\"".get_string('userhashiddenassignments', 'role')."\" alt=\"".get_string('hiddenassign')."\" class=\"hide-show-image\"/>";
+                            $status = " <img src=\"" . $OUTPUT->pix_url('t/show') . "\" title=\"".get_string('userhashiddenassignments', 'role')."\" alt=\"".get_string('hiddenassign')."\" class=\"hide-show-image\"/>";
                         } else {
                             $status = '';
                         }
@@ -2423,7 +2423,7 @@ function print_remote_host($host, $width="100%") {
     echo '<div class="coursebox clearfix">';
     echo '<div class="info">';
     echo '<div class="name">';
-    echo '<img src="'.$OUTPUT->old_icon_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />';
+    echo '<img src="'.$OUTPUT->pix_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />';
     echo '<a title="'.s($host['name']).'" href="'.s($host['url']).'">'
         . s($host['name']).'</a> - ';
     echo $host['count'] . ' ' . get_string('courses');
@@ -2859,12 +2859,12 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
         if ($mod->visible) {
             $hideshow = '<a class="editing_hide" title="'.$str->hide.'" href="'.$path.'/mod.php?hide='.$mod->id.
                         '&amp;sesskey='.$sesskey.$section.'"><img'.
-                        ' src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" '.
+                        ' src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" '.
                         ' alt="'.$str->hide.'" /></a>'."\n";
         } else {
             $hideshow = '<a class="editing_show" title="'.$str->show.'" href="'.$path.'/mod.php?show='.$mod->id.
                         '&amp;sesskey='.$sesskey.$section.'"><img'.
-                        ' src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" '.
+                        ' src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" '.
                         ' alt="'.$str->show.'" /></a>'."\n";
         }
     } else {
@@ -2875,17 +2875,17 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
         if ($mod->groupmode == SEPARATEGROUPS) {
             $grouptitle = $str->groupsseparate;
             $groupclass = 'editing_groupsseparate';
-            $groupimage = $OUTPUT->old_icon_url('t/groups') . '';
+            $groupimage = $OUTPUT->pix_url('t/groups') . '';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=0&amp;sesskey='.$sesskey;
         } else if ($mod->groupmode == VISIBLEGROUPS) {
             $grouptitle = $str->groupsvisible;
             $groupclass = 'editing_groupsvisible';
-            $groupimage = $OUTPUT->old_icon_url('t/groupv') . '';
+            $groupimage = $OUTPUT->pix_url('t/groupv') . '';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=1&amp;sesskey='.$sesskey;
         } else {
             $grouptitle = $str->groupsnone;
             $groupclass = 'editing_groupsnone';
-            $groupimage = $OUTPUT->old_icon_url('t/groupn') . '';
+            $groupimage = $OUTPUT->pix_url('t/groupn') . '';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=2&amp;sesskey='.$sesskey;
         }
         if ($mod->groupmodelink) {
@@ -2905,16 +2905,16 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
         if ($moveselect) {
             $move =     '<a class="editing_move" title="'.$str->move.'" href="'.$path.'/mod.php?copy='.$mod->id.
                         '&amp;sesskey='.$sesskey.$section.'"><img'.
-                        ' src="'.$OUTPUT->old_icon_url('t/move') . '" class="iconsmall" '.
+                        ' src="'.$OUTPUT->pix_url('t/move') . '" class="iconsmall" '.
                         ' alt="'.$str->move.'" /></a>'."\n";
         } else {
             $move =     '<a class="editing_moveup" title="'.$str->moveup.'" href="'.$path.'/mod.php?id='.$mod->id.
                         '&amp;move=-1&amp;sesskey='.$sesskey.$section.'"><img'.
-                        ' src="'.$OUTPUT->old_icon_url('t/up') . '" class="iconsmall" '.
+                        ' src="'.$OUTPUT->pix_url('t/up') . '" class="iconsmall" '.
                         ' alt="'.$str->moveup.'" /></a>'."\n".
                         '<a class="editing_movedown" title="'.$str->movedown.'" href="'.$path.'/mod.php?id='.$mod->id.
                         '&amp;move=1&amp;sesskey='.$sesskey.$section.'"><img'.
-                        ' src="'.$OUTPUT->old_icon_url('t/down') . '" class="iconsmall" '.
+                        ' src="'.$OUTPUT->pix_url('t/down') . '" class="iconsmall" '.
                         ' alt="'.$str->movedown.'" /></a>'."\n";
         }
     } else {
@@ -2935,20 +2935,20 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
         if ($indent > 0) {
             $leftright .= '<a class="editing_moveleft" title="'.$str->moveleft.'" href="'.$path.'/mod.php?id='.$mod->id.
                         '&amp;indent=-1&amp;sesskey='.$sesskey.$section.'"><img'.
-                        ' src="'.$OUTPUT->old_icon_url($leftarrow).'" class="iconsmall" '.
+                        ' src="'.$OUTPUT->pix_url($leftarrow).'" class="iconsmall" '.
                         ' alt="'.$str->moveleft.'" /></a>'."\n";
         }
         if ($indent >= 0) {
             $leftright .= '<a class="editing_moveright" title="'.$str->moveright.'" href="'.$path.'/mod.php?id='.$mod->id.
                         '&amp;indent=1&amp;sesskey='.$sesskey.$section.'"><img'.
-                        ' src="'.$OUTPUT->old_icon_url($rightarrow).'" class="iconsmall" '.
+                        ' src="'.$OUTPUT->pix_url($rightarrow).'" class="iconsmall" '.
                         ' alt="'.$str->moveright.'" /></a>'."\n";
         }
     }
     if (has_capability('moodle/course:managegroups', $modcontext)){
         $context = get_context_instance(CONTEXT_MODULE, $mod->id);
         $assign = '<a class="editing_assign" title="'.$str->assign.'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
-            $context->id.'"><img src="'.$OUTPUT->old_icon_url('i/roles') . '" alt="'.$str->assign.'" class="iconsmall"/></a>';
+            $context->id.'"><img src="'.$OUTPUT->pix_url('i/roles') . '" alt="'.$str->assign.'" class="iconsmall"/></a>';
     } else {
         $assign = '';
     }
@@ -2956,11 +2956,11 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     return '<span class="commands">'."\n".$leftright.$move.
            '<a class="editing_update" title="'.$str->update.'" href="'.$path.'/mod.php?update='.$mod->id.
            '&amp;sesskey='.$sesskey.$section.'"><img'.
-           ' src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" '.
+           ' src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" '.
            ' alt="'.$str->update.'" /></a>'."\n".
            '<a class="editing_delete" title="'.$str->delete.'" href="'.$path.'/mod.php?delete='.$mod->id.
            '&amp;sesskey='.$sesskey.$section.'"><img'.
-           ' src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" '.
+           ' src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" '.
            ' alt="'.$str->delete.'" /></a>'."\n".$hideshow.$groupmode."\n".$assign.'</span>';
 }
 
diff --git a/course/modedit.php b/course/modedit.php
index d73366cdb3f..aaf2c1d0540 100644
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -620,7 +620,7 @@
         $helpicon->page = 'mods';
         $helpicon->text = $pageheading;
         $helpicon->module = $module->name;
-        echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->old_icon_url('icon', $module->name));
+        echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->pix_url('icon', $module->name));
 
         $mform->display();
 
diff --git a/course/pending.php b/course/pending.php
index 3fc067ad9c1..717239c2064 100644
--- a/course/pending.php
+++ b/course/pending.php
@@ -107,7 +107,7 @@ if (empty($pending)) {
 
     // Loop over requested courses.
     $keyicon = new html_image();
-    $keyicon->src = $OUTPUT->old_icon_url('i/key');
+    $keyicon->src = $OUTPUT->pix_url('i/key');
     $keyicon->alt = $strrequireskey;
     $keyicon->add_class('icon');
     $keyicon = $OUTPUT->image($keyicon);
diff --git a/course/recent.php b/course/recent.php
index f363199284e..31e8cbcbb0f 100644
--- a/course/recent.php
+++ b/course/recent.php
@@ -246,7 +246,7 @@ if (!empty($activities)) {
                 $name        = format_string($cm->name);
                 $modfullname = $modnames[$cm->modname];
 
-                $image = "<img src=\"" . $OUTPUT->old_icon_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />";
+                $image = "<img src=\"" . $OUTPUT->pix_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />";
                 echo "<h4>$image $modfullname".
                      " <a href=\"$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id\" $linkformat>$name</a></h4>";
            }
diff --git a/course/report/log/lib.php b/course/report/log/lib.php
index c43016811ee..58b6ea56ff8 100644
--- a/course/report/log/lib.php
+++ b/course/report/log/lib.php
@@ -560,12 +560,12 @@ function log_report_extend_navigation($navigation, $course, $context) {
     global $CFG, $OUTPUT;
     if (has_capability('coursereport/log:view', $context)) {
         $url = new moodle_url($CFG->wwwroot.'/course/report/log/index.php', array('id'=>$course->id));
-        $navigation->add(get_string('log:view', 'coursereport_log'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report'));
+        $navigation->add(get_string('log:view', 'coursereport_log'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
     }
     if (has_capability('coursereport/log:viewlive', $context)) {
         $livelogs = get_string('livelogs');
         $link = html_link::make('/course/report/log/live.php?id='. $course->id, $livelogs);
         $link->add_action(new popup_action('click', $link->url, 'livelog', array('height' => 500, 'width' => 800)));
-        $navigation->add($livelogs, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report'));
+        $navigation->add($livelogs, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
     }
 }
\ No newline at end of file
diff --git a/course/report/outline/index.php b/course/report/outline/index.php
index 985b25f0945..1ffacc945a1 100644
--- a/course/report/outline/index.php
+++ b/course/report/outline/index.php
@@ -107,7 +107,7 @@
             $activitycell = new html_table_cell();
             $activitycell->add_class('activity');
 
-            $activityicon = html_image::make($OUTPUT->old_icon_url('icon', $cm->modname));
+            $activityicon = html_image::make($OUTPUT->pix_url('icon', $cm->modname));
             $activityicon->add_class('icon');
             $activityicon->alt = $modulename;
 
diff --git a/course/report/outline/lib.php b/course/report/outline/lib.php
index 2c6e6c316b0..7c933c21d19 100644
--- a/course/report/outline/lib.php
+++ b/course/report/outline/lib.php
@@ -35,6 +35,6 @@ function outline_report_extend_navigation($navigation, $course, $context) {
     global $CFG, $OUTPUT;
     if (has_capability('coursereport/outline:view', $context)) {
         $url = new moodle_url($CFG->wwwroot.'/course/report/outline/index.php', array('id'=>$course->id));
-        $navigation->add(get_string( 'activityreport' ), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report'));
+        $navigation->add(get_string( 'activityreport' ), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
     }
 }
\ No newline at end of file
diff --git a/course/report/participation/lib.php b/course/report/participation/lib.php
index dd002513431..22464ab0322 100644
--- a/course/report/participation/lib.php
+++ b/course/report/participation/lib.php
@@ -35,6 +35,6 @@ function participation_report_extend_navigation($navigation, $course, $context)
     global $CFG, $OUTPUT;
     if (has_capability('coursereport/participation:view', $context)) {
         $url = new moodle_url($CFG->wwwroot.'/course/report/participation/index.php', array('id'=>$course->id));
-        $navigation->add(get_string('participationreport'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report'));
+        $navigation->add(get_string('participationreport'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
     }
 }
\ No newline at end of file
diff --git a/course/report/progress/index.php b/course/report/progress/index.php
index 8318a60f0eb..b2c5ff3724c 100644
--- a/course/report/progress/index.php
+++ b/course/report/progress/index.php
@@ -198,7 +198,7 @@ foreach($activities as $activity) {
         print '<th scope="col" class="'.$activity->datepassedclass.'">'.
             '<a href="'.$CFG->wwwroot.'/mod/'.$activity->modname.
             '/view.php?id='.$activity->id.'">'.
-            '<img src="'.$OUTPUT->old_icon_url('icon', $activity->modname).'/icon.gif" alt="'.
+            '<img src="'.$OUTPUT->pix_url('icon', $activity->modname).'/icon.gif" alt="'.
             get_string('modulename',$activity->modname).'" /> <span class="completion-activityname">'.
             format_string($activity->name).'</span></a>';
         if($activity->completionexpected) {
@@ -267,7 +267,7 @@ foreach($progress->users as $user) {
             print $sep.csv_quote($describe).$sep.csv_quote($date);
         } else {
             print '<td class="completion-progresscell '.$activity->datepassedclass.'">'.
-                '<img src="'.$OUTPUT->old_icon_url('i/'.$completionicon).
+                '<img src="'.$OUTPUT->pix_url('i/'.$completionicon).
                 '" alt="'.$describe.'" title="'.$fulldescribe.'" /></td>';
         }
     }
diff --git a/course/report/progress/lib.php b/course/report/progress/lib.php
index 9eef33d2d82..9ac96ca9f11 100644
--- a/course/report/progress/lib.php
+++ b/course/report/progress/lib.php
@@ -35,6 +35,6 @@ function progress_report_extend_navigation($navigation, $course, $context) {
     global $CFG, $OUTPUT;
     if (has_capability('coursereport/progress:view', $context)) {
         $url = new moodle_url($CFG->wwwroot.'/course/report/progress/index.php', array('course'=>$course->id));
-        $navigation->add(get_string('completionreport','completion'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report'));
+        $navigation->add(get_string('completionreport','completion'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
     }
 }
\ No newline at end of file
diff --git a/course/report/stats/lib.php b/course/report/stats/lib.php
index b9702d01200..c886d382413 100644
--- a/course/report/stats/lib.php
+++ b/course/report/stats/lib.php
@@ -87,7 +87,7 @@ function stats_report_extend_navigation($navigation, $course, $context) {
     if (has_capability('coursereport/stats:view', $context)) {
         if (!empty($CFG->enablestats)) {
             $url = new moodle_url($CFG->wwwroot.'/course/report/stats/index.php', array('id'=>$course->id));
-            $navigation->add(get_string('stats'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report'));
+            $navigation->add(get_string('stats'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
         }
     }
 }
\ No newline at end of file
diff --git a/course/resources.php b/course/resources.php
index 6ed85aec7d5..2778c7df1ae 100644
--- a/course/resources.php
+++ b/course/resources.php
@@ -125,9 +125,9 @@ foreach ($cms as $cm) {
 
     $extra = empty($cm->extra) ? '' : $cm->extra;
     if (!empty($cm->icon)) {
-        $icon = '<img src="'.$OUTPUT->old_icon_url($cm->icon).'" class="activityicon" alt="" /> ';
+        $icon = '<img src="'.$OUTPUT->pix_url($cm->icon).'" class="activityicon" alt="" /> ';
     } else {
-        $icon = '<img src="'.$OUTPUT->old_icon_url('icon', $cm->modname).'" class="activityicon" alt="" /> ';
+        $icon = '<img src="'.$OUTPUT->pix_url('icon', $cm->modname).'" class="activityicon" alt="" /> ';
     }
 
     $class = $cm->visible ? '' : 'class="dimmed"'; // hidden modules are dimmed
diff --git a/course/search.php b/course/search.php
index 38bedc557e4..011209c11d4 100644
--- a/course/search.php
+++ b/course/search.php
@@ -300,42 +300,42 @@
                 // checks whether user can update course settings
                 if (has_capability('moodle/course:update', $coursecontext)) {
                     echo "<a title=\"".get_string("settings")."\" href=\"$CFG->wwwroot/course/edit.php?id=$course->id\">\n<img".
-                        " src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"".get_string("settings")."\" /></a>\n ";
+                        " src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"".get_string("settings")."\" /></a>\n ";
                 }
 
                 // checks whether user can do role assignment
                 if (has_capability('moodle/role:assign', $coursecontext)) {
                     echo'<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$coursecontext->id.'">';
-                    echo '<img src="'.$OUTPUT->old_icon_url('i/roles') . '" class="iconsmall" alt="'.get_string('assignroles', 'role').'" /></a> ' . "\n";
+                    echo '<img src="'.$OUTPUT->pix_url('i/roles') . '" class="iconsmall" alt="'.get_string('assignroles', 'role').'" /></a> ' . "\n";
                 }
 
                 // checks whether user can delete course
                 if (has_capability('moodle/course:delete', $coursecontext)) {
                     echo "<a title=\"".get_string("delete")."\" href=\"delete.php?id=$course->id\">\n<img".
-                        " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"".get_string("delete")."\" /></a>\n ";
+                        " src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"".get_string("delete")."\" /></a>\n ";
                 }
 
                 // checks whether user can change visibility
                 if (has_capability('moodle/course:visibility', $coursecontext)) {
                     if (!empty($course->visible)) {
                         echo "<a title=\"".get_string("hide")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;hide=$course->id&amp;sesskey=".sesskey()."\">\n<img".
-                            " src=\"" . $OUTPUT->old_icon_url('t/hide') . "\" class=\"iconsmall\" alt=\"".get_string("hide")."\" /></a>\n ";
+                            " src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"".get_string("hide")."\" /></a>\n ";
                     } else {
                         echo "<a title=\"".get_string("show")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;show=$course->id&amp;sesskey=".sesskey()."\">\n<img".
-                            " src=\"" . $OUTPUT->old_icon_url('t/show') . "\" class=\"iconsmall\" alt=\"".get_string("show")."\" /></a>\n ";
+                            " src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"".get_string("show")."\" /></a>\n ";
                     }
                 }
 
                 // checks whether user can do site backup
                 if (has_capability('moodle/site:backup', $coursecontext)) {
                     echo "<a title=\"".get_string("backup")."\" href=\"../backup/backup.php?id=$course->id\">\n<img".
-                        " src=\"" . $OUTPUT->old_icon_url('t/backup') . "\" class=\"iconsmall\" alt=\"".get_string("backup")."\" /></a>\n ";
+                        " src=\"" . $OUTPUT->pix_url('t/backup') . "\" class=\"iconsmall\" alt=\"".get_string("backup")."\" /></a>\n ";
                 }
 
                 // checks whether user can do restore
                 if (has_capability('moodle/site:restore', $coursecontext)) {
                     echo "<a title=\"".get_string("restore")."\" href=\"../files/index.php?id=$course->id&amp;wdir=/backupdata\">\n<img".
-                        " src=\"" . $OUTPUT->old_icon_url('t/restore') . "\" class=\"iconsmall\" alt=\"".get_string("restore")."\" /></a>\n ";
+                        " src=\"" . $OUTPUT->pix_url('t/restore') . "\" class=\"iconsmall\" alt=\"".get_string("restore")."\" /></a>\n ";
                 }
 
                 echo "</td>\n</tr>\n";
diff --git a/course/user.php b/course/user.php
index 1293ae27a3a..9d673ffda2d 100644
--- a/course/user.php
+++ b/course/user.php
@@ -367,7 +367,7 @@ echo $OUTPUT->footer();
 function print_outline_row($mod, $instance, $result) {
     global $OUTPUT;
 
-    $image = "<img src=\"" . $OUTPUT->old_icon_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />";
+    $image = "<img src=\"" . $OUTPUT->pix_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />";
 
     echo "<tr>";
     echo "<td valign=\"top\">$image</td>";
diff --git a/enrol/manual/enrol.php b/enrol/manual/enrol.php
index a41cfe123e7..449bde5c77a 100644
--- a/enrol/manual/enrol.php
+++ b/enrol/manual/enrol.php
@@ -388,11 +388,11 @@ function get_access_icons($course) {
 
     if (!empty($course->guest)) {
         $str .= '<a title="'.$strallowguests.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
-        $str .= '<img class="accessicon" alt="'.$strallowguests.'" src="'.$OUTPUT->old_icon_url('i/guest') . '" /></a>&nbsp;&nbsp;';
+        $str .= '<img class="accessicon" alt="'.$strallowguests.'" src="'.$OUTPUT->pix_url('i/guest') . '" /></a>&nbsp;&nbsp;';
     }
     if (!empty($course->password)) {
         $str .= '<a title="'.$strrequireskey.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
-        $str .= '<img class="accessicon" alt="'.$strrequireskey.'" src="'.$OUTPUT->old_icon_url('i/key') . '" /></a>';
+        $str .= '<img class="accessicon" alt="'.$strrequireskey.'" src="'.$OUTPUT->pix_url('i/key') . '" /></a>';
     }
 
     return $str;
diff --git a/files/draftfiles.php b/files/draftfiles.php
index dd84fc025b0..95693019a7c 100644
--- a/files/draftfiles.php
+++ b/files/draftfiles.php
@@ -132,7 +132,7 @@ $strdelete   = get_string('delete');
 
 if ($parent) {
     echo '<div class="folder">';
-    echo '<a href="draftfiles.php?itemid='.$itemid.'&amp;filepath='.$parent->get_filepath().'&amp;subdirs='.$subdirs.'&amp;maxbytes='.$maxbytes.'"><img src="'.$OUTPUT->old_icon_url('f/parent') . '" class="icon" alt="" />&nbsp;'.get_string('parentfolder').'</a>';
+    echo '<a href="draftfiles.php?itemid='.$itemid.'&amp;filepath='.$parent->get_filepath().'&amp;subdirs='.$subdirs.'&amp;maxbytes='.$maxbytes.'"><img src="'.$OUTPUT->pix_url('f/parent') . '" class="icon" alt="" />&nbsp;'.get_string('parentfolder').'</a>';
     echo '</div>';
 }
 
@@ -150,16 +150,16 @@ foreach ($files as $file) {
             $dirname = explode('/', trim($filepath, '/'));
             $dirname = array_pop($dirname);
             echo '<div class="folder">';
-            echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->old_icon_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" />&nbsp;".s($dirname)."</a> ";
-            echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>";
+            echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->pix_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" />&nbsp;".s($dirname)."</a> ";
+            echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>";
             echo '</div>';
         }
 
     } else {
         $viewurl = file_encode_url("$CFG->wwwroot/draftfile.php", "/$contextid/user_draft/$itemid".$filepath.$filename, false, false);
         echo '<div class="file">';
-        echo "<a href=\"$viewurl\"><img src=\"" . $OUTPUT->old_icon_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename)." ($filesize)</a> ";
-        echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>";;
+        echo "<a href=\"$viewurl\"><img src=\"" . $OUTPUT->pix_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename)." ($filesize)</a> ";
+        echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>";;
         echo '</div>';
     }
 }
diff --git a/files/index.php b/files/index.php
index 42868b15e7f..4d9e480969f 100644
--- a/files/index.php
+++ b/files/index.php
@@ -254,7 +254,7 @@ function displaydir($file_info) {
 
         echo "<tr class=\"folder\">";
         print_cell();
-        print_cell('left', '<a href="index.php?'.$params.'"><img src="'.$OUTPUT->old_icon_url('f/parent') . '" class="icon" alt="" />&nbsp;'.get_string('parentfolder').'</a>', 'name');
+        print_cell('left', '<a href="index.php?'.$params.'"><img src="'.$OUTPUT->pix_url('f/parent') . '" class="icon" alt="" />&nbsp;'.get_string('parentfolder').'</a>', 'name');
         print_cell();
         print_cell();
         print_cell();
@@ -279,11 +279,11 @@ function displaydir($file_info) {
 
                 echo "<tr class=\"folder\">";
                 print_cell();
-                print_cell("left", "<a href=\"index.php?$params\"><img src=\"" . $OUTPUT->old_icon_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" />&nbsp;".s($filename)."</a>", 'name');
+                print_cell("left", "<a href=\"index.php?$params\"><img src=\"" . $OUTPUT->pix_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" />&nbsp;".s($filename)."</a>", 'name');
                 print_cell("right", $filesize, 'size');
                 print_cell("right", $filedate, 'date');
                 if ($parentwritable) {
-                    print_cell("right", "<a href=\"index.php?$params&amp;sesskey=".sesskey()."&amp;delete=1\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>", 'command');
+                    print_cell("right", "<a href=\"index.php?$params&amp;sesskey=".sesskey()."&amp;delete=1\"><img src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>", 'command');
                 } else {
                     print_cell();
                 }
@@ -292,13 +292,13 @@ function displaydir($file_info) {
             } else {
 
                 if ($downloadurl = $child_info->get_url(true)) {
-                    $downloadurl = "&nbsp;<a href=\"$downloadurl\" title=\"" . get_string('downloadfile') . "\"><img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" class=\"iconsmall\" alt=\"$strdownload\" /></a>";
+                    $downloadurl = "&nbsp;<a href=\"$downloadurl\" title=\"" . get_string('downloadfile') . "\"><img src=\"" . $OUTPUT->pix_url('t/down') . "\" class=\"iconsmall\" alt=\"$strdownload\" /></a>";
                 } else {
                     $downloadurl = '';
                 }
 
                 if ($viewurl = $child_info->get_url()) {
-                    $link = html_link::make($viewurl, "display", "<img src=\"" . $OUTPUT->old_icon_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strfile\" />&nbsp;");
+                    $link = html_link::make($viewurl, "display", "<img src=\"" . $OUTPUT->pix_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strfile\" />&nbsp;");
                     $link->add_action(new popup_action('click', $link->url, 'display', array('height' => 480, 'width' => 640)));
                     $viewurl = "&nbsp;".$OUTPUT->link($link);
                 } else {
@@ -309,11 +309,11 @@ function displaydir($file_info) {
 
                 echo "<tr class=\"file\">";
                 print_cell();
-                print_cell("left", "<img src=\"" . $OUTPUT->old_icon_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename).$downloadurl.$viewurl, 'name');
+                print_cell("left", "<img src=\"" . $OUTPUT->pix_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename).$downloadurl.$viewurl, 'name');
                 print_cell("right", $filesize, 'size');
                 print_cell("right", $filedate, 'date');
                 if ($parentwritable) {
-                    print_cell("right", "<a href=\"index.php?$params&amp;sesskey=".sesskey()."&amp;delete=1\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>", 'command');
+                    print_cell("right", "<a href=\"index.php?$params&amp;sesskey=".sesskey()."&amp;delete=1\"><img src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>", 'command');
                 } else {
                     print_cell();
                 }
diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index a3c0764aff0..e25c0a9bdbf 100755
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -137,7 +137,7 @@ class grade_edit_tree {
             if ($this->element_deletable($element)) {
                 $actionicon = new moodle_action_icon();
                 $actionicon->link->url = new moodle_url('index.php', array('id' => $COURSE->id, 'action' => 'delete', 'eid' => $eid, 'sesskey' => sesskey()));
-                $actionicon->image->src = $OUTPUT->old_icon_url('t/delete');
+                $actionicon->image->src = $OUTPUT->pix_url('t/delete');
                 $actionicon->image->alt = get_string('delete');
                 $actionicon->image->title = get_string('delete');
                 $actionicon->image->add_class('iconsmall');
@@ -146,7 +146,7 @@ class grade_edit_tree {
 
             $actionicon = new moodle_action_icon();
             $actionicon->link->url = new moodle_url('index.php', array('id' => $COURSE->id, 'action' => 'moveselect', 'eid' => $eid, 'sesskey' => sesskey()));
-            $actionicon->image->src = $OUTPUT->old_icon_url('t/move');
+            $actionicon->image->src = $OUTPUT->pix_url('t/move');
             $actionicon->image->alt = get_string('move');
             $actionicon->image->title = get_string('move');
             $actionicon->image->add_class('iconsmall');
@@ -224,7 +224,7 @@ class grade_edit_tree {
                         $moveicon->link->url->params($first);
                     }
                     $moveicon->image->add_class('movetarget');
-                    $moveicon->image->src = $OUTPUT->old_icon_url('movehere');
+                    $moveicon->image->src = $OUTPUT->pix_url('movehere');
                     $moveicon->image->alt = $strmovehere;
                     $moveicon->image->title = $strmovehere;
 
diff --git a/grade/export/keymanager.php b/grade/export/keymanager.php
index ae43b8373c1..84f0f246db8 100644
--- a/grade/export/keymanager.php
+++ b/grade/export/keymanager.php
@@ -61,13 +61,13 @@ if ($keys) {
         $icon->image->add_class('iconsmall');
 
         $editicon = clone($icon);
-        $editicon->image->src = $OUTPUT->old_icon_url('t/edit');
+        $editicon->image->src = $OUTPUT->pix_url('t/edit');
         $editicon->image->title = $stredit;
         $editicon->image->alt = $stredit;
         $buttons = $OUTPUT->action_icon($editicon);
 
         $deleteicon = clone($icon);
-        $deleteicon->image->src = $OUTPUT->old_icon_url('t/delete');
+        $deleteicon->image->src = $OUTPUT->pix_url('t/delete');
         $deleteicon->image->title = $strdelete;
         $deleteicon->image->alt = $strdelete;
         $deleteicon->link->url->param('delete', 1);
diff --git a/grade/import/keymanager.php b/grade/import/keymanager.php
index b450292eb9a..8d6ff0fef9d 100644
--- a/grade/import/keymanager.php
+++ b/grade/import/keymanager.php
@@ -58,13 +58,13 @@ if ($keys = $DB->get_records_select('user_private_key', "script='grade/import' A
         $icon->image->add_class('iconsmall');
 
         $editicon = clone($icon);
-        $editicon->image->src = $OUTPUT->old_icon_url('t/edit');
+        $editicon->image->src = $OUTPUT->pix_url('t/edit');
         $editicon->image->title = $stredit;
         $editicon->image->alt = $stredit;
         $buttons = $OUTPUT->action_icon($editicon);
 
         $deleteicon = clone($icon);
-        $deleteicon->image->src = $OUTPUT->old_icon_url('t/delete');
+        $deleteicon->image->src = $OUTPUT->pix_url('t/delete');
         $deleteicon->image->title = $strdelete;
         $deleteicon->image->alt = $strdelete;
         $deleteicon->link->url->param('delete', 1);
diff --git a/grade/lib.php b/grade/lib.php
index 8453e5a2f47..6eff54f1eca 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -1222,7 +1222,7 @@ class grade_structure {
 
                 if ($element['object']->is_calculated()) {
                     $strcalc = get_string('calculatedgrade', 'grades');
-                    return '<img src="'.$OUTPUT->old_icon_url('i/calc') . '" class="icon itemicon" title="'.
+                    return '<img src="'.$OUTPUT->pix_url('i/calc') . '" class="icon itemicon" title="'.
                             s($strcalc).'" alt="'.s($strcalc).'"/>';
 
                 } else if (($is_course or $is_category) and ($is_scale or $is_value)) {
@@ -1234,18 +1234,18 @@ class grade_structure {
                             case GRADE_AGGREGATE_WEIGHTED_MEAN2:
                             case GRADE_AGGREGATE_EXTRACREDIT_MEAN:
                                 $stragg = get_string('aggregation', 'grades');
-                                return '<img src="'.$OUTPUT->old_icon_url('i/agg_mean') . '" ' .
+                                return '<img src="'.$OUTPUT->pix_url('i/agg_mean') . '" ' .
                                         'class="icon itemicon" title="'.s($stragg).'" alt="'.s($stragg).'"/>';
                             case GRADE_AGGREGATE_SUM:
                                 $stragg = get_string('aggregation', 'grades');
-                                return '<img src="'.$OUTPUT->old_icon_url('i/agg_sum') . '" ' .
+                                return '<img src="'.$OUTPUT->pix_url('i/agg_sum') . '" ' .
                                         'class="icon itemicon" title="'.s($stragg).'" alt="'.s($stragg).'"/>';
                         }
                     }
 
                 } else if ($element['object']->itemtype == 'mod') {
                     $strmodname = get_string('modulename', $element['object']->itemmodule);
-                    return '<img src="'.$OUTPUT->old_icon_url('icon',
+                    return '<img src="'.$OUTPUT->pix_url('icon',
                             $element['object']->itemmodule) . '" ' .
                             'class="icon itemicon" title="' .s($strmodname).
                             '" alt="' .s($strmodname).'"/>';
@@ -1253,12 +1253,12 @@ class grade_structure {
                 } else if ($element['object']->itemtype == 'manual') {
                     if ($element['object']->is_outcome_item()) {
                         $stroutcome = get_string('outcome', 'grades');
-                        return '<img src="'.$OUTPUT->old_icon_url('i/outcomes') . '" ' .
+                        return '<img src="'.$OUTPUT->pix_url('i/outcomes') . '" ' .
                                 'class="icon itemicon" title="'.s($stroutcome).
                                 '" alt="'.s($stroutcome).'"/>';
                     } else {
                         $strmanual = get_string('manualitem', 'grades');
-                        return '<img src="'.$OUTPUT->old_icon_url('t/manual_item') . '" '.
+                        return '<img src="'.$OUTPUT->pix_url('t/manual_item') . '" '.
                                 'class="icon itemicon" title="'.s($strmanual).
                                 '" alt="'.s($strmanual).'"/>';
                     }
@@ -1267,7 +1267,7 @@ class grade_structure {
 
             case 'category':
                 $strcat = get_string('category', 'grades');
-                return '<img src="'.$OUTPUT->old_icon_url('f/folder') . '" class="icon itemicon" ' .
+                return '<img src="'.$OUTPUT->pix_url('f/folder') . '" class="icon itemicon" ' .
                         'title="'.s($strcat).'" alt="'.s($strcat).'" />';
         }
 
@@ -1459,7 +1459,7 @@ class grade_structure {
             $url = $gpr->add_url_params($url);
             $editicon = new moodle_action_icon();
             $editicon->link->url = $url;
-            $editicon->image->src = $OUTPUT->old_icon_url('t/edit');
+            $editicon->image->src = $OUTPUT->pix_url('t/edit');
             $editicon->image->alt = $stredit;
             $editicon->image->title = $stredit;
             $editicon->image->add_class('iconsmall');
@@ -1508,13 +1508,13 @@ class grade_structure {
             }
 
             $hideicon->link->url->param('action', 'show');
-            $hideicon->image->src = $OUTPUT->old_icon_url('t/' . $icon);
+            $hideicon->image->src = $OUTPUT->pix_url('t/' . $icon);
             $hideicon->image->alt = $strshow;
             $hideicon->image->title = $tooltip;
 
         } else {
             $hideicon->link->url->param('action', 'hide');
-            $hideicon->image->src = $OUTPUT->old_icon_url('t/hide');
+            $hideicon->image->src = $OUTPUT->pix_url('t/hide');
             $hideicon->image->alt = $strhide;
             $hideicon->image->title = $strhide;
         }
@@ -1553,7 +1553,7 @@ class grade_structure {
             $strnonunlockable = get_string('nonunlockableverbose', 'grades', $strparamobj);
 
             $lockicon = new html_image();
-            $lockicon->image->src = $OUTPUT->old_icon_url('t/unlock_gray');
+            $lockicon->image->src = $OUTPUT->pix_url('t/unlock_gray');
             $lockicon->image->alt = s($strnonunlockable);
             $lockicon->image->title = s($strnonunlockable);
             $lockicon->image->add_class('iconsmall');
@@ -1575,7 +1575,7 @@ class grade_structure {
             }
             $lockicon->link->url->param('action', 'unlock');
             $lockicon->link->add_class('lock');
-            $lockicon->image->src = $OUTPUT->old_icon_url('t/'.$icon);
+            $lockicon->image->src = $OUTPUT->pix_url('t/'.$icon);
             $lockicon->image->alt = $strunlock;
             $lockicon->image->title = $tooltip;
             $action  = $OUTPUT->action_icon($lockicon);
@@ -1588,7 +1588,7 @@ class grade_structure {
 
             $lockicon->link->url->param('action', 'lock');
             $lockicon->link->add_class('lock');
-            $lockicon->image->src = $OUTPUT->old_icon_url('t/lock');
+            $lockicon->image->src = $OUTPUT->pix_url('t/lock');
             $lockicon->image->alt = $strlock;
             $lockicon->image->title = $strlock;
             $action  = $OUTPUT->action_icon($lockicon);
@@ -1633,7 +1633,7 @@ class grade_structure {
                         array('courseid' => $this->courseid, 'id' => $object->id));
 
                 $calcicon->link->url = $gpr->add_url_params($calcicon->link->url);
-                $calcicon->image->src = $OUTPUT->old_icon_url($icon);
+                $calcicon->image->src = $OUTPUT->pix_url($icon);
                 $calcicon->add_class('iconsmall');
                 $calcicon->alt = $streditcalculation;
                 $calcicon->title = $streditcalculation;
@@ -2267,7 +2267,7 @@ function grade_button($type, $courseid, $object) {
         $icon->link->url = new moodle_url('edit.php', array('courseid' => $courseid, 'id' => $object->id));
     }
 
-    $icon->image->src = $OUTPUT->old_icon_url('t/'.$type);
+    $icon->image->src = $OUTPUT->pix_url('t/'.$type);
     $icon->image->add_class('iconsmall');
     $icon->image->title = ${'str'.$type};
     $icon->image->alt = ${'str'.$type};
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 4919e844628..c81df24c229 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -503,7 +503,7 @@ class grade_report_grader extends grade_report {
         $string = ${'str' . $showhide};
 
         $toggleicon = new moodle_action_icon();
-        $toggleicon->image->src = $OUTPUT->old_icon_url($imagename);
+        $toggleicon->image->src = $OUTPUT->pix_url($imagename);
         $toggleicon->image->add_class('iconsmall');
         $toggleicon->alt = $string;
         $toggleicon->title = $string;
@@ -617,7 +617,7 @@ class grade_report_grader extends grade_report {
                 $userreporticon = new moodle_action_icon();
                 $userreporticon->link->url = new moodle_url($CFG->wwwroot.'/grade/report/user/index.php', array('userid' => $user->id, 'id' => $this->course->id));
                 $userreporticon->image->add_class('iconsmall');
-                $userreporticon->image->src = $OUTPUT->old_icon_url('t/grades');
+                $userreporticon->image->src = $OUTPUT->pix_url('t/grades');
                 $userreporticon->image->alt = $strgradesforuser;
                 $userreportcell->text = $OUTPUT->action_icon($userreporticon);
                 $userrow->cells[] = $userreportcell;
@@ -1417,15 +1417,15 @@ class grade_report_grader extends grade_report {
             $contractexpandicon = new moodle_action_icon();
             $contractexpandicon->link->url = new moodle_url($this->gpr->get_return_url(null, array('target'=>$element['eid'], 'action'=>'switch_minus', 'sesskey'=>sesskey())));
             $contractexpandicon->image->add_class('iconsmall');
-            $contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_minus');
+            $contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_minus');
             $contractexpandicon->image->alt = $strswitchminus;
 
             if (in_array($element['object']->id, $this->collapsed['aggregatesonly'])) {
-                $contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_plus');
+                $contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_plus');
                 $contractexpandicon->image->alt = $strswitchplus;
                 $contractexpandicon->link->url->param('action', 'switch_plus');
             } elseif (in_array($element['object']->id, $this->collapsed['gradesonly'])) {
-                $contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_whole');
+                $contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_whole');
                 $contractexpandicon->image->alt = $strswitchwhole;
                 $contractexpandicon->link->url->param('action', 'switch_whole');
             }
diff --git a/group/groupings.php b/group/groupings.php
index f6caadd1909..9d7879137f5 100644
--- a/group/groupings.php
+++ b/group/groupings.php
@@ -82,11 +82,11 @@ if ($groupings = $DB->get_records('groupings', array('courseid'=>$course->id), '
         $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->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /></a> ";
+                    " src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /></a> ";
         $buttons .= "<a title=\"$strdelete\" href=\"grouping.php?id=$grouping->id&amp;delete=1\"><img".
-                    " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a> ";
+                    " src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a> ";
         $buttons .= "<a title=\"$strmanagegrping\" href=\"assign.php?id=$grouping->id\"><img".
-                    " src=\"" . $OUTPUT->old_icon_url('i/group') . "\" class=\"icon\" alt=\"$strmanagegrping\" /></a> ";
+                    " src=\"" . $OUTPUT->pix_url('i/group') . "\" class=\"icon\" alt=\"$strmanagegrping\" /></a> ";
 
         $line[3] = $buttons;
         $data[] = $line;
diff --git a/index.php b/index.php
index 68a167c12d5..1cfc7dd8b24 100644
--- a/index.php
+++ b/index.php
@@ -125,7 +125,7 @@
             if ($editing) {
                 $streditsummary = get_string('editsummary');
                 echo "<a title=\"$streditsummary\" ".
-                     " href=\"course/editsection.php?id=$section->id\"><img src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" ".
+                     " href=\"course/editsection.php?id=$section->id\"><img src=\"" . $OUTPUT->pix_url('t/edit') . "\" ".
                      " class=\"iconsmall\" alt=\"$streditsummary\" /></a><br /><br />";
             }
 
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 11dbdb97e22..c36cf14048e 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4755,14 +4755,14 @@ class admin_setting_manageauths extends admin_setting {
             // hide/show link
             if (in_array($auth, $authsenabled)) {
                 $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\">";
-                $hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
+                $hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
                 // $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\"><input type=\"checkbox\" checked /></a>";
                 $enabled = true;
                 $displayname = "<span>$name</span>";
             }
             else {
                 $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\">";
-                $hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
+                $hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
                 // $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\"><input type=\"checkbox\" /></a>";
                 $enabled = false;
                 $displayname = "<span class=\"dimmed_text\">$name</span>";
@@ -4773,17 +4773,17 @@ class admin_setting_manageauths extends admin_setting {
             if ($enabled) {
                 if ($updowncount > 1) {
                     $updown .= "<a href=\"$url&amp;action=up&amp;auth=$auth\">";
-                    $updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
                 }
                 else {
-                    $updown .= "<img src=\"" . $OUTPUT->old_icon_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />&nbsp;";
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />&nbsp;";
                 }
                 if ($updowncount < $authcount) {
                     $updown .= "<a href=\"$url&amp;action=down&amp;auth=$auth\">";
-                    $updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" alt=\"down\" /></a>";
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
                 }
                 else {
-                    $updown .= "<img src=\"" . $OUTPUT->old_icon_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />";
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />";
                 }
                 ++ $updowncount;
             }
@@ -4919,14 +4919,14 @@ class admin_setting_manageeditors extends admin_setting {
         // hide/show link
             if (in_array($editor, $active_editors)) {
                 $hideshow = "<a href=\"$url&amp;action=disable&amp;editor=$editor\">";
-                $hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
+                $hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
                 // $hideshow = "<a href=\"$url&amp;action=disable&amp;editor=$editor\"><input type=\"checkbox\" checked /></a>";
                 $enabled = true;
                 $displayname = "<span>$name</span>";
             }
             else {
                 $hideshow = "<a href=\"$url&amp;action=enable&amp;editor=$editor\">";
-                $hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
+                $hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
                 // $hideshow = "<a href=\"$url&amp;action=enable&amp;editor=$editor\"><input type=\"checkbox\" /></a>";
                 $enabled = false;
                 $displayname = "<span class=\"dimmed_text\">$name</span>";
@@ -4937,17 +4937,17 @@ class admin_setting_manageeditors extends admin_setting {
             if ($enabled) {
                 if ($updowncount > 1) {
                     $updown .= "<a href=\"$url&amp;action=up&amp;editor=$editor\">";
-                    $updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
                 }
                 else {
-                    $updown .= "<img src=\"" . $OUTPUT->old_icon_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />&nbsp;";
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />&nbsp;";
                 }
                 if ($updowncount < $editorcount) {
                     $updown .= "<a href=\"$url&amp;action=down&amp;editor=$editor\">";
-                    $updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" alt=\"down\" /></a>";
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
                 }
                 else {
-                    $updown .= "<img src=\"" . $OUTPUT->old_icon_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />";
+                    $updown .= "<img src=\"" . $OUTPUT->pix_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />";
                 }
                 ++ $updowncount;
             }
@@ -5123,13 +5123,13 @@ class admin_setting_manageportfolio extends admin_setting {
 
         foreach ($instances as $i) {
             $row = '';
-            $row .= '<a href="' . $this->baseurl . '&edit=' . $i->get('id') . '"><img src="' . $OUTPUT->old_icon_url('t/edit') . '" alt="' . get_string('edit') . '" /></a>' . "\n";
-            $row .= '<a href="' . $this->baseurl . '&delete=' .  $i->get('id') . '"><img src="' . $OUTPUT->old_icon_url('t/delete') . '" alt="' . get_string('delete') . '" /></a>' . "\n";
+            $row .= '<a href="' . $this->baseurl . '&edit=' . $i->get('id') . '"><img src="' . $OUTPUT->pix_url('t/edit') . '" alt="' . get_string('edit') . '" /></a>' . "\n";
+            $row .= '<a href="' . $this->baseurl . '&delete=' .  $i->get('id') . '"><img src="' . $OUTPUT->pix_url('t/delete') . '" alt="' . get_string('delete') . '" /></a>' . "\n";
             if (array_key_exists($i->get('plugin'), $insane) || array_key_exists($i->get('id'), $insaneinstances)) {
-                $row .=  '<img src="' . $OUTPUT->old_icon_url('t/show') . '" alt="' . get_string('hidden', 'portfolio') . '" />' . "\n";
+                $row .=  '<img src="' . $OUTPUT->pix_url('t/show') . '" alt="' . get_string('hidden', 'portfolio') . '" />' . "\n";
             } else {
                 $row .= ' <a href="' . $this->baseurl . '&hide=' . $i->get('id') . '"><img src="' .
-                    $OUTPUT->old_icon_url('t/' . ($i->get('visible') ? 'hide' : 'show')) . '" alt="' . get_string($i->get('visible') ? 'hide' : 'show') . '" /></a>' . "\n";
+                    $OUTPUT->pix_url('t/' . ($i->get('visible') ? 'hide' : 'show')) . '" alt="' . get_string($i->get('visible') ? 'hide' : 'show') . '" /></a>' . "\n";
             }
             $table->data[] = array($i->get('name'), $i->get_name() . ' (' . $i->get('plugin') . ')', $row);
             if (!in_array($i->get('plugin'), $alreadyplugins)) {
@@ -6018,7 +6018,7 @@ class admin_setting_managerepository extends admin_setting {
 
             $hidetitle = $i->get_visible() ? get_string('clicktohide', 'repository') : get_string('clicktoshow', 'repository');
             $hiddenshow = ' <a href="' . $this->baseurl . '&amp;hide=' . $i->get_typename() . '">'
-                .'<img src="' . $OUTPUT->old_icon_url('i/' . ($i->get_visible() ? 'hide' : 'show')) . '"'
+                .'<img src="' . $OUTPUT->pix_url('i/' . ($i->get_visible() ? 'hide' : 'show')) . '"'
                 .' alt="' . $hidetitle . '" '
                 .' title="' . $hidetitle . '" />'
                 .'</a>' . "\n";
@@ -6030,14 +6030,14 @@ class admin_setting_managerepository extends admin_setting {
             $spacer->width = 15;
             if ($updowncount > 1) {
                 $updown .= "<a href=\"$this->baseurl&amp;move=up&amp;type=".$i->get_typename()."\">";
-                $updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
+                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
             }
             else {
                 $updown .= $OUTPUT->spacer($spacer);
             }
             if ($updowncount < count($instances)) {
                 $updown .= "<a href=\"$this->baseurl&amp;move=down&amp;type=".$i->get_typename()."\">";
-                $updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" alt=\"down\" /></a>";
+                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
             }
             else {
                 $updown .= $OUTPUT->spacer($spacer);
@@ -6381,11 +6381,11 @@ class admin_setting_managewebserviceprotocols extends admin_setting {
             // hide/show link
             if (in_array($protocol, $active_protocols)) {
                 $hideshow = "<a href=\"$url&amp;action=disable&amp;webservice=$protocol\">";
-                $hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/hide') . "\" class=\"icon\" alt=\"$strdisable\" /></a>";
+                $hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strdisable\" /></a>";
                 $displayname = "<span>$name</span>";
             } else {
                 $hideshow = "<a href=\"$url&amp;action=enable&amp;webservice=$protocol\">";
-                $hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/show') . "\" class=\"icon\" alt=\"$strenable\" /></a>";
+                $hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strenable\" /></a>";
                 $displayname = "<span class=\"dimmed_text\">$name</span>";
             }
 
diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index efd25a3d401..6789fe9a73e 100644
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -41,7 +41,7 @@ function setup_core_javascript(page_requirements_manager $requires) {
     $config = array(
         'wwwroot' => $CFG->httpswwwroot, // Yes, really. See above.
         'sesskey' => sesskey(),
-        'loadingicon' => $OUTPUT->old_icon_url('i/loading_small', 'moodle', false),
+        'loadingicon' => $OUTPUT->pix_url('i/loading_small', 'moodle')->out_raw(),
         'themerev' => theme_get_revision(),
         'theme' => $PAGE->theme->name,
     );
@@ -1363,22 +1363,22 @@ class jsportal {
         $output .= "    main.portal.strings['resource']='".get_string('resource')."';\n";
         $output .= "    main.portal.strings['activity']='".get_string('activity')."';\n";
         $output .= "    main.portal.strings['sesskey']='".sesskey()."';\n";
-        $output .= "    main.portal.icons['spacerimg']='".$OUTPUT->old_icon_url('spaces')."';\n";
-        $output .= "    main.portal.icons['marker']='".$OUTPUT->old_icon_url('i/marker')."';\n";
-        $output .= "    main.portal.icons['ihide']='".$OUTPUT->old_icon_url('i/hide')."';\n";
-        $output .= "    main.portal.icons['move_2d']='".$OUTPUT->old_icon_url('i/move_2d')."';\n";
-        $output .= "    main.portal.icons['show']='".$OUTPUT->old_icon_url('t/show')."';\n";
-        $output .= "    main.portal.icons['hide']='".$OUTPUT->old_icon_url('t/hide')."';\n";
-        $output .= "    main.portal.icons['delete']='".$OUTPUT->old_icon_url('t/delete')."';\n";
-        $output .= "    main.portal.icons['groupn']='".$OUTPUT->old_icon_url('t/groupn')."';\n";
-        $output .= "    main.portal.icons['groups']='".$OUTPUT->old_icon_url('t/groups')."';\n";
-        $output .= "    main.portal.icons['groupv']='".$OUTPUT->old_icon_url('t/groupv')."';\n";
+        $output .= "    main.portal.icons['spacerimg']='".$OUTPUT->pix_url('spaces')."';\n";
+        $output .= "    main.portal.icons['marker']='".$OUTPUT->pix_url('i/marker')."';\n";
+        $output .= "    main.portal.icons['ihide']='".$OUTPUT->pix_url('i/hide')."';\n";
+        $output .= "    main.portal.icons['move_2d']='".$OUTPUT->pix_url('i/move_2d')."';\n";
+        $output .= "    main.portal.icons['show']='".$OUTPUT->pix_url('t/show')."';\n";
+        $output .= "    main.portal.icons['hide']='".$OUTPUT->pix_url('t/hide')."';\n";
+        $output .= "    main.portal.icons['delete']='".$OUTPUT->pix_url('t/delete')."';\n";
+        $output .= "    main.portal.icons['groupn']='".$OUTPUT->pix_url('t/groupn')."';\n";
+        $output .= "    main.portal.icons['groups']='".$OUTPUT->pix_url('t/groups')."';\n";
+        $output .= "    main.portal.icons['groupv']='".$OUTPUT->pix_url('t/groupv')."';\n";
         if (right_to_left()) {
-            $output .= "    main.portal.icons['backwards']='".$OUTPUT->old_icon_url('t/right')."';\n";
-            $output .= "    main.portal.icons['forwards']='".$OUTPUT->old_icon_url('t/left')."';\n";
+            $output .= "    main.portal.icons['backwards']='".$OUTPUT->pix_url('t/right')."';\n";
+            $output .= "    main.portal.icons['forwards']='".$OUTPUT->pix_url('t/left')."';\n";
         } else {
-            $output .= "    main.portal.icons['backwards']='".$OUTPUT->old_icon_url('t/left')."';\n";
-            $output .= "    main.portal.icons['forwards']='".$OUTPUT->old_icon_url('t/right')."';\n";
+            $output .= "    main.portal.icons['backwards']='".$OUTPUT->pix_url('t/left')."';\n";
+            $output .= "    main.portal.icons['forwards']='".$OUTPUT->pix_url('t/right')."';\n";
         }
 
         $output .= "    onloadobj.load();\n";
diff --git a/lib/configonlylib.php b/lib/configonlylib.php
index 39132321ad5..c07f13e58fb 100644
--- a/lib/configonlylib.php
+++ b/lib/configonlylib.php
@@ -41,7 +41,7 @@ function min_optional_param($name, $default, $type) {
         $value = $_GET[$name];
 
     } else if (isset($_GET['amp;'.$name])) {
-        // very, very, very ugly hack, unforunately $OUTPUT->old_icon_url() is not used properly in javascript code :-(
+        // very, very, very ugly hack, unforunately $OUTPUT->pix_url() is not used properly in javascript code :-(
         $value = $_GET['amp;'.$name];
     }
     switch($type) {
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index b19f26f25b3..6d683cabb87 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -2869,7 +2869,7 @@ function print_arrow($direction='up', $strsort=null, $return=false) {
         $strsort  = get_string('sort' . $sortdir, 'grades');
     }
 
-    $return = ' <img src="'.$OUTPUT->old_icon_url('t/' . $direction) . '" alt="'.$strsort.'" /> ';
+    $return = ' <img src="'.$OUTPUT->pix_url('t/' . $direction) . '" alt="'.$strsort.'" /> ';
 
     if ($return) {
         return $return;
diff --git a/lib/filelib.php b/lib/filelib.php
index 3e699678bd5..24f7e74683c 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -566,7 +566,7 @@ function file_get_draft_area_files($draftitemid, $filepath = '/') {
 
             $icon = mimeinfo_from_type('icon', $file->get_mimetype());
             $icon = str_replace('.gif', '', $icon);
-            $item->icon = $OUTPUT->old_icon_url('f/' . $icon);
+            $item->icon = $OUTPUT->pix_url('f/' . $icon);
 
             if ($icon == 'zip') {
                 $item->type = 'zip';
@@ -576,7 +576,7 @@ function file_get_draft_area_files($draftitemid, $filepath = '/') {
 
             if ($file->is_directory()) {
                 $item->filesize = 0;
-                $item->icon = $OUTPUT->old_icon_url('f/folder');
+                $item->icon = $OUTPUT->pix_url('f/folder');
                 $item->type = 'folder';
                 $foldername = explode('/', trim($item->filepath, '/'));
                 $item->fullname = trim(array_pop($foldername), '/');
@@ -1275,12 +1275,12 @@ function mimeinfo_from_icon($element, $icon, $all=false) {
 /**
  * Returns the relative icon path for a given mime type
  *
- * This function should be used in conjuction with $OUTPUT->old_icon_url to produce
+ * This function should be used in conjuction with $OUTPUT->pix_url to produce
  * a return the full path to an icon.
  *
  * <code>
  * $mimetype = 'image/jpg';
- * $icon = $OUTPUT->old_icon_url(file_mimetype_icon($mimetype));
+ * $icon = $OUTPUT->pix_url(file_mimetype_icon($mimetype));
  * echo '<img src="'.$icon.'" alt="'.$mimetype.'" />';
  * </code>
  *
@@ -1303,12 +1303,12 @@ function file_mimetype_icon($mimetype, $size=null) {
 /**
  * Returns the relative icon path for a given file name
  *
- * This function should be used in conjuction with $OUTPUT->old_icon_url to produce
+ * This function should be used in conjuction with $OUTPUT->pix_url to produce
  * a return the full path to an icon.
  *
  * <code>
  * $filename = 'jpg';
- * $icon = $OUTPUT->old_icon_url(file_extension_icon($filename));
+ * $icon = $OUTPUT->pix_url(file_extension_icon($filename));
  * echo '<img src="'.$icon.'" alt="blah" />';
  * </code>
  *
diff --git a/lib/form/modgrade.php b/lib/form/modgrade.php
index aaec045693d..8fbff35de86 100644
--- a/lib/form/modgrade.php
+++ b/lib/form/modgrade.php
@@ -62,7 +62,7 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_select{
                     $grades[$i] = $i;
                 }
                 $this->load($grades);
-                $linkobject = '<span class="helplink"><img height="17" width="17" alt="'.$strscales.'" src="'.$OUTPUT->old_icon_url('help') . '" /></span>';
+                $linkobject = '<span class="helplink"><img height="17" width="17" alt="'.$strscales.'" src="'.$OUTPUT->pix_url('help') . '" /></span>';
                 $this->setHelpButton(array('/course/scales.php?id='. $COURSE->id .'&amp;list=true', 'ratingscales',
                                      $linkobject, 400, 500, $strscales, 'none', true), 'link_to_popup_window');
                 return $result;
diff --git a/lib/formslib.php b/lib/formslib.php
index dfdb9bd47d4..77f68582ee4 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -1090,9 +1090,9 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
         }else {
             $this->updateAttributes(array('class'=>'mform'));
         }
-        $this->_reqHTML = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.get_string('requiredelement', 'form').'" src="'.$OUTPUT->old_icon_url('req') .'" />';
-        $this->_advancedHTML = '<img class="adv" title="'.get_string('advancedelement', 'form').'" alt="'.get_string('advancedelement', 'form').'" src="'.$OUTPUT->old_icon_url('adv') .'" />';
-        $this->setRequiredNote(get_string('somefieldsrequired', 'form', '<img alt="'.get_string('requiredelement', 'form').'" src="'.$OUTPUT->old_icon_url('req') .'" />'));
+        $this->_reqHTML = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
+        $this->_advancedHTML = '<img class="adv" title="'.get_string('advancedelement', 'form').'" alt="'.get_string('advancedelement', 'form').'" src="'.$OUTPUT->pix_url('adv') .'" />';
+        $this->setRequiredNote(get_string('somefieldsrequired', 'form', '<img alt="'.get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />'));
         //(Help file doesn't add anything) helpbutton('requiredelement', get_string('requiredelement', 'form'), 'moodle', true, false, '', true));
     }
 
diff --git a/lib/googleapi.php b/lib/googleapi.php
index 07fa60c25ff..8a195950bdf 100644
--- a/lib/googleapi.php
+++ b/lib/googleapi.php
@@ -325,7 +325,7 @@ class google_docs {
                     'url' => "{$gdoc->link[0]->attributes()->href}",
                     'source' => $source,
                     'date'   => usertime(strtotime($gdoc->updated)),
-                    'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($title, 32))
+                    'thumbnail' => $OUTPUT->pix_url(file_extension_icon($title, 32))
                 );
             }
         }
diff --git a/lib/listlib.php b/lib/listlib.php
index 3e2cfd84b0d..b9e57c29a9b 100644
--- a/lib/listlib.php
+++ b/lib/listlib.php
@@ -603,12 +603,12 @@ class list_item {
     function image_icon($action, $url, $icon) {
         global $OUTPUT;
         return '<a title="' . $action .'" href="'.$url.'">
-                <img src="' . $OUTPUT->old_icon_url('t/'.$icon) . '" class="iconsmall" alt="' . $action. '" /></a> ';
+                <img src="' . $OUTPUT->pix_url('t/'.$icon) . '" class="iconsmall" alt="' . $action. '" /></a> ';
     }
 
     function image_spacer() {
         global $OUTPUT;
-        return '<img src="' . $OUTPUT->old_icon_url('spacer') . '" class="iconsmall" alt="" />';
+        return '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" />';
     }
 
     /**
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 5cbebc94c62..997f09f95ba 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -135,7 +135,7 @@ class navigation_node {
      * $properties['text'] = 'This is a new nav item';
      * $properties['short'] = 'This is a new nav item';
      * $properties['action'] = moodle_url($CFG->wwwroot.'/course/category.php');
-     * $properties['icon'] = $OUTPUT->old_icon_url('i/course');
+     * $properties['icon'] = $OUTPUT->pix_url('i/course');
      * $properties['type'] = navigation_node::TYPE_COURSE;
      * $properties['key'] = 'newitem';
      * $PAGE->navigation->newitem = $properties;
@@ -1092,7 +1092,7 @@ class global_navigation extends navigation_node {
             $icon = null;
             if (!in_array($module->modname, $resources)) {
                 if ($module->icon=='') {
-                    $icon = $OUTPUT->old_icon_url('icon', $module->modname);
+                    $icon = $OUTPUT->pix_url('icon', $module->modname);
                 }
                 $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 $type = navigation_node::TYPE_ACTIVITY;
@@ -1103,7 +1103,7 @@ class global_navigation extends navigation_node {
                     $url = new moodle_url('/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 }
                 if ($module->icon!=='') {
-                    $icon = $OUTPUT->old_icon_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
+                    $icon = $OUTPUT->pix_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
                 }
             }
             $this->add_to_path($keys, $module->id, $module->name, $module->name, $type, $url, $icon);
@@ -1154,7 +1154,7 @@ class global_navigation extends navigation_node {
             $icon = null;
             if (!in_array($module->modname, $resources)) {
                 if ($module->icon=='') {
-                    $icon = $OUTPUT->old_icon_url('icon', $module->modname);
+                    $icon = $OUTPUT->pix_url('icon', $module->modname);
                 }
                 $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 $type = navigation_node::TYPE_ACTIVITY;
@@ -1165,7 +1165,7 @@ class global_navigation extends navigation_node {
                     $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 }
                 if ($module->icon!=='') {
-                    $icon = $OUTPUT->old_icon_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
+                    $icon = $OUTPUT->pix_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
                 }
             }
             $path = $keys;
@@ -1364,7 +1364,7 @@ class global_navigation extends navigation_node {
                     $category = $this->find_child($categoryid);
                 }
                 if ($category!==false) {
-                    $coursekey = $category->add($course->fullname, $url, self::TYPE_COURSE, $course->shortname, $course->id, $OUTPUT->old_icon_url('i/course'));
+                    $coursekey = $category->add($course->fullname, $url, self::TYPE_COURSE, $course->shortname, $course->id, $OUTPUT->pix_url('i/course'));
                     if (!$course->visible) {
                         $category->get($course->id)->hidden = true;
                     }
@@ -1404,7 +1404,7 @@ class global_navigation extends navigation_node {
                 return;
             }
             $url = new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id));
-            $keys[] = $this->add_to_path($keys, $course->id, $course->fullname, $course->shortname, self::TYPE_COURSE, $url, $OUTPUT->old_icon_url('i/course'));
+            $keys[] = $this->add_to_path($keys, $course->id, $course->fullname, $course->shortname, self::TYPE_COURSE, $url, $OUTPUT->pix_url('i/course'));
             $currentcourse = $this->find_child($course->id, self::TYPE_COURSE);
             if ($currentcourse!==false){
                 $currentcourse->make_active();
@@ -1419,7 +1419,7 @@ class global_navigation extends navigation_node {
                     if ($participants) {
                         $participants->mainnavonly = true;
                         $url = new moodle_url($CFG->wwwroot.'/user/index.php?id='.$course->id);
-                        $participants->add(get_string('participantslist'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/users'));
+                        $participants->add(get_string('participantslist'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/users'));
 
                         require_once($CFG->dirroot.'/blog/lib.php');
 
@@ -1446,7 +1446,7 @@ class global_navigation extends navigation_node {
 
                 // View course reports
                 if (has_capability('moodle/site:viewreports', $this->context)) { // basic capability for listing of reports
-                    $reportkey = $currentcourse->add(get_string('reports'), new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)), self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/stats'));
+                    $reportkey = $currentcourse->add(get_string('reports'), new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)), self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/stats'));
                     $reportnav = $currentcourse->get($reportkey);
                     if ($reportnav) {
                         $coursereports = get_plugin_list('coursereport');
@@ -2026,7 +2026,7 @@ class limited_global_navigation extends global_navigation {
             $icon = null;
             if (!in_array($module->modname, $resources)) {
                 if ($module->icon=='') {
-                    $icon = $OUTPUT->old_icon_url('icon', $module->modname);
+                    $icon = $OUTPUT->pix_url('icon', $module->modname);
                 }
                 $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 $type = navigation_node::TYPE_ACTIVITY;
@@ -2037,7 +2037,7 @@ class limited_global_navigation extends global_navigation {
                     $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
                 }
                 if ($module->icon!=='') {
-                    $icon = $OUTPUT->old_icon_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
+                    $icon = $OUTPUT->pix_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
                 }
             }
             $this->add_to_path($keys, $module->id, $module->name, $module->name, $type, $url, $icon);
@@ -2428,7 +2428,7 @@ class settings_navigation extends navigation_node {
             $realuser = session_get_realuser();
             // Add the informative return to original user link
             $url = new moodle_url($CFG->wwwroot.'/course/loginas.php',array('id'=>$this->page->course->id, 'return'=>1,'sesskey'=>sesskey()));
-            $this->add(get_string('returntooriginaluser', 'moodle', fullname($realuser, true)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('t/left'));
+            $this->add(get_string('returntooriginaluser', 'moodle', fullname($realuser, true)), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('t/left'));
         }
 
         // Make sure the first child doesnt have proceed with hr set to true
@@ -2553,7 +2553,7 @@ class settings_navigation extends navigation_node {
                     $this->load_administration_settings($reference, $branch);
                 }
             } else {
-                $reference->icon = $OUTPUT->old_icon_url('i/settings');
+                $reference->icon = $OUTPUT->pix_url('i/settings');
             }
         }
     }
@@ -2657,7 +2657,7 @@ class settings_navigation extends navigation_node {
                 $url->param('edit', 'on');
                 $editstring = get_string('turneditingon');
             }
-            $coursenode->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/edit'));
+            $coursenode->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/edit'));
 
             if ($this->page->user_is_editing()) {
                 // Add `add` resources|activities branches
@@ -2740,16 +2740,16 @@ class settings_navigation extends navigation_node {
 
             // Add the course settings link
             $url = new moodle_url($CFG->wwwroot.'/course/edit.php', array('id'=>$course->id));
-            $coursenode->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/settings'));
+            $coursenode->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/settings'));
         }
 
         // Add assign or override roles if allowed
         if (has_capability('moodle/role:assign', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php', array('contextid'=>$course->context->id));
-            $coursenode->add(get_string('assignroles', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/roles'));
+            $coursenode->add(get_string('assignroles', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/roles'));
         } else if (get_overridable_roles($course->context, ROLENAME_ORIGINAL)) {
             $url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php', array('contextid'=>$course->context->id));
-            $coursenode->add(get_string('overridepermissions', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/roles'));
+            $coursenode->add(get_string('overridepermissions', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/roles'));
         }
 
         // Add view grade report is permitted
@@ -2771,22 +2771,22 @@ class settings_navigation extends navigation_node {
         }
         if ($reportavailable) {
             $url = new moodle_url($CFG->wwwroot.'/grade/report/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/grades'));
+            $coursenode->add(get_string('grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/grades'));
         }
 
         //  Add outcome if permitted
         if (!empty($CFG->enableoutcomes) && has_capability('moodle/course:update', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/grade/edit/outcome/course.php', array('id'=>$course->id));
-            $coursenode->add(get_string('outcomes', 'grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/outcomes'));
+            $coursenode->add(get_string('outcomes', 'grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/outcomes'));
         }
 
         // Add meta course links
         if ($course->metacourse) {
             if (has_capability('moodle/course:managemetacourse', $course->context)) {
                 $url = new moodle_url($CFG->wwwroot.'/course/importstudents.php', array('id'=>$course->id));
-                $coursenode->add(get_string('childcourses'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/course'));
+                $coursenode->add(get_string('childcourses'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/course'));
             } else if (has_capability('moodle/role:assign', $course->context)) {
-                $key = $coursenode->add(get_string('childcourses'), null,  self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/course'));
+                $key = $coursenode->add(get_string('childcourses'), null,  self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/course'));
                 $coursenode->get($key)->hidden = true;;
             }
         }
@@ -2794,31 +2794,31 @@ class settings_navigation extends navigation_node {
         // Manage groups in this course
         if (($course->groupmode || !$course->groupmodeforce) && has_capability('moodle/course:managegroups', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/group/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('groups'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/group'));
+            $coursenode->add(get_string('groups'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/group'));
         }
 
         // Backup this course
         if (has_capability('moodle/site:backup', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/backup/backup.php', array('id'=>$course->id));
-            $coursenode->add(get_string('backup'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/backup'));
+            $coursenode->add(get_string('backup'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/backup'));
         }
 
         // Restore to this course
         if (has_capability('moodle/site:restore', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/files/index.php', array('id'=>$course->id, 'wdir'=>'/backupdata'));
-            $coursenode->add(get_string('restore'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/restore'));
+            $coursenode->add(get_string('restore'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/restore'));
         }
 
         // Import data from other courses
         if (has_capability('moodle/site:import', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/course/import.php', array('id'=>$course->id));
-            $coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/restore'));
+            $coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/restore'));
         }
 
         // Reset this course
         if (has_capability('moodle/course:reset', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/course/reset.php', array('id'=>$course->id));
-            $coursenode->add(get_string('reset'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/return'));
+            $coursenode->add(get_string('reset'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/return'));
         }
 
         // Manage questions
@@ -2836,7 +2836,7 @@ class settings_navigation extends navigation_node {
         }
         if (isset($questionlink)) {
             $url = new moodle_url($questionlink, array('courseid'=>$course->id));
-            $coursenode->add(get_string('questions','quiz'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/questions'));
+            $coursenode->add(get_string('questions','quiz'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/questions'));
         }
 
         // Repository Instances
@@ -2844,25 +2844,25 @@ class settings_navigation extends navigation_node {
         $editabletypes = repository::get_editable_types($this->context);
         if (has_capability('moodle/course:update', $this->context) && !empty($editabletypes)) {
             $url = new moodle_url($CFG->wwwroot.'/repository/manage_instances.php', array('contextid'=>$this->context->id));
-            $coursenode->add(get_string('repositories'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/repository'));
+            $coursenode->add(get_string('repositories'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/repository'));
         }
 
         // Manage files
         if (has_capability('moodle/course:managefiles', $this->context)) {
             $url = new moodle_url($CFG->wwwroot.'/files/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('files'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/files'));
+            $coursenode->add(get_string('files'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/files'));
         }
 
         // Authorize hooks
         if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
             require_once($CFG->dirroot.'/enrol/authorize/const.php');
             $url = new moodle_url($CFG->wwwroot.'/enrol/authorize/index.php', array('course'=>$course->id));
-            $coursenode->add(get_string('payments'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/payment'));
+            $coursenode->add(get_string('payments'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/payment'));
             if (has_capability('enrol/authorize:managepayments', $this->page->context)) {
                 $cnt = $DB->count_records('enrol_authorize', array('status'=>AN_STATUS_AUTH, 'courseid'=>$course->id));
                 if ($cnt) {
                     $url = new moodle_url($CFG->wwwroot.'/enrol/authorize/index.php', array('course'=>$course->id,'status'=>AN_STATUS_AUTH));
-                    $coursenode->add(get_string('paymentpending', 'moodle', $cnt), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/payment'));
+                    $coursenode->add(get_string('paymentpending', 'moodle', $cnt), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/payment'));
                 }
             }
         }
@@ -2871,17 +2871,17 @@ class settings_navigation extends navigation_node {
         if (empty($course->metacourse)) {
             if (has_capability('moodle/legacy:guest', $this->context, NULL, false)) {   // Are a guest now
                 $url = new moodle_url($CFG->wwwroot.'/course/enrol.php', array('id'=>$course->id));
-                $coursenode->add(get_string('enrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
+                $coursenode->add(get_string('enrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/user'));
             } else if (has_capability('moodle/role:unassignself', $this->context, NULL, false) && get_user_roles($this->context, 0, false)) {  // Have some role
                 $url = new moodle_url($CFG->wwwroot.'/course/unenrol.php', array('id'=>$course->id));
-                $coursenode->add(get_string('unenrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
+                $coursenode->add(get_string('unenrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/user'));
             }
         }
 
         // Link to the user own profile (except guests)
         if (!isguestuser() and isloggedin()) {
             $url = new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$USER->id, 'course'=>$course->id));
-            $coursenode->add(get_string('profile'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
+            $coursenode->add(get_string('profile'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/user'));
         }
 
         // Switch roles
@@ -2911,7 +2911,7 @@ class settings_navigation extends navigation_node {
             $SESSION->returnurl = serialize($returnurl);
             foreach ($roles as $key=>$name) {
                 $url = new moodle_url($CFG->wwwroot.'/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>$key, 'returnurl'=>'1'));
-                $this->get($switchroleskey)->add($name, $url, self::TYPE_SETTING, null, $key, $OUTPUT->old_icon_url('i/roles'));
+                $this->get($switchroleskey)->add($name, $url, self::TYPE_SETTING, null, $key, $OUTPUT->pix_url('i/roles'));
             }
         }
         // Return we are done
@@ -3236,17 +3236,17 @@ class settings_navigation extends navigation_node {
                 $url->param('edit', 'on');
                 $editstring = get_string('turneditingon');
             }
-            $this->get($frontpage)->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/edit'));
+            $this->get($frontpage)->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/edit'));
 
             // Add the course settings link
             $url = new moodle_url($CFG->wwwroot.'/admin/settings.php', array('section'=>'frontpagesettings'));
-            $this->get($frontpage)->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/settings'));
+            $this->get($frontpage)->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/settings'));
         }
 
         //Participants
         if (has_capability('moodle/site:viewparticipants', $course->context)) {
             $url = new moodle_url($CFG->wwwroot.'/user/index.php?contextid='.$course->context->id);
-            $this->get($frontpage)->add(get_string('participants'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/users'));
+            $this->get($frontpage)->add(get_string('participants'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/users'));
         }
     }
 
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index 0ea76617951..39c1a303657 100644
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -1923,7 +1923,7 @@ class moodle_user_picture extends moodle_html_component {
             $this->image->src = new moodle_url(get_file_url($this->user->id.'/'.$file.'.jpg', null, 'user'));
         } else { // Print default user pictures (use theme version if available)
             $this->add_class('defaultuserpic');
-            $this->image->src = $OUTPUT->old_icon_url('u/' . $file);
+            $this->image->src = $OUTPUT->pix_url('u/' . $file);
         }
 
         if ($this->alttext) {
@@ -2040,7 +2040,7 @@ class moodle_help_icon extends labelled_html_component {
             if ($image instanceof moodle_url) {
                 $this->image->src = $image->out();
             } else if ($image === true) {
-                $this->image->src = $OUTPUT->old_icon_url('help');
+                $this->image->src = $OUTPUT->pix_url('help');
             } else if (is_string($image)) {
                 $this->image->src = $image;
             }
@@ -2056,7 +2056,7 @@ class moodle_help_icon extends labelled_html_component {
             if (!($this->image instanceof html_image)) {
                 $this->image = new html_image();
             }
-            $this->image->src = $OUTPUT->old_icon_url('help');
+            $this->image->src = $OUTPUT->pix_url('help');
         }
 
         parent::prepare();
@@ -2233,7 +2233,7 @@ class block_contents extends moodle_html_component {
     /**
      * A (possibly empty) array of editing controls. Each element of this array
      * should be an array('url' => $url, 'icon' => $icon, 'caption' => $caption).
-     * $icon is the icon name. Fed to $OUTPUT->old_icon_url.
+     * $icon is the icon name. Fed to $OUTPUT->pix_url.
      * @var array
      */
     public $controls = array();
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 213d175f74f..d89da02703c 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -149,12 +149,6 @@ class renderer_base {
         return $classes;
     }
 
-    /** OBSOLETED: to be removed soon */
-    public function old_icon_url($iconname, $component='moodle', $escaped=true) {
-        $url = $this->page->theme->pix_url($iconname, $component);
-        return $url->out(false, array(), $escaped);
-    }
-
     /**
      * Return the moodle_url for an image
      *
diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php
index 0558866f777..849f62cdbd7 100644
--- a/lib/portfoliolib.php
+++ b/lib/portfoliolib.php
@@ -341,11 +341,11 @@ class portfolio_add_button {
             break;
             case PORTFOLIO_ADD_ICON_FORM:
                 $formoutput .= $selectoutput;
-                $formoutput .= "\n" . '<input type="image" src="' . $OUTPUT->old_icon_url('t/portfolio') . '" alt=' . $addstr .'" />';
+                $formoutput .= "\n" . '<input type="image" src="' . $OUTPUT->pix_url('t/portfolio') . '" alt=' . $addstr .'" />';
                 $formoutput .= "\n" . '</form>';
             break;
             case PORTFOLIO_ADD_ICON_LINK:
-                $linkoutput .= '"><img src="' . $OUTPUT->old_icon_url('t/portfolio') . '" alt=' . $addstr .'" /></a>';
+                $linkoutput .= '"><img src="' . $OUTPUT->pix_url('t/portfolio') . '" alt=' . $addstr .'" /></a>';
             break;
             case PORTFOLIO_ADD_TEXT_LINK:
                 $linkoutput .= '">' . $addstr .'</a>';
diff --git a/lib/questionlib.php b/lib/questionlib.php
index fdeaaab0b5f..617881c0ae6 100644
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -1468,7 +1468,7 @@ function question_get_feedback_image($fraction, $selected=true) {
         $size = 'small';
     }
     $class = question_get_feedback_class($fraction);
-    return '<img src="' . $OUTPUT->old_icon_url('i/' . $icons[$class] . '_' . $size) .
+    return '<img src="' . $OUTPUT->pix_url('i/' . $icons[$class] . '_' . $size) .
             '" alt="' . get_string($class, 'quiz') . '" class="icon" />';
 }
 
@@ -2099,8 +2099,8 @@ function question_init_qengine_js() {
     global $CFG, $PAGE, $OUTPUT;
     $config = array(
         'actionurl' => $CFG->wwwroot . '/question/toggleflag.php',
-        'flagicon' => $OUTPUT->old_icon_url('i/flagged'),
-        'unflagicon' => $OUTPUT->old_icon_url('i/unflagged'),
+        'flagicon' => $OUTPUT->pix_url('i/flagged'),
+        'unflagicon' => $OUTPUT->pix_url('i/unflagged'),
         'flagtooltip' => get_string('clicktoflag', 'question'),
         'unflagtooltip' => get_string('clicktounflag', 'question'),
         'flaggedalt' => get_string('flagged', 'question'),
diff --git a/lib/rsslib.php b/lib/rsslib.php
index b9858b309d8..93abb3bf915 100644
--- a/lib/rsslib.php
+++ b/lib/rsslib.php
@@ -42,7 +42,7 @@ function rss_get_link($courseid, $userid, $modulename, $id, $tooltiptext='') {
     }
 
     $rsspath = rss_get_url($courseid, $userid, $modulename, $id);
-    $rsspix = $OUTPUT->old_icon_url('i/rss');
+    $rsspix = $OUTPUT->pix_url('i/rss');
 
     return '<a href="'. $rsspath .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a>';
 
@@ -214,7 +214,7 @@ function rss_standard_header($title = NULL, $link = NULL, $description = NULL) {
        */
 
         //write image info
-        $rsspix = $OUTPUT->old_icon_url('i/rsssitelogo');
+        $rsspix = $OUTPUT->pix_url('i/rsssitelogo');
 
         //write the info
         $result .= rss_start_tag('image', 2, true);
diff --git a/lib/tablelib.php b/lib/tablelib.php
index 3956e6eeadc..7dd5c269f49 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -1025,11 +1025,11 @@ class flexible_table {
             if($this->is_collapsible) {
                 if(!empty($this->sess->collapse[$column])) {
                     // some headers contain < br/> tags, do not include in title
-                    $icon_hide = ' <a href="'.$this->baseurl.$this->request[TABLE_VAR_SHOW].'='.$column.'"><img src="'.$OUTPUT->old_icon_url('t/switch_plus') . '" title="'.get_string('show').' '.strip_tags($this->headers[$index]).'" alt="'.get_string('show').'" /></a>';
+                    $icon_hide = ' <a href="'.$this->baseurl.$this->request[TABLE_VAR_SHOW].'='.$column.'"><img src="'.$OUTPUT->pix_url('t/switch_plus') . '" title="'.get_string('show').' '.strip_tags($this->headers[$index]).'" alt="'.get_string('show').'" /></a>';
                 }
                 else if($this->headers[$index] !== NULL) {
                     // some headers contain < br/> tags, do not include in title
-                    $icon_hide = ' <a href="'.$this->baseurl.$this->request[TABLE_VAR_HIDE].'='.$column.'"><img src="'.$OUTPUT->old_icon_url('t/switch_minus') . '" title="'.get_string('hide').' '.strip_tags($this->headers[$index]).'" alt="'.get_string('hide').'" /></a>';
+                    $icon_hide = ' <a href="'.$this->baseurl.$this->request[TABLE_VAR_HIDE].'='.$column.'"><img src="'.$OUTPUT->pix_url('t/switch_minus') . '" title="'.get_string('hide').' '.strip_tags($this->headers[$index]).'" alt="'.get_string('hide').'" /></a>';
                 }
             }
 
@@ -1048,22 +1048,22 @@ class flexible_table {
                     if($primary_sort_column == 'firstname') {
                         $lsortorder = get_string('asc');
                         if($primary_sort_order == SORT_ASC) {
-                            $icon_sort_first = ' <img src="'.$OUTPUT->old_icon_url('t/down') . '" alt="'.get_string('asc').'" />';
+                            $icon_sort_first = ' <img src="'.$OUTPUT->pix_url('t/down') . '" alt="'.get_string('asc').'" />';
                             $fsortorder = get_string('asc');
                         }
                         else {
-                            $icon_sort_first = ' <img src="'.$OUTPUT->old_icon_url('t/up') . '" alt="'.get_string('desc').'" />';
+                            $icon_sort_first = ' <img src="'.$OUTPUT->pix_url('t/up') . '" alt="'.get_string('desc').'" />';
                             $fsortorder = get_string('desc');
                         }
                     }
                     else if($primary_sort_column == 'lastname') {
                         $fsortorder = get_string('asc');
                         if($primary_sort_order == SORT_ASC) {
-                            $icon_sort_last = ' <img src="'.$OUTPUT->old_icon_url('t/down') . '" alt="'.get_string('asc').'" />';
+                            $icon_sort_last = ' <img src="'.$OUTPUT->pix_url('t/down') . '" alt="'.get_string('asc').'" />';
                             $lsortorder = get_string('asc');
                         }
                         else {
-                            $icon_sort_last = ' <img src="'.$OUTPUT->old_icon_url('t/up') . '" alt="'.get_string('desc').'" />';
+                            $icon_sort_last = ' <img src="'.$OUTPUT->pix_url('t/up') . '" alt="'.get_string('desc').'" />';
                             $lsortorder = get_string('desc');
                         }
                     } else {
@@ -1083,11 +1083,11 @@ class flexible_table {
                 if($this->is_sortable($column)) {
                     if($primary_sort_column == $column) {
                         if($primary_sort_order == SORT_ASC) {
-                            $icon_sort = ' <img src="'.$OUTPUT->old_icon_url('t/down') . '" alt="'.get_string('asc').'" />';
+                            $icon_sort = ' <img src="'.$OUTPUT->pix_url('t/down') . '" alt="'.get_string('asc').'" />';
                             $localsortorder = get_string('asc');
                         }
                         else {
-                            $icon_sort = ' <img src="'.$OUTPUT->old_icon_url('t/up') . '" alt="'.get_string('desc').'" />';
+                            $icon_sort = ' <img src="'.$OUTPUT->pix_url('t/up') . '" alt="'.get_string('desc').'" />';
                             $localsortorder = get_string('desc');
                         }
                     } else {
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index dc9d70ff527..41f4c901d9c 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -1025,7 +1025,7 @@ function print_upgrade_reload($url) {
 
     echo "<br />";
     echo '<div class="continuebutton">';
-    echo '<a href="'.$url.'" title="'.get_string('reload').'" ><img src="'.$OUTPUT->old_icon_url('i/reload') . '" alt="" /> '.get_string('reload').'</a>';
+    echo '<a href="'.$url.'" title="'.get_string('reload').'" ><img src="'.$OUTPUT->pix_url('i/reload') . '" alt="" /> '.get_string('reload').'</a>';
     echo '</div><br />';
 }
 
diff --git a/lib/weblib.php b/lib/weblib.php
index bb22e1aefb3..9a5d1afa6d3 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -478,7 +478,7 @@ class moodle_url {
      * @return string
      */
     public function __toString() {
-        $this->out(false, null, true);
+        return $this->out(false, null, true);
     }
 
     /**
@@ -508,6 +508,15 @@ class moodle_url {
         return $uri;
     }
 
+    /**
+     * Returns url in raw form without any escaping,
+     * useful especially when including urls and images in javascript.
+     * @return string
+     */
+    public function out_raw() {
+        $this->out(false, null, false);
+    }
+
     /**
      * Return a URL relative to $CFG->wwwroot.
      *
@@ -1560,7 +1569,7 @@ function replace_smilies(&$text) {
             $alttext = get_string($image, 'pix');
             $alttext = preg_replace('/^\[\[(.*)\]\]$/', '$1', $alttext); /// Clean alttext in case there isn't lang string for it.
             $e[$lang][] = $emoticon;
-            $img[$lang][] = '<img alt="'. $alttext .'" width="15" height="15" src="'. $OUTPUT->old_icon_url('s/' . $image) . '" />';
+            $img[$lang][] = '<img alt="'. $alttext .'" width="15" height="15" src="'. $OUTPUT->pix_url('s/' . $image) . '" />';
         }
     }
 
@@ -1608,7 +1617,7 @@ function get_emoticons_list_for_help_file() {
     $output = '<ul id="emoticonlist">';
     foreach ($items as $item) {
         $item = explode('{:}', $item);
-        $output .= '<li><img src="' . $OUTPUT->old_icon_url('s/' . $item[1]) . '" alt="' .
+        $output .= '<li><img src="' . $OUTPUT->pix_url('s/' . $item[1]) . '" alt="' .
                 $item[0] . '" /><code>' . $item[0] . '</code></li>';
     }
     $output .= '</ul>';
@@ -2124,7 +2133,7 @@ function print_collapsible_region_start($classes, $id, $caption, $userpref = fal
     $output .= '</div><div id="' . $id . '_inner" class="collapsibleregioninner">';
     $PAGE->requires->js_function_call('new collapsible_region',
             array($id, $userpref, get_string('clicktohideshow'),
-            $OUTPUT->old_icon_url('t/collapsed'), $OUTPUT->old_icon_url('t/expanded')));
+            $OUTPUT->pix_url('t/collapsed'), $OUTPUT->pix_url('t/expanded')));
 
     if ($return) {
         return $output;
@@ -2480,7 +2489,7 @@ function navmenulist($course, $sections, $modinfo, $strsection, $strjumpto, $wid
         $class = 'activity '.$mod->modname;
         $class .= ($cmid == $mod->id) ? ' selected' : '';
         $menu[] = '<li class="'.$class.'">'.
-                  '<img src="'.$OUTPUT->old_icon_url('icon', $mod->modname) . '" alt="" />'.
+                  '<img src="'.$OUTPUT->pix_url('icon', $mod->modname) . '" alt="" />'.
                   '<a href="'.$CFG->wwwroot.'/mod/'.$url.'">'.$mod->name.'</a></li>';
     }
 
@@ -2527,7 +2536,7 @@ function print_grade_menu($courseid, $name, $current, $includenograde=true, $ret
     }
     $output .= $OUTPUT->select(html_select::make($grades, $name, $current, false));
 
-    $linkobject = '<span class="helplink"><img class="iconhelp" alt="'.$strscales.'" src="'.$OUTPUT->old_icon_url('help') . '" /></span>';
+    $linkobject = '<span class="helplink"><img class="iconhelp" alt="'.$strscales.'" src="'.$OUTPUT->pix_url('help') . '" /></span>';
     $link = html_link::make('/course/scales.php?id='. $courseid .'&list=true', $linkobject);
     $link->add_action(new popup_action('click', $link->url, 'ratingscales', array('height' => 400, 'width' => 500)));
     $link->title = $strscales;
@@ -2618,7 +2627,7 @@ function editorhelpbutton(){
     $alttag = join (', ', $titles);
 
     $paramstring = join('&', $urlparams);
-    $linkobject = '<img alt="'.$alttag.'" class="iconhelp" src="'.$OUTPUT->old_icon_url('help') . '" />';
+    $linkobject = '<img alt="'.$alttag.'" class="iconhelp" src="'.$OUTPUT->pix_url('help') . '" />';
     $link = html_link::make(s('/lib/form/editorhelp.php?'.$paramstring), $linkobject);
     $link->add_action(new popup_action('click', $link->url, 'popup', array('height' => 400, 'width' => 500)));
     $link->title = $alttag;
@@ -2646,7 +2655,7 @@ function emoticonhelpbutton($form, $field, $return = false) {
     $SESSION->inserttextform = $form;
     $SESSION->inserttextfield = $field;
     $helpicon = moodle_help_icon::make('emoticons2', get_string('helpemoticons'), 'moodle', true);
-    $helpicon->image->src = $OUTPUT->old_icon_url('s/smiley');
+    $helpicon->image->src = $OUTPUT->pix_url('s/smiley');
     $helpicon->image->add_class('emoticon');
     $helpicon->style = "margin-left:3px; padding-right:1px;width:15px;height:15px;";
     $help = $OUTPUT->help_icon($helpicon);
diff --git a/message/lib.php b/message/lib.php
index a62fec30c90..9ab1f2ad995 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -605,7 +605,7 @@ function message_contact_link($userid, $linktype='add', $return=false, $script="
     $output = '<span class="'.$linktype.'">'.
               '<a href="'.$script.'&amp;'.$command.'='.$userid.
               '&amp;sesskey='.sesskey().'" title="'.s($string).'">'.
-              '<img src="'.$OUTPUT->old_icon_url($icon).'" class="iconsmall" alt="'.s($alttext).'" />'.
+              '<img src="'.$OUTPUT->pix_url($icon).'" class="iconsmall" alt="'.s($alttext).'" />'.
               $text.'</a></span>';
 
     if ($return) {
@@ -636,9 +636,9 @@ function message_history_link($userid1, $userid2=0, $returnstr=false, $keywords=
     }
 
     if ($linktext == 'icon') {  // Icon only
-        $fulllink = '<img src="'.$OUTPUT->old_icon_url('t/log') . '" class="iconsmall" alt="'.$strmessagehistory.'" />';
+        $fulllink = '<img src="'.$OUTPUT->pix_url('t/log') . '" class="iconsmall" alt="'.$strmessagehistory.'" />';
     } else if ($linktext == 'both') {  // Icon and standard name
-        $fulllink = '<img src="'.$OUTPUT->old_icon_url('t/log') . '" class="iconsmall" alt="" />';
+        $fulllink = '<img src="'.$OUTPUT->pix_url('t/log') . '" class="iconsmall" alt="" />';
         $fulllink .= '&nbsp;'.$strmessagehistory;
     } else if ($linktext) {    // Custom name
         $fulllink = $linktext;
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 151627fbde2..0f6688ab821 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1811,7 +1811,7 @@ class assignment_base {
                 $found = true;
                 $mimetype = $file->get_mimetype();
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
-                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
+                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
                 if ($this->portfolio_exportable() && has_capability('mod/assignment:exportownsubmission', $this->context)) {
                     $button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id, 'fileid' => $file->get_id()), '/mod/assignment/locallib.php');
                     $button->set_format_by_file($file);
@@ -2897,7 +2897,7 @@ function assignment_print_recent_mod_activity($activity, $courseid, $detail, $mo
     if ($detail) {
         $modname = $modnames[$activity->type];
         echo '<div class="title">';
-        echo "<img src=\"" . $OUTPUT->old_icon_url('icon', 'assignment') . "\" ".
+        echo "<img src=\"" . $OUTPUT->pix_url('icon', 'assignment') . "\" ".
              "class=\"icon\" alt=\"$modname\">";
         echo "<a href=\"$CFG->wwwroot/mod/assignment/view.php?id={$activity->cmid}\">{$activity->name}</a>";
         echo '</div>';
diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index 72e3bd7003b..f8bc8689bc7 100644
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -198,7 +198,7 @@ class assignment_online extends assignment_base {
         $popup = $OUTPUT->link($link);
 
         $output = '<div class="files">'.
-                  '<img src="'.$OUTPUT->old_icon_url('f/html') . '" class="icon" alt="html" />'.
+                  '<img src="'.$OUTPUT->pix_url('f/html') . '" class="icon" alt="html" />'.
                   $popup .
                   '</div>';
                   return $output;
@@ -217,7 +217,7 @@ class assignment_online extends assignment_base {
         $popup = $OUTPUT->link($link);
 
         $output = '<div class="files">'.
-                  '<img align="middle" src="'.$OUTPUT->old_icon_url('f/html') . '" height="16" width="16" alt="html" />'.
+                  '<img align="middle" src="'.$OUTPUT->pix_url('f/html') . '" height="16" width="16" alt="html" />'.
                   $popup .
                   '</div>';
 
diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 056cfcb12e5..6fd015f43e5 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -291,7 +291,7 @@ class assignment_upload extends assignment_base {
                 $found = true;
                 $mimetype = $file->get_mimetype();
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
-                $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a>&nbsp;';
+                $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a>&nbsp;';
 
             }
 
@@ -350,13 +350,13 @@ class assignment_upload extends assignment_base {
                 $filename = $file->get_filename();
                 $mimetype = $file->get_mimetype();
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
-                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
+                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
 
                 if ($candelete) {
                     $delurl  = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=".rawurlencode($filename)."&amp;userid={$submission->userid}&amp;mode=$mode&amp;offset=$offset";
 
                     $output .= '<a href="'.$delurl.'">&nbsp;'
-                              .'<img title="'.$strdelete.'" src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="" /></a> ';
+                              .'<img title="'.$strdelete.'" src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="" /></a> ';
                 }
 
                 if (has_capability('mod/assignment:exportownsubmission', $this->context)) {
@@ -412,13 +412,13 @@ class assignment_upload extends assignment_base {
                 $mimetype = $file->get_mimetype();
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_response/'.$userid.'/'.$filename);
 
-                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.$filename.'</a>';
+                $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.$filename.'</a>';
 
                 if ($candelete) {
                     $delurl  = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=".rawurlencode($filename)."&amp;userid=$userid&amp;mode=$mode&amp;offset=$offset&amp;action=response";
 
                     $output .= '<a href="'.$delurl.'">&nbsp;'
-                              .'<img title="'.$strdelete.'" src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt=""/></a> ';
+                              .'<img title="'.$strdelete.'" src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt=""/></a> ';
                 }
 
                 $output .= '&nbsp;';
@@ -1090,7 +1090,7 @@ class assignment_upload extends assignment_base {
                     $filename = $file->get_filename();
                     $mimetype = $file->get_mimetype();
                     $link = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$USER->id.'/'.$filename);
-                    $node->get($filekey)->add($filename, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url(file_mimetype_icon($mimetype)));
+                    $node->get($filekey)->add($filename, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url(file_mimetype_icon($mimetype)));
                 }
             }
         }
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index fde72dd9761..cd8240d8823 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -22,7 +22,7 @@ class assignment_uploadsingle extends assignment_base {
                 $found = true;
                 $mimetype = $file->get_mimetype();
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
-                $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a><br />';
+                $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a><br />';
             }
         }
 
@@ -214,7 +214,7 @@ class assignment_uploadsingle extends assignment_base {
                     $filename = $file->get_filename();
                     $mimetype = $file->get_mimetype();
                     $link = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$USER->id.'/'.$filename);
-                    $node->get($filekey)->add($filename, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url(file_mimetype_icon($mimetype)));
+                    $node->get($filekey)->add($filename, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url(file_mimetype_icon($mimetype)));
                 }
             }
         }
diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 1b2b4ad8c28..b19b74c2b29 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -1268,7 +1268,7 @@ function chat_extend_navigation($navigation, $course, $module, $cm) {
         foreach ($links as $link) {
             $link->add_action(new popup_action('click', $link->url, 'chat'.$course->id.$cm->instance.$currentgroup, array('height' => 500, 'width' => 700)));
             $link->title = get_string('modulename', 'chat');
-            $navigation->add($link->title, $link, navigation_node::TYPE_ACTIVITY, null ,null, $OUTPUT->old_icon_url('c/group'));
+            $navigation->add($link->title, $link, navigation_node::TYPE_ACTIVITY, null ,null, $OUTPUT->pix_url('c/group'));
         }
     }
 
@@ -1278,7 +1278,7 @@ function chat_extend_navigation($navigation, $course, $module, $cm) {
         $users = $navigation->get($userskey);
         foreach ($chatusers as $chatuser) {
             $userlink = new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$chatuser->id,'course'=>$course->id));
-            $users->add(fullname($chatuser).' '.format_time(time() - $chatuser->lastmessageping), $userlink, navigation_node::TYPE_USER, null, null, $OUTPUT->old_icon_url('c/user'));
+            $users->add(fullname($chatuser).' '.format_time(time() - $chatuser->lastmessageping), $userlink, navigation_node::TYPE_USER, null, null, $OUTPUT->pix_url('c/user'));
         }
     }
 }
diff --git a/mod/data/field.php b/mod/data/field.php
index 1dd9bf4354c..23cfce676e9 100755
--- a/mod/data/field.php
+++ b/mod/data/field.php
@@ -290,10 +290,10 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) {          ///
                 shorten_text($field->field->description, 30),
 
                 '<a href="field.php?d='.$data->id.'&amp;mode=display&amp;fid='.$field->field->id.'&amp;sesskey='.sesskey().'">'.
-                '<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>'.
+                '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>'.
                 '&nbsp;'.
                 '<a href="field.php?d='.$data->id.'&amp;mode=delete&amp;fid='.$field->field->id.'&amp;sesskey='.sesskey().'">'.
-                '<img src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>'
+                '<img src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>'
 
                 );
             }
diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php
index b449385e390..b7c46cb58f6 100755
--- a/mod/data/field/file/field.class.php
+++ b/mod/data/field/file/field.class.php
@@ -60,7 +60,7 @@ class data_field_file extends data_field_base {
             // Print icon if file already exists
             $browser = get_file_browser();
             $src     = file_encode_url($CFG->wwwroot.'/pluginfile.php', $this->context->id.'/data_content/'.$content->id.'/'.$file->get_filename());
-            $str .= '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($file->get_mimetype())).'" class="icon" alt="'.$file->get_mimetype().'" />'.
+            $str .= '<img src="'.$OUTPUT->pix_url(file_mimetype_icon($file->get_mimetype())).'" class="icon" alt="'.$file->get_mimetype().'" />'.
                     '<a href="'.$src.'" >'.s($file->get_filename()).'</a>';
         }
         return $str;
@@ -121,7 +121,7 @@ class data_field_file extends data_field_base {
         $width  = $this->field->param1 ? ' width  = "'.s($this->field->param1).'" ':' ';
         $height = $this->field->param2 ? ' height = "'.s($this->field->param2).'" ':' ';
 
-        $str = '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($file->get_mimetype())).'" height="16" width="16" alt="'.$file->get_mimetype().'" />&nbsp;'.
+        $str = '<img src="'.$OUTPUT->pix_url(file_mimetype_icon($file->get_mimetype())).'" height="16" width="16" alt="'.$file->get_mimetype().'" />&nbsp;'.
                '<a href="'.$src.'" >'.s($name).'</a>';
         return $str;
     }
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 5b229eef4a6..d9bc28f9a7d 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -430,7 +430,7 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
         global $OUTPUT;
 
         $str = '<a href="field.php?d='.$this->data->id.'&amp;fid='.$this->field->id.'&amp;mode=display&amp;sesskey='.sesskey().'">';
-        $str .= '<img src="'.$OUTPUT->old_icon_url('/field/' . $this->type . '/icon', 'data') . '" ';
+        $str .= '<img src="'.$OUTPUT->pix_url('/field/' . $this->type . '/icon', 'data') . '" ';
         $str .= 'height="'.$this->iconheight.'" width="'.$this->iconwidth.'" alt="'.$this->type.'" title="'.$this->type.'" /></a>';
         return $str;
     }
@@ -1223,9 +1223,9 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
         $patterns[]='##delete##';
         if (has_capability('mod/data:manageentries', $context) or data_isowner($record->id)) {
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/edit.php?d='
-                             .$data->id.'&amp;rid='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>';
+                             .$data->id.'&amp;rid='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>';
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='
-                             .$data->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>';
+                             .$data->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>';
         } else {
             $replacement[] = '';
             $replacement[] = '';
@@ -1236,7 +1236,7 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
             $moreurl .= '&amp;filter=1';
         }
         $patterns[]='##more##';
-        $replacement[] = '<a href="' . $moreurl . '"><img src="' . $OUTPUT->old_icon_url('i/search') . '" class="iconsmall" alt="' . get_string('more', 'data') . '" title="' . get_string('more', 'data') . '" /></a>';
+        $replacement[] = '<a href="' . $moreurl . '"><img src="' . $OUTPUT->pix_url('i/search') . '" class="iconsmall" alt="' . get_string('more', 'data') . '" title="' . get_string('more', 'data') . '" /></a>';
 
         $patterns[]='##moreurl##';
         $replacement[] = $moreurl;
@@ -1268,7 +1268,7 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
 
         $patterns[]='##approve##';
         if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)){
-            $replacement[] = '<span class="approve"><a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;approve='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('i/approve') . '" class="icon" alt="'.get_string('approve').'" /></a></span>';
+            $replacement[] = '<span class="approve"><a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;approve='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('i/approve') . '" class="icon" alt="'.get_string('approve').'" /></a></span>';
         } else {
             $replacement[] = '';
         }
diff --git a/mod/data/preset.php b/mod/data/preset.php
index d53a7ac74e9..6d3bf2ae23a 100644
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -394,7 +394,7 @@ foreach ($presets as $id => $preset) {
     $dellink = '';
     if ($preset->userid > 0 and ($preset->userid == $USER->id || has_capability('mod/data:manageuserpresets', $context))) {
         $dellink = '&nbsp;<a href="preset.php?d='.$data->id.'&amp;action=confirmdelete&amp;fullname='.$fullname.'&amp;sesskey='.sesskey().'">'.
-                   '<img src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.$strdelete.' '.$desc.'" /></a>';
+                   '<img src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.$strdelete.' '.$desc.'" /></a>';
     }
 
     echo '<input type="radio" name="fullname" id="usepreset'.$i.'" value="'.$fullname.'" /><label for="usepreset'.$i++.'">'.$desc.'</label>'.$dellink.'<br />';
diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index 739a40c1940..4ebfdfb37a7 100644
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -116,7 +116,7 @@ if($shoulddelete == 1) {
             echo '<tr><td align="center">'.$template->name.'</td>';
             echo '<td align="center">';
             echo '<form action="'.$ME.'" method="post">';
-            echo '<input title="'.get_string('delete_template','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/delete') . '" hspace="1" height="11" width="11" border="0" />';
+            echo '<input title="'.get_string('delete_template','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/delete') . '" hspace="1" height="11" width="11" border="0" />';
             echo '<input type="hidden" name="deletetempl" value="'.$template->id.'" />';
             echo '<input type="hidden" name="shoulddelete" value="1" />';
             echo '<input type="hidden" name="id" value="'.$id.'" />';
diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index 86575a82d63..3e081b7bb89 100644
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -234,11 +234,11 @@ if($do_show == 'edit') {
                 echo '<td>';
                 $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movehere='.$moveposition);
                 echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
-                        <img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->old_icon_url('movehere') . '" />
+                        <img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
                       </a>';
 
                     // echo '<form action="'.$ME.'" method="post"><fieldset>';
-                    // echo '<input title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('movehere') . '" hspace="1" height="16" width="80" border="0" />';
+                    // echo '<input title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->pix_url('movehere') . '" hspace="1" height="16" width="80" border="0" />';
                     // echo '<input type="hidden" name="movehere" value="'.$moveposition.'" />';
                     // feedback_edit_print_default_form_values($id, $do_show);
                     // echo '</fieldset></form>';
@@ -270,12 +270,12 @@ if($do_show == 'edit') {
             if($feedbackitem->position > 1){
                 $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&moveupitem='.$feedbackitem->id);
                 echo '<a class="icon up" title="'.get_string('moveup_item','feedback').'" href="'.$buttonlink.'">
-                        <img alt="'.get_string('moveup_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/up') . '" />
+                        <img alt="'.get_string('moveup_item','feedback').'" src="'.$OUTPUT->pix_url('t/up') . '" />
                       </a>';
                 //print the button to move-up the item
                 // echo '<form action="'.$ME.'" method="post"><fieldset>';
-                // ///////echo '<input title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/up') . '" hspace="1" height="11" width="11" border="0" />';
-                // echo '<input class="feedback_moveup_button" title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/up') . '" />';
+                // ///////echo '<input title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/up') . '" hspace="1" height="11" width="11" border="0" />';
+                // echo '<input class="feedback_moveup_button" title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/up') . '" />';
                 // echo '<input type="hidden" name="moveupitem" value="'.$feedbackitem->id.'" />';
                 // feedback_edit_print_default_form_values($id, $do_show);
                 // echo '</fieldset></form>';
@@ -287,12 +287,12 @@ if($do_show == 'edit') {
             if($feedbackitem->position < $lastposition - 1){
                 $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movedownitem='.$feedbackitem->id);
                 echo '<a class="icon down" title="'.get_string('movedown_item','feedback').'" href="'.$buttonlink.'">
-                        <img alt="'.get_string('movedown_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/down') . '" />
+                        <img alt="'.get_string('movedown_item','feedback').'" src="'.$OUTPUT->pix_url('t/down') . '" />
                       </a>';
                 //print the button to move-down the item
                 // echo '<form action="'.$ME.'" method="post"><fieldset>';
-                // echo '<input title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/down') . '" hspace="1" height="11" width="11" border="0" />';
-                // echo '<input class="feedback_movedown_button" title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/down') . '" />';
+                // echo '<input title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/down') . '" hspace="1" height="11" width="11" border="0" />';
+                // echo '<input class="feedback_movedown_button" title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/down') . '" />';
                 // echo '<input type="hidden" name="movedownitem" value="'.$feedbackitem->id.'" />';
                 // feedback_edit_print_default_form_values($id, $do_show);
                 // echo '</fieldset></form>';
@@ -303,11 +303,11 @@ if($do_show == 'edit') {
             echo '<td>';
                 $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&moveitem='.$feedbackitem->id);
                 echo '<a class="editing_move" title="'.get_string('move_item','feedback').'" href="'.$buttonlink.'">
-                        <img alt="'.get_string('move_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/move') . '" />
+                        <img alt="'.get_string('move_item','feedback').'" src="'.$OUTPUT->pix_url('t/move') . '" />
                       </a>';
                 // echo '<form action="'.$ME.'" method="post"><fieldset>';
-                // echo '<input title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/move') . '" hspace="1" height="11" width="11" border="0" />';
-                // echo '<input class="feedback_move_button" title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/move') . '" />';
+                // echo '<input title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/move') . '" hspace="1" height="11" width="11" border="0" />';
+                // echo '<input class="feedback_move_button" title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/move') . '" />';
                 // echo '<input type="hidden" name="moveitem" value="'.$feedbackitem->id.'" />';
                 // feedback_edit_print_default_form_values($id, $do_show);
                 // echo '</fieldset></form>';
@@ -317,11 +317,11 @@ if($do_show == 'edit') {
             if($feedbackitem->typ != 'pagebreak') {
                 $buttonlink = 'edit_item.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&itemid='.$feedbackitem->id.'&typ='.$feedbackitem->typ);
                 echo '<a class="editing_update" title="'.get_string('edit_item','feedback').'" href="'.$buttonlink.'">
-                        <img alt="'.get_string('edit_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/edit') . '" />
+                        <img alt="'.get_string('edit_item','feedback').'" src="'.$OUTPUT->pix_url('t/edit') . '" />
                       </a>';
                 // echo '<form action="edit_item.php" method="post"><fieldset>';
-                // echo '<input title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/edit') . '" hspace="1" height="11" width="11" border="0" />';
-                // echo '<input class="feedback_edit_button" title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/edit') . '" />';
+                // echo '<input title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/edit') . '" hspace="1" height="11" width="11" border="0" />';
+                // echo '<input class="feedback_edit_button" title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/edit') . '" />';
                 // echo '<input type="hidden" name="itemid" value="'.$feedbackitem->id.'" />';
                 // echo '<input type="hidden" name="typ" value="'.$feedbackitem->typ.'" />';
                 // feedback_edit_print_default_form_values($id, $do_show);
@@ -360,11 +360,11 @@ if($do_show == 'edit') {
             echo '<td>';
                 $buttonlink = 'delete_item.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&deleteitem='.$feedbackitem->id);
                 echo '<a class="icon delete" title="'.get_string('delete_item','feedback').'" href="'.$buttonlink.'">
-                        <img alt="'.get_string('delete_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/delete') . '" />
+                        <img alt="'.get_string('delete_item','feedback').'" src="'.$OUTPUT->pix_url('t/delete') . '" />
                       </a>';
             //print the button to drop the item
             // echo '<form action="delete_item.php" method="post"><fieldset>';
-            // echo '<input class="feedback_delete_button" title="'.get_string('delete_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/delete') . '" />';
+            // echo '<input class="feedback_delete_button" title="'.get_string('delete_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/delete') . '" />';
             // echo '<input type="hidden" name="deleteitem" value="'.$feedbackitem->id.'" />';
             // feedback_edit_print_default_form_values($id, $do_show);
             // echo '</fieldset></form>';
@@ -376,10 +376,10 @@ if($do_show == 'edit') {
                     echo '<td>';
                         $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movehere='.$moveposition);
                         echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
-                                <img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->old_icon_url('movehere') . '" />
+                                <img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
                               </a>';
                         // echo '<form action="'.$ME.'" method="post"><fieldset>';
-                        // echo '<input class="feedback_movehere_button" title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('movehere') . '" />';
+                        // echo '<input class="feedback_movehere_button" title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->pix_url('movehere') . '" />';
                         // echo '<input type="hidden" name="movehere" value="'.$moveposition.'" />';
                         // feedback_edit_print_default_form_values($id, $do_show);
                         // echo '</fieldset></form>';
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index f0bd6cf4b68..23a5e526715 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -329,7 +329,7 @@ function feedback_print_recent_mod_activity($activity, $courseid, $detail, $modn
     if ($detail) {
         $modname = $modnames[$activity->type];
         echo '<div class="title">';
-        echo "<img src=\"" . $OUTPUT->old_icon_url('icon', $activity->type) . "\" ".
+        echo "<img src=\"" . $OUTPUT->pix_url('icon', $activity->type) . "\" ".
              "class=\"icon\" alt=\"$modname\" />";
         echo "<a href=\"$CFG->wwwroot/mod/feedback/view.php?id={$activity->cmid}\">{$activity->name}</a>";
         echo '</div>';
diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index cdeae916487..97c2c23d216 100644
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -118,7 +118,7 @@ if($coursemap = feedback_get_courses_from_sitecourse_map($feedback->id)) {
     $table->setup();
 
     foreach ($coursemap as $cmap) {
-        $table->add_data(array('<a href="'.htmlspecialchars('unmapcourse.php?id='.$id.'&cmapid='.$cmap->id).'"><img src="'.$OUTPUT->old_icon_url('t/delete') . '" alt="Delete" /></a> ('.$cmap->shortname.') '.$cmap->fullname));
+        $table->add_data(array('<a href="'.htmlspecialchars('unmapcourse.php?id='.$id.'&cmapid='.$cmap->id).'"><img src="'.$OUTPUT->pix_url('t/delete') . '" alt="Delete" /></a> ('.$cmap->shortname.') '.$cmap->fullname));
     }
 
     $table->print_html();
diff --git a/mod/folder/locallib.php b/mod/folder/locallib.php
index 711b6c62046..0b0285e02d2 100644
--- a/mod/folder/locallib.php
+++ b/mod/folder/locallib.php
@@ -81,8 +81,8 @@ function folder_get_file_link($file, $folder, $context) {
     $path        = '/'.$context->id.'/folder_content/'.$folder->revision.$file->get_filepath().$file->get_filename();
     $viewurl     = file_encode_url($urlbase, $path, false);
     $downloadurl = file_encode_url($urlbase, $path, true);
-    $downicon    = $OUTPUT->old_icon_url('t/down');
-    $mimeicon    = $OUTPUT->old_icon_url(file_mimetype_icon($file->get_mimetype()));
+    $downicon    = $OUTPUT->pix_url('t/down');
+    $mimeicon    = $OUTPUT->pix_url(file_mimetype_icon($file->get_mimetype()));
 
     $downloadurl = "&nbsp;<a href=\"$downloadurl\" title=\"" . get_string('downloadfile') . "\"><img src=\"$downicon\" class=\"iconsmall\" alt=\"$strdownload\" /></a>";
     return "<a href=\"$viewurl\" title=\"\"><img src=\"$mimeicon\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($file->get_filename()).'</a>'.$downloadurl;
diff --git a/mod/forum/index.php b/mod/forum/index.php
index 447269e2382..834e639d61b 100644
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -198,7 +198,7 @@ if ($generalforums) {
                 } else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) {
                         $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
                     $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='.
-                                   $forum->id.'&amp;mark=read"><img src="'.$OUTPUT->old_icon_url('t/clear') . '" alt="'.$strmarkallread.'" /></a></span>';
+                                   $forum->id.'&amp;mark=read"><img src="'.$OUTPUT->pix_url('t/clear') . '" alt="'.$strmarkallread.'" /></a></span>';
                 } else {
                     $unreadlink = '<span class="read">0</span>';
                 }
@@ -325,7 +325,7 @@ if ($course->id != SITEID) {    // Only real courses have learning forums
                     } else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) {
                         $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
                         $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='.
-                                       $forum->id.'&amp;mark=read"><img src="'.$OUTPUT->old_icon_url('t/clear') . '" alt="'.$strmarkallread.'" /></a></span>';
+                                       $forum->id.'&amp;mark=read"><img src="'.$OUTPUT->pix_url('t/clear') . '" alt="'.$strmarkallread.'" /></a></span>';
                     } else {
                         $unreadlink = '<span class="read">0</span>';
                     }
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 6d7d805f6e7..b337187f0ef 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3708,7 +3708,7 @@ function forum_print_discussion_header(&$post, $forum, $group=-1, $datestring=""
                     echo '</a>';
                     echo '<a title="'.$strmarkalldread.'" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='.
                          $forum->id.'&amp;d='.$post->discussion.'&amp;mark=read&amp;returnpage=view.php">' .
-                         '<img src="'.$OUTPUT->old_icon_url('t/clear') . '" class="iconsmall" alt="'.$strmarkalldread.'" /></a>';
+                         '<img src="'.$OUTPUT->pix_url('t/clear') . '" class="iconsmall" alt="'.$strmarkalldread.'" /></a>';
                     echo '</span>';
                 } else {
                     echo '<span class="read">';
@@ -4354,7 +4354,7 @@ function forum_print_attachments($post, $cm, $type) {
         foreach ($files as $file) {
             $filename = $file->get_filename();
             $mimetype = $file->get_mimetype();
-            $iconimage = '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />';
+            $iconimage = '<img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />';
             $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/forum_attachment/'.$post->id.'/'.$filename);
 
             if ($type == 'html') {
@@ -5651,7 +5651,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=-1, $di
                     echo '&nbsp;<a title="'.get_string('markallread', 'forum').
                          '" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='.
                          $forum->id.'&amp;mark=read&amp;returnpage=view.php">'.
-                         '<img src="'.$OUTPUT->old_icon_url('t/clear') . '" class="iconsmall" alt="'.get_string('markallread', 'forum').'" /></a>';
+                         '<img src="'.$OUTPUT->pix_url('t/clear') . '" class="iconsmall" alt="'.get_string('markallread', 'forum').'" /></a>';
                 }
                 echo '</th>';
             }
@@ -5886,7 +5886,7 @@ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode,
             echo '<div class="ratingsubmit">';
             echo '<input type="submit" id="forumpostratingsubmit" value="'.get_string('sendinratings', 'forum').'" />';
             if (ajaxenabled() && !empty($CFG->forum_ajaxrating)) { /// AJAX enabled, standard submission form
-                $PAGE->requires->js_function_call('add_menu_listeners', array($OUTPUT->old_icon_url('i/loading_small')))->on_dom_ready();
+                $PAGE->requires->js_function_call('add_menu_listeners', array($OUTPUT->pix_url('i/loading_small')))->on_dom_ready();
             }
             if ($forum->scale < 0) {
                 if ($scale = $DB->get_record("scale", array("id" => abs($forum->scale)))) {
@@ -6199,7 +6199,7 @@ function forum_print_recent_mod_activity($activity, $courseid, $detail, $modname
     echo '<div class="title">';
     if ($detail) {
         $aname = s($activity->name);
-        echo "<img src=\"" . $OUTPUT->old_icon_url('icon', $activity->type) . "\" ".
+        echo "<img src=\"" . $OUTPUT->pix_url('icon', $activity->type) . "\" ".
              "class=\"icon\" alt=\"{$aname}\" />";
     }
     echo "<a href=\"$CFG->wwwroot/mod/forum/discuss.php?d={$activity->content->discussion}"
@@ -7991,7 +7991,7 @@ function forum_extend_navigation($navref, $course, $module, $cm) {
     $navref->get($discussionkey)->mainnavonly = true;
 
     foreach ($discussions as $discussion) {
-        $icon = $OUTPUT->old_icon_url('i/feedback');
+        $icon = $OUTPUT->pix_url('i/feedback');
         $url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$discussion->discussion));
         $navref->get($discussionkey)->add($discussion->subject, $url, navigation_node::TYPE_SETTING, null, null, $icon);
     }
@@ -8019,7 +8019,7 @@ function forum_extend_navigation($navref, $course, $module, $cm) {
         $recentkey = $navref->add(get_string('recentactivity').' ('.count($recentposts).')');
         $navref->get($recentkey)->mainnavonly = true;
         foreach ($recentposts as $post) {
-            $icon = $OUTPUT->old_icon_url('i/feedback');
+            $icon = $OUTPUT->pix_url('i/feedback');
             $url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$post->content->discussion));
             $title = $post->content->subject."\n".userdate($post->timestamp, get_string('strftimerecent', 'langconfig'))."\n".$post->user->firstname.' '.$post->user->lastname;
             $navref->get($recentkey)->add($title, $url, navigation_node::TYPE_SETTING, null, null, $icon);
@@ -8141,7 +8141,7 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
             $userid = $USER->id;
         }
         $url = new moodle_url(rss_get_url($PAGE->course->id, $userid, "forum", $forumobject->id));
-        $forum->add($string, $url, settings_navigation::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/rss'));
+        $forum->add($string, $url, settings_navigation::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/rss'));
     }
 
     return $forumkey;
diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index 40bd32c1a50..a2bfa24269c 100644
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -220,8 +220,8 @@ if ( $action ) {
                </td>
                <td style="width:10%" align="center"><b>
                <?php
-                echo "<a href=\"editcategories.php?id=$cm->id&amp;action=delete&amp;mode=cat&amp;hook=$category->id\"><img  alt=\"" . get_string("delete") . "\"src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" /></a> ";
-                echo "<a href=\"editcategories.php?id=$cm->id&amp;action=edit&amp;mode=cat&amp;hook=$category->id\"><img  alt=\"" . get_string("edit") . "\" src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" /></a>";
+                echo "<a href=\"editcategories.php?id=$cm->id&amp;action=delete&amp;mode=cat&amp;hook=$category->id\"><img  alt=\"" . get_string("delete") . "\"src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" /></a> ";
+                echo "<a href=\"editcategories.php?id=$cm->id&amp;action=edit&amp;mode=cat&amp;hook=$category->id\"><img  alt=\"" . get_string("edit") . "\" src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" /></a>";
                ?>
                </b></td>
              </tr>
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index d58adfde9b7..af4f0c11f00 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -953,14 +953,14 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
             $mainglossary = $DB->get_record('glossary', array('mainglossary'=>1,'course'=>$course->id));
             if ( $mainglossary ) {  // if there is a main glossary defined, allow to export the current entry
                 $output = true;
-                $return .= ' <a title="'.get_string('exporttomainglossary','glossary') . '" href="exportentry.php?id='.$entry->id.'&amp;prevmode='.$mode.'&amp;hook='.urlencode($hook).'"><img src="'.$OUTPUT->old_icon_url('export', 'glossary').'" class="iconsmall" alt="'.get_string('exporttomainglossary','glossary').$altsuffix.'" /></a>';
+                $return .= ' <a title="'.get_string('exporttomainglossary','glossary') . '" href="exportentry.php?id='.$entry->id.'&amp;prevmode='.$mode.'&amp;hook='.urlencode($hook).'"><img src="'.$OUTPUT->pix_url('export', 'glossary').'" class="iconsmall" alt="'.get_string('exporttomainglossary','glossary').$altsuffix.'" /></a>';
             }
         }
 
         if ( $entry->sourceglossaryid ) {
-            $icon = $OUTPUT->old_icon_url('minus', 'glossary');   // graphical metaphor (minus) for deleting an imported entry
+            $icon = $OUTPUT->pix_url('minus', 'glossary');   // graphical metaphor (minus) for deleting an imported entry
         } else {
-            $icon = $OUTPUT->old_icon_url('t/delete');
+            $icon = $OUTPUT->pix_url('t/delete');
         }
 
         //Decide if an entry is editable:
@@ -973,7 +973,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
             $return .= $icon;
             $return .= "\" class=\"iconsmall\" alt=\"" . get_string("delete") .$altsuffix."\" /></a> ";
 
-            $return .= " <a title=\"" . get_string("edit") . "\" href=\"edit.php?cmid=$cm->id&amp;id=$entry->id&amp;mode=$mode&amp;hook=".urlencode($hook)."\"><img src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"" . get_string("edit") .$altsuffix. "\" /></a>";
+            $return .= " <a title=\"" . get_string("edit") . "\" href=\"edit.php?cmid=$cm->id&amp;id=$entry->id&amp;mode=$mode&amp;hook=".urlencode($hook)."\"><img src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"" . get_string("edit") .$altsuffix. "\" /></a>";
         } elseif ( $importedentry ) {
             $return .= " <font size=\"-1\">" . get_string("exportedentry","glossary") . "</font>";
         }
@@ -1105,7 +1105,7 @@ function  glossary_print_entry_approval($cm, $entry, $mode, $align="right", $ins
         if ($insidetable) {
             echo '<table class="glossaryapproval" align="'.$align.'"><tr><td align="'.$align.'">';
         }
-        echo '<a title="'.get_string('approve','glossary').'" href="approve.php?eid='.$entry->id.'&amp;mode='.$mode.'&amp;sesskey='.sesskey().'"><img align="'.$align.'" src="'.$OUTPUT->old_icon_url('i/approve') . '" style="border:0px; width:34px; height:34px" alt="'.get_string('approve','glossary').'" /></a>';
+        echo '<a title="'.get_string('approve','glossary').'" href="approve.php?eid='.$entry->id.'&amp;mode='.$mode.'&amp;sesskey='.sesskey().'"><img align="'.$align.'" src="'.$OUTPUT->pix_url('i/approve') . '" style="border:0px; width:34px; height:34px" alt="'.get_string('approve','glossary').'" /></a>';
         if ($insidetable) {
             echo '</td></tr></table>';
         }
@@ -1271,7 +1271,7 @@ function glossary_print_attachments($entry, $cm, $type=NULL, $align="left") {
         foreach ($files as $file) {
             $filename = $file->get_filename();
             $mimetype = $file->get_mimetype();
-            $iconimage = '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />';
+            $iconimage = '<img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />';
             $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/glossary_attachment/'.$entry->id.'/'.$filename);
 
             if ($type == 'html') {
@@ -1643,7 +1643,7 @@ function glossary_print_sorting_links($cm, $mode, $sortkey = '',$sortorder = '')
              $neworder = '&amp;sortorder=asc';
              $newordertitle = get_string('changeto', 'glossary', $asc);
          }
-         $icon = " <img src=\"".$OUTPUT->old_icon_url($sortorder, 'glossary')."\" class=\"icon\" alt=\"$newordertitle\" />";
+         $icon = " <img src=\"".$OUTPUT->pix_url($sortorder, 'glossary')."\" class=\"icon\" alt=\"$newordertitle\" />";
      } else {
          if ( $sortkey != 'CREATION' and $sortkey != 'UPDATE' and
                $sortkey != 'FIRSTNAME' and $sortkey != 'LASTNAME' ) {
@@ -1652,7 +1652,7 @@ function glossary_print_sorting_links($cm, $mode, $sortkey = '',$sortorder = '')
          } else {
              $newordertitle = $desc;
              $neworder = '&amp;sortorder=desc';
-             $icon = ' <img src="'.$OUTPUT->old_icon_url('asc', 'glossary').'" class="icon" alt="'.$newordertitle.'" />';
+             $icon = ' <img src="'.$OUTPUT->pix_url('asc', 'glossary').'" class="icon" alt="'.$newordertitle.'" />';
          }
      }
      $ficon     = '';
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 4f16a8cb1a3..1467818fa7f 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -314,7 +314,7 @@ if ($showcommonelements) {
         if (has_capability('mod/glossary:manageentries', $context) or $glossary->allowprintview) {
 //                print_box_start('printicon');
             echo '<span class="wrap printicon">';
-            echo " <a title =\"". get_string("printerfriendly","glossary") ."\" href=\"print.php?id=$cm->id&amp;mode=$mode&amp;hook=".urlencode($hook)."&amp;sortkey=$sortkey&amp;sortorder=$sortorder&amp;offset=$offset\"><img class=\"icon\" src=\"".$OUTPUT->old_icon_url('print', 'glossary')."\" alt=\"". get_string("printerfriendly","glossary") . "\" /></a>";
+            echo " <a title =\"". get_string("printerfriendly","glossary") ."\" href=\"print.php?id=$cm->id&amp;mode=$mode&amp;hook=".urlencode($hook)."&amp;sortkey=$sortkey&amp;sortorder=$sortorder&amp;offset=$offset\"><img class=\"icon\" src=\"".$OUTPUT->pix_url('print', 'glossary')."\" alt=\"". get_string("printerfriendly","glossary") . "\" /></a>";
             echo '</span>';
 //                print_box_end();
         }
diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php
index 8e6ed88cd2f..f0d6dab57b7 100644
--- a/mod/hotpot/index.php
+++ b/mod/hotpot/index.php
@@ -307,10 +307,10 @@
                     // Show the zoom boxes
                     if ($displaysection==$hotpot->section) {
                         $strshowall = get_string('showall'.$course->format);
-                        $printsection .= '<br /><a href="index.php?id='.$course->id.'&amp;section=all" title="'.$strshowall.'"><img src="'.$OUTPUT->old_icon_url('i/all') . '" style="height:25px; width:16px; border:0px" alt="'.$strshowall.'" /></a><br />';
+                        $printsection .= '<br /><a href="index.php?id='.$course->id.'&amp;section=all" title="'.$strshowall.'"><img src="'.$OUTPUT->pix_url('i/all') . '" style="height:25px; width:16px; border:0px" alt="'.$strshowall.'" /></a><br />';
                     } else {
                         $strshowone = get_string('showonly'.preg_replace('|s$|', '', $course->format, 1), '', $hotpot->section);
-                        $printsection .=  '<br /><a href="index.php?id='.$course->id.'&amp;section='.$hotpot->section.'" title="'.$strshowone.'"><img src="'.$OUTPUT->old_icon_url('i/one') . '" class="icon" alt="'.$strshowone.'" /></a><br />';
+                        $printsection .=  '<br /><a href="index.php?id='.$course->id.'&amp;section='.$hotpot->section.'" title="'.$strshowone.'"><img src="'.$OUTPUT->pix_url('i/one') . '" class="icon" alt="'.$strshowone.'" /></a><br />';
                     }
                 }
             }
diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php
index 2bb46353394..f0506759a3c 100644
--- a/mod/hotpot/lib.php
+++ b/mod/hotpot/lib.php
@@ -1267,7 +1267,7 @@ function hotpot_print_recent_mod_activity($activity, $course, $detail=false) {
 
     if ($detail) {
         // activity icon
-        $src = "" . $OUTPUT->old_icon_url('icon', $activity->type) . "";
+        $src = "" . $OUTPUT->pix_url('icon', $activity->type) . "";
         print '<img src="'.$src.'" class="icon" alt="'.$activity->type.'" /> ';
 
         // link to activity
diff --git a/mod/lesson/renderer.php b/mod/lesson/renderer.php
index 1fc34897656..6953fbf4196 100644
--- a/mod/lesson/renderer.php
+++ b/mod/lesson/renderer.php
@@ -452,16 +452,16 @@ class moodle_mod_lesson_renderer extends moodle_renderer_base {
 
         if ($printmove) {
             $printmovehtml = new moodle_url($CFG->wwwroot.'/mod/lesson/lesson.php', array('id'=>$this->page->cm->id, 'action'=>'move', 'pageid'=>$page->id, 'sesskey'=>sesskey()));
-            $actions[] = html_link::make($printmovehtml, '<img src="'.$this->output->old_icon_url('t/move').'" class="iconsmall" alt="'.get_string('move').'" />');
+            $actions[] = html_link::make($printmovehtml, '<img src="'.$this->output->pix_url('t/move').'" class="iconsmall" alt="'.get_string('move').'" />');
         }
         $url = new moodle_url($CFG->wwwroot.'/mod/lesson/editpage.php', array('id'=>$this->page->cm->id, 'pageid'=>$page->id, 'edit'=>1));
-        $actions[] = html_link::make($url, '<img src="'.$this->output->old_icon_url('t/edit').'" class="iconsmall" alt="'.get_string('update').'" />');
+        $actions[] = html_link::make($url, '<img src="'.$this->output->pix_url('t/edit').'" class="iconsmall" alt="'.get_string('update').'" />');
 
         $url = new moodle_url($CFG->wwwroot.'/mod/lesson/view.php', array('id'=>$this->page->cm->id, 'pageid'=>$page->id));
-        $actions[] = html_link::make($url, '<img src="'.$this->output->old_icon_url('t/preview').'" class="iconsmall" alt="'.get_string('preview').'" />');
+        $actions[] = html_link::make($url, '<img src="'.$this->output->pix_url('t/preview').'" class="iconsmall" alt="'.get_string('preview').'" />');
 
         $url = new moodle_url($CFG->wwwroot.'/mod/lesson/lesson.php', array('id'=>$this->page->cm->id, 'action'=>'confirmdelete', 'pageid'=>$page->id, 'sesskey'=>sesskey()));
-        $actions[] = html_link::make($url, '<img src="'.$this->output->old_icon_url('t/delete').'" class="iconsmall" alt="'.get_string('delete').'" />');
+        $actions[] = html_link::make($url, '<img src="'.$this->output->pix_url('t/delete').'" class="iconsmall" alt="'.get_string('delete').'" />');
 
         if ($printaddpage) {
             $options = array();
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 96e1ac71f62..8290d413533 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -431,7 +431,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true,
                     echo '<div class="quizpagedelete">';
                     echo '<a title="' . get_string('removeemptypage', 'quiz') . '" href="' .
                             $pageurl->out_action(array('deleteemptypage' => $i - 1)) .
-                            '"><img src="' . $OUTPUT->old_icon_url('t/delete') . '" ' .
+                            '"><img src="' . $OUTPUT->pix_url('t/delete') . '" ' .
                             'class="iconsmall" alt="' . $strremove . '" /></a>';
                     echo '</div>';
                 }
@@ -492,7 +492,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true,
                     }
                     echo "<a title=\"$strmoveup\" href=\"" .
                             $pageurl->out_action(array('up' => $question->id)) . "\"><img
-                             src=\"" . $OUTPUT->old_icon_url('t/up') . "\" class=\"iconsmall
+                             src=\"" . $OUTPUT->pix_url('t/up') . "\" class=\"iconsmall
                             $upbuttonclass\" alt=\"$strmoveup\" /></a>";
                 }
 
@@ -501,7 +501,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true,
                 if (!$hasattempts) {
                     echo "<a title=\"$strmovedown\" href=\"" .
                             $pageurl->out_action(array('down' => $question->id)) . "\"><img
-                            src=\"" . $OUTPUT->old_icon_url('t/down') . "\" class=\"iconsmall\"" .
+                            src=\"" . $OUTPUT->pix_url('t/down') . "\" class=\"iconsmall\"" .
                             " alt=\"$strmovedown\" /></a>";
                 }
             }
@@ -510,7 +510,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true,
                 if (!$hasattempts) {
                     echo "<a title=\"$strremove\" href=\"" .
                             $pageurl->out_action(array('remove' => $question->id)) . "\">
-                            <img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" " .
+                            <img src=\"" . $OUTPUT->pix_url('t/delete') . "\" " .
                             "class=\"iconsmall\" alt=\"$strremove\" /></a>";
                 }
             }
@@ -910,7 +910,7 @@ function print_random_option_icon($question) {
         $icon = 'nosubcat';
         $tooltip = get_string('randomnosubcat', 'quiz');
     }
-    echo '<img src="' . $OUTPUT->old_icon_url('i/' . $icon) . '" alt="' .
+    echo '<img src="' . $OUTPUT->pix_url('i/' . $icon) . '" alt="' .
             $tooltip . '" title="' . $tooltip . '" class="uihint" />';
 
 }
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index c7dcb4f6b95..233c017ef30 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -838,7 +838,7 @@ function quiz_print_recent_mod_activity($activity, $courseid, $detail, $modnames
     if ($detail) {
         $modname = $modnames[$activity->type];
         echo '<div class="title">';
-        echo "<img src=\"" . $OUTPUT->old_icon_url('icon', $activity->type) . "\" ".
+        echo "<img src=\"" . $OUTPUT->pix_url('icon', $activity->type) . "\" ".
              "class=\"icon\" alt=\"$modname\" />";
         echo "<a href=\"$CFG->wwwroot/mod/quiz/view.php?id={$activity->cmid}\">{$activity->name}</a>";
         echo '</div>';
@@ -1454,26 +1454,26 @@ function quiz_extend_settings_navigation($settings, $module) {
 
     if (has_capability('mod/quiz:view', $PAGE->cm->context)) {
         $url = new moodle_url($CFG->wwwroot.'/mod/quiz/view.php', array('id'=>$PAGE->cm->id));
-        $quiznav->add(get_string('info', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/info'));
+        $quiznav->add(get_string('info', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/info'));
     }
     if (has_capability('mod/quiz:viewreports', $PAGE->cm->context)) {
         $url = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php', array('q'=>$quiz->id));
-        $reportkey = $quiznav->add(get_string('results', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report'));
+        $reportkey = $quiznav->add(get_string('results', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
 
         require_once($CFG->dirroot.'/mod/quiz/report/reportlib.php');
         $reportlist = quiz_report_list($PAGE->cm->context);
         foreach ($reportlist as $report) {
             $url = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php', array('q'=>$quiz->id, 'mode'=>$report));
-            $quiznav->get($reportkey)->add(get_string($report, 'quiz_'.$report), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/item'));
+            $quiznav->get($reportkey)->add(get_string($report, 'quiz_'.$report), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/item'));
         }
     }
     if (has_capability('mod/quiz:preview', $PAGE->cm->context)) {
         $url = new moodle_url($CFG->wwwroot.'/mod/quiz/startattempt.php', array('cmid'=>$PAGE->cm->id, 'sesskey'=>sesskey()));
-        $quiznav->add(get_string('preview', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('t/preview'));
+        $quiznav->add(get_string('preview', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('t/preview'));
     }
     if (has_capability('mod/quiz:manage', $PAGE->cm->context)) {
         $url = new moodle_url($CFG->wwwroot.'/mod/quiz/edit.php', array('cmid'=>$PAGE->cm->id));
-        $quiznav->add(get_string('edit'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('t/edit'));
+        $quiznav->add(get_string('edit'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('t/edit'));
     }
 
     if (has_capability('moodle/course:manageactivities', $PAGE->cm->context)) {
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 0dfc81820ab..c51f6b604a4 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -790,7 +790,7 @@ function quiz_question_edit_button($cmid, $question, $returnurl, $contentbeforei
         $questionparams = array('returnurl' => $returnurl, 'cmid' => $cmid, 'id' => $question->id);
         $questionurl = new moodle_url("$CFG->wwwroot/question/question.php", $questionparams);
         return '<a title="' . $action . '" href="' . $questionurl->out() . '">' . $contentbeforeicon .
-                '<img src="' . $OUTPUT->old_icon_url($icon) . '" alt="' . $action . '" /></a>';
+                '<img src="' . $OUTPUT->pix_url($icon) . '" alt="' . $action . '" /></a>';
     } else {
         return $contentbeforeicon;
     }
@@ -824,7 +824,7 @@ function quiz_question_preview_button($quiz, $question, $label = false) {
 
     // Build the icon.
     $image = new html_image();
-    $image->src = $OUTPUT->old_icon_url('t/preview');
+    $image->src = $OUTPUT->pix_url('t/preview');
     $image->add_class('iconsmall');
     $image->alt = $strpreviewquestion;
 
diff --git a/mod/quiz/styles.php b/mod/quiz/styles.php
deleted file mode 100644
index 5a55970e685..00000000000
--- a/mod/quiz/styles.php
+++ /dev/null
@@ -1,3 +0,0 @@
-#quiznavigation .qnbutton.flagged {
-  background-image: url('<?php echo $PAGE->theme->old_icon_url('i/ne_red_mark') ?>');
-}
diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php
index b9b24709e58..8780cb38be6 100644
--- a/mod/quiz/summary.php
+++ b/mod/quiz/summary.php
@@ -98,7 +98,7 @@ foreach ($attemptobj->get_question_iterator() as $number => $question) {
     }
     $flag = '';
     if ($attemptobj->is_question_flagged($question->id)) {
-        $flag = ' <img src="' . $OUTPUT->old_icon_url('i/flagged') . '" alt="' .
+        $flag = ' <img src="' . $OUTPUT->pix_url('i/flagged') . '" alt="' .
                 get_string('flagged', 'question') . '" class="questionflag" />';
     }
     $row = array('<a href="' . s($attemptobj->attempt_url($question->id)) . '">' . $number . $flag . '</a>',
diff --git a/mod/quiz/tabs.php b/mod/quiz/tabs.php
index 189442fe3a5..b05f0b2bf4b 100644
--- a/mod/quiz/tabs.php
+++ b/mod/quiz/tabs.php
@@ -40,10 +40,10 @@ if (has_capability('mod/quiz:viewreports', $context)) {
 }
 if (has_capability('mod/quiz:preview', $context)) {
     $strpreview = get_string('preview', 'quiz');
-    $row[] = new tabobject('preview', "$CFG->wwwroot/mod/quiz/startattempt.php?cmid=$cm->id&amp;sesskey=" . sesskey(), "<img src=\"" . $OUTPUT->old_icon_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strpreview\" /> $strpreview", $strpreview);
+    $row[] = new tabobject('preview', "$CFG->wwwroot/mod/quiz/startattempt.php?cmid=$cm->id&amp;sesskey=" . sesskey(), "<img src=\"" . $OUTPUT->pix_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strpreview\" /> $strpreview", $strpreview);
 }
 if (has_capability('mod/quiz:manage', $context)) {
-    $row[] = new tabobject('edit', "$CFG->wwwroot/mod/quiz/edit.php?cmid=$cm->id", "<img src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> $stredit",$stredit);
+    $row[] = new tabobject('edit', "$CFG->wwwroot/mod/quiz/edit.php?cmid=$cm->id", "<img src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> $stredit",$stredit);
 }
 
 if ($currenttab == 'info' && count($row) == 1) {
diff --git a/mod/resource/index.php b/mod/resource/index.php
index 9e597c22e89..8212884a878 100644
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@@ -89,7 +89,7 @@ foreach ($resources as $resource) {
     $icon = '';
     if (!empty($cm->icon)) {
         // each resource file has an icon in 2.0
-        $icon = '<img src="'.$OUTPUT->old_icon_url($cm->icon).'" class="activityicon" alt="" /> ';
+        $icon = '<img src="'.$OUTPUT->pix_url($cm->icon).'" class="activityicon" alt="" /> ';
     }
 
     $class = $resource->visible ? '' : 'class="dimmed"'; // hidden modules are dimmed
diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php
index da9f954ff4a..b25976371e7 100644
--- a/mod/scorm/datamodels/aicclib.php
+++ b/mod/scorm/datamodels/aicclib.php
@@ -435,9 +435,9 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                 if (isset($_COOKIE['hide:SCORMitem'.$nextsco->id])) {
                     $icon = 'plus';
                 }
-                $result->toc .= '<a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$OUTPUT->old_icon_url('pix/' . $icon, 'scorm').'" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
+                $result->toc .= '<a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$OUTPUT->pix_url('pix/' . $icon, 'scorm').'" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
             } else if ($isvisible) {
-                $result->toc .= '<img src="'.$OUTPUT->old_icon_url('pix/spacer', 'scorm').'" alt="" />';
+                $result->toc .= '<img src="'.$OUTPUT->pix_url('pix/spacer', 'scorm').'" alt="" />';
             }
             if (empty($sco->title)) {
                 $sco->title = $sco->identifier;
@@ -454,9 +454,9 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                         $usertrack = $usertracks[$sco->identifier];
                         $strstatus = get_string($usertrack->status,'scorm');
                         if ($sco->scormtype == 'sco') {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/' . $usertrack->status, 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/' . $usertrack->status, 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" />';
                         } else {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/assetc', 'scorm').'" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/assetc', 'scorm').'" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
                         }
 
                         if (($usertrack->status == 'notattempted') || ($usertrack->status == 'incomplete') || ($usertrack->status == 'browsed')) {
@@ -470,7 +470,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                         }
                         $strsuspended = get_string('suspended','scorm');
                         if (isset($usertrack->{'cmi.core.exit'}) && ($usertrack->{'cmi.core.exit'} == 'suspend')) {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/suspend', 'scorm').'" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/suspend', 'scorm').'" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
                         }
                     } else {
                         if ($play && empty($scoid)) {
@@ -478,9 +478,9 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                         }
                         $incomplete = true;
                         if ($sco->scormtype == 'sco') {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
                         } else {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
                         }
                     }
                     if ($sco->id == $scoid) {
@@ -536,8 +536,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
     $result->toc .= "\t</ul>\n";
     if ($scorm->hidetoc == 0) {
         $result->toc .= $PAGE->requires->data_for_js('scormdata', array(
-                'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
-                'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')))->asap();
+                'plusicon' => $OUTPUT->pix_url('pix/plus', 'scorm'),
+                'minusicon' => $OUTPUT->pix_url('pix/minus', 'scorm')))->asap();
         $result->toc .= $PAGE->requires->js('lib/cookies.js')->asap();
         $result->toc .= $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js')->asap();
     }
diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php
index b84f4f3fe0d..aa909e7b8ca 100644
--- a/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@ -212,9 +212,9 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                 if (isset($_COOKIE['hide:SCORMitem'.$nextsco->id])) {
                     $icon = 'plus';
                 }
-                $result->toc .= '<a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$OUTPUT->old_icon_url('pix/' . $icon, 'scorm').'" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
+                $result->toc .= '<a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$OUTPUT->pix_url('pix/' . $icon, 'scorm').'" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
             } else if ($isvisible) {
-                $result->toc .= '<img src="'.$OUTPUT->old_icon_url('pix/spacer', 'scorm').'" alt="" />';
+                $result->toc .= '<img src="'.$OUTPUT->pix_url('pix/spacer', 'scorm').'" alt="" />';
             }
             if (empty($sco->title)) {
                 $sco->title = $sco->identifier;
@@ -231,9 +231,9 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                         $usertrack = $usertracks[$sco->identifier];
                         $strstatus = get_string($usertrack->status,'scorm');
                         if ($sco->scormtype == 'sco') {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/'.$usertrack->status, 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/'.$usertrack->status, 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" />';
                         } else {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/assetc/', 'scorm').'" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/assetc/', 'scorm').'" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
                         }
 
                         if (($usertrack->status == 'notattempted') || ($usertrack->status == 'incomplete') || ($usertrack->status == 'browsed')) {
@@ -248,7 +248,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                         $strsuspended = get_string('suspended','scorm');
                         if (isset($usertrack->{'cmi.core.exit'}) && ($usertrack->{'cmi.core.exit'} == 'suspend')) {
                             if($usertrack->status !='completed') {
-                                $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/suspend', 'scorm').'" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
+                                $statusicon = '<img src="'.$OUTPUT->pix_url('pix/suspend', 'scorm').'" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
                             }
                         }
                     } else {
@@ -257,9 +257,9 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                         }
                         $incomplete = true;
                         if ($sco->scormtype == 'sco') {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
                         } else {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
                         }
                     }
                     if ($sco->id == $scoid) {
@@ -318,8 +318,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
     $result->toc .= "\t</ul>\n";
     if ($scorm->hidetoc == 0) {
         $PAGE->requires->data_for_js('scormdata', array(
-                'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
-                'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')));
+                'plusicon' => $OUTPUT->pix_url('pix/plus', 'scorm'),
+                'minusicon' => $OUTPUT->pix_url('pix/minus', 'scorm')));
         $PAGE->requires->js('lib/cookies.js');
         $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }
diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php
index bd9ba2218b3..003182b4a57 100644
--- a/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@ -104,9 +104,9 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                     $icon = 'plus';
                 }
                 $result->toc .= "\t\t".'<li><a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');">'.
-                                '<img id="img'.$sublist.'" src="'.$OUTPUT->old_icon_url('pix/'.$icon, 'scorm').'" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
+                                '<img id="img'.$sublist.'" src="'.$OUTPUT->pix_url('pix/'.$icon, 'scorm').'" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
             } else if ($isvisible) {
-                $result->toc .= "\t\t".'<li><img src="'.$OUTPUT->old_icon_url('pix/spacer', 'scorm').'" alt="" />';
+                $result->toc .= "\t\t".'<li><img src="'.$OUTPUT->pix_url('pix/spacer', 'scorm').'" alt="" />';
             }
             if (empty($sco->title)) {
                 $sco->title = $sco->identifier;
@@ -123,9 +123,9 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                         $usertrack = $usertracks[$sco->identifier];
                         $strstatus = get_string($usertrack->status,'scorm');
                         if ($sco->scormtype == 'sco') {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/'.$usertrack->status, 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/'.$usertrack->status, 'scorm').'" alt="'.$strstatus.'" title="'.$strstatus.'" />';
                         } else {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/assetc', 'scorm').'" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/assetc', 'scorm').'" alt="'.get_string('assetlaunched','scorm').'" title="'.get_string('assetlaunched','scorm').'" />';
                         }
 
                         if (($usertrack->status == 'notattempted') || ($usertrack->status == 'incomplete') || ($usertrack->status == 'browsed')) {
@@ -140,7 +140,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                         $strsuspended = get_string('suspended','scorm');
                         if (isset($usertrack->{'cmi.core.exit'}) && ($usertrack->{'cmi.core.exit'} == 'suspend')) {
                             if($usertrack->status !='completed') {
-                                $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/suspend', 'scorm').'" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
+                                $statusicon = '<img src="'.$OUTPUT->pix_url('pix/suspend', 'scorm').'" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
                             }
                         }
                     } else {
@@ -148,10 +148,10 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                             $scoid = $sco->id;
                         }
                         if ($sco->scormtype == 'sco') {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
                             $incomplete = true;
                         } else {
-                            $statusicon = '<img src="'.$OUTPUT->old_icon_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
+                            $statusicon = '<img src="'.$OUTPUT->pix_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
                         }
                     }
 
@@ -209,8 +209,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
     $result->toc .= "\t</ul>\n";
     if ($scorm->hidetoc == 0) {
         $PAGE->requires->data_for_js('scormdata', array(
-                'plusicon' => $OUTPUT->old_icon_url('pix/plus', 'scorm'),
-                'minusicon' => $OUTPUT->old_icon_url('pix/minus', 'scorm')));
+                'plusicon' => $OUTPUT->pix_url('pix/plus', 'scorm'),
+                'minusicon' => $OUTPUT->pix_url('pix/minus', 'scorm')));
         $PAGE->requires->js('lib/cookies.js');
         $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index e9df44b58de..147a36b927c 100755
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -383,7 +383,7 @@ function scorm_user_complete($course, $user, $mod, $scorm) {
                     if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                         $sublist++;
                     } else {
-                        $report .= '<img src="'.$OUTPUT->old_icon_url('pix/spacer', 'scorm').'" alt="" />';
+                        $report .= '<img src="'.$OUTPUT->pix_url('pix/spacer', 'scorm').'" alt="" />';
                     }
 
                     if ($sco->launch) {
@@ -395,7 +395,7 @@ function scorm_user_complete($course, $user, $mod, $scorm) {
                                 $usertrack->status = 'notattempted';
                             }
                             $strstatus = get_string($usertrack->status,'scorm');
-                            $report .= "<img src='".$OUTPUT->old_icon_url('pix/'.$usertrack->status, 'scorm')."' alt='$strstatus' title='$strstatus' />";
+                            $report .= "<img src='".$OUTPUT->pix_url('pix/'.$usertrack->status, 'scorm')."' alt='$strstatus' title='$strstatus' />";
                             if ($usertrack->timemodified != 0) {
                                 if ($usertrack->timemodified > $lastmodify) {
                                     $lastmodify = $usertrack->timemodified;
@@ -406,9 +406,9 @@ function scorm_user_complete($course, $user, $mod, $scorm) {
                             }
                         } else {
                             if ($sco->scormtype == 'sco') {
-                                $report .= '<img src="'.$OUTPUT->old_icon_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
+                                $report .= '<img src="'.$OUTPUT->pix_url('pix/notattempted', 'scorm').'" alt="'.get_string('notattempted','scorm').'" title="'.get_string('notattempted','scorm').'" />';
                             } else {
-                                $report .= '<img src="'.$OUTPUT->old_icon_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
+                                $report .= '<img src="'.$OUTPUT->pix_url('pix/asset', 'scorm').'" alt="'.get_string('asset','scorm').'" title="'.get_string('asset','scorm').'" />';
                             }
                         }
                         $report .= "&nbsp;$sco->title $score$totaltime</li>\n";
diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php
index 705c32ec840..0eda8b28f45 100755
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -171,7 +171,7 @@
                 location = "<?php echo $result ?>";
             }
             else {
-                document.body.innerHTML = "<p><?php echo get_string('activityloading', 'scorm');?> <span id='countdown'><?php echo $delayseconds ?></span> <?php echo get_string('numseconds');?>. &nbsp; <img src='<?php echo $OUTPUT->old_icon_url('pix/wait', 'scorm') ?>'><p>";
+                document.body.innerHTML = "<p><?php echo get_string('activityloading', 'scorm');?> <span id='countdown'><?php echo $delayseconds ?></span> <?php echo get_string('numseconds');?>. &nbsp; <img src='<?php echo $OUTPUT->pix_url('pix/wait', 'scorm') ?>'><p>";
                 var e = document.getElementById("countdown");
                 var cSeconds = parseInt(e.innerHTML);
                 var timer = setInterval(function() {
diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 5a660b6ea9c..c81d97fb1e5 100755
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -686,7 +686,7 @@ function scorm_course_format_display($user,$course) {
                 $path = $CFG->wwwroot.'/course';
                 $headertext .= '<span class="commands">'.
                         '<a title="'.$strupdate.'" href="'.$path.'/mod.php?update='.$cm->id.'&amp;sesskey='.sesskey().'">'.
-                        '<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.$strupdate.'" /></a></span>';
+                        '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.$strupdate.'" /></a></span>';
             }
             $headertext .= '</td>';
             // Display report link
diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index 3ac337e853c..bec0139e0b0 100755
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -267,7 +267,7 @@
                                     $detailslink = '&nbsp;';
                                 }
                                 $strstatus = get_string($trackdata->status,'scorm');
-                                $row[] = '<img src="'.$OUTPUT->old_icon_url('pix/' . $trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.
+                                $row[] = '<img src="'.$OUTPUT->pix_url('pix/' . $trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.
                                          $strstatus.'" />&nbsp;'.format_string($sco->title);
                                 $row[] = get_string($trackdata->status,'scorm');
                                 $row[] = $trackdata->total_time;
@@ -310,7 +310,7 @@
                 $trackdata->total_time = '';
             }
             $strstatus = get_string($trackdata->status,'scorm');
-            echo '<img src="'.$$OUTPUT->old_icon_url('pix/'.$trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.
+            echo '<img src="'.$$OUTPUT->pix_url('pix/'.$trackdata->status, 'scorm').'" alt="'.$strstatus.'" title="'.
             $strstatus.'" />&nbsp;'.$trackdata->total_time.'<br />'.$scoreview.'<br />';
             echo '</div>'."\n";
             echo '<hr /><h2>'.get_string('details','scorm').'</h2>';
diff --git a/mod/url/index.php b/mod/url/index.php
index ece29f61be8..f7d5da13161 100644
--- a/mod/url/index.php
+++ b/mod/url/index.php
@@ -89,7 +89,7 @@ foreach ($urls as $url) {
     $icon = '';
     if (!empty($cm->icon)) {
         // each url has an icon in 2.0
-        $icon = '<img src="'.$OUTPUT->old_icon_url($cm->icon).'" class="activityicon" alt="" /> ';
+        $icon = '<img src="'.$OUTPUT->pix_url($cm->icon).'" class="activityicon" alt="" /> ';
     }
 
     $class = $url->visible ? '' : 'class="dimmed"'; // hidden modules are dimmed
diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php
index 7562153a599..edd5a7dc8d2 100644
--- a/mod/wiki/ewiki/plugins/moodle/downloads.php
+++ b/mod/wiki/ewiki/plugins/moodle/downloads.php
@@ -329,7 +329,7 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) {
 
    /// Moodle Icon Handling
    global $CFG;
-   $p_icon = $OUTPUT->old_icon_url(file_extension_icon($id));
+   $p_icon = $OUTPUT->pix_url(file_extension_icon($id));
    $p_icon_t = '';
 
    $info->id = $id;
diff --git a/question/category_class.php b/question/category_class.php
index e489c4bcf91..0f703bcb1a3 100644
--- a/question/category_class.php
+++ b/question/category_class.php
@@ -100,7 +100,7 @@ class question_category_list_item extends list_item {
 
         if (count($this->parentlist->records)!=1){ // don't allow delete if this is the last category in this context.
             $item .=  '<a title="' . $str->delete . '" href="'.$this->parentlist->pageurl->out_action(array('delete'=>$this->id)).'">
-                    <img src="' . $OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="' .$str->delete. '" /></a>';
+                    <img src="' . $OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="' .$str->delete. '" /></a>';
         }
 
         return $item;
diff --git a/question/contextmove_form.php b/question/contextmove_form.php
index 76965bb64db..d2b412d9543 100644
--- a/question/contextmove_form.php
+++ b/question/contextmove_form.php
@@ -26,7 +26,7 @@ class question_context_move_form extends moodleform {
             $i = 0;
             foreach (array_keys($urls) as $url){
                 $icontype = mimeinfo('type', $url);
-                $img = "<img src=\"" . $OUTPUT->old_icon_url(file_extension_icon($url)) . "\"  class=\"icon\" alt=\"$icontype\" />";
+                $img = "<img src=\"" . $OUTPUT->pix_url(file_extension_icon($url)) . "\"  class=\"icon\" alt=\"$icontype\" />";
                 if (in_array($url, $brokenurls)){
                     $mform->addElement('select', "urls[$i]", $img.$url, $brokenfileoptions);
                 } else {
diff --git a/question/contextmoveq_form.php b/question/contextmoveq_form.php
index 25b65ed2b5b..945c6afe8c6 100644
--- a/question/contextmoveq_form.php
+++ b/question/contextmoveq_form.php
@@ -27,7 +27,7 @@ class question_context_move_question_form extends moodleform {
             $i = 0;
             foreach (array_keys($urls) as $url){
                 $icontype = mimeinfo('type', $url);
-                $img = "<img src=\"" . $OUTPUT->old_icon_url(file_extension_icon($url)) . "\"  class=\"icon\" alt=\"$icontype\" />";
+                $img = "<img src=\"" . $OUTPUT->pix_url(file_extension_icon($url)) . "\"  class=\"icon\" alt=\"$icontype\" />";
                 if (in_array($url, $brokenurls)){
                     $mform->addElement('select', "urls[$i]", $img.$url, $brokenfileoptions);
                 } else {
diff --git a/question/editlib.php b/question/editlib.php
index 0f5a4a1b157..c621bb4ba24 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -241,9 +241,9 @@ abstract class question_bank_column_base {
     protected function get_sort_icon($reverse) {
         global $OUTPUT;
         if ($reverse) {
-            return ' <img src="' . $OUTPUT->old_icon_url('t/up') . '" alt="' . get_string('desc') . '" />';
+            return ' <img src="' . $OUTPUT->pix_url('t/up') . '" alt="' . get_string('desc') . '" />';
         } else {
-            return ' <img src="' . $OUTPUT->old_icon_url('t/down') . '" alt="' . get_string('asc') . '" />';
+            return ' <img src="' . $OUTPUT->pix_url('t/down') . '" alt="' . get_string('asc') . '" />';
         }
     }
 
@@ -578,7 +578,7 @@ abstract class question_bank_action_column_base extends question_bank_column_bas
     protected function print_icon($icon, $title, $url) {
         global $OUTPUT;
         echo '<a title="' . $title . '" href="' . $url . '">
-                <img src="' . $OUTPUT->old_icon_url($icon) . '" class="iconsmall" alt="' . $title . '" /></a>';
+                <img src="' . $OUTPUT->pix_url($icon) . '" class="iconsmall" alt="' . $title . '" /></a>';
     }
 
     public function get_required_fields() {
@@ -627,7 +627,7 @@ class question_bank_preview_action_column extends question_bank_action_column_ba
         if (question_has_capability_on($question, 'use')) {
             parse_str(QUESTION_PREVIEW_POPUP_OPTIONS, $options);
             $image = new html_image();
-            $image->src = $OUTPUT->old_icon_url('t/preview');
+            $image->src = $OUTPUT->pix_url('t/preview');
             $image->add_class('iconsmall');
             $image->alt = $this->strpreview;
 
diff --git a/question/type/multianswer/questiontype.php b/question/type/multianswer/questiontype.php
index 81fc8df460b..6a9c1027f02 100644
--- a/question/type/multianswer/questiontype.php
+++ b/question/type/multianswer/questiontype.php
@@ -460,7 +460,7 @@ class embedded_cloze_qtype extends default_questiontype {
                     echo "<input $style $readonly $popup name=\"$inputname\"";
                     echo "  type=\"text\" value=\"".s($response)."\" ".$styleinfo." /> ";
                     if (!empty($feedback) && !empty($USER->screenreader)) {
-                        echo "<img src=\"" . $OUTPUT->old_icon_url('i/feedback') . "\" alt=\"$feedback\" />";
+                        echo "<img src=\"" . $OUTPUT->pix_url('i/feedback') . "\" alt=\"$feedback\" />";
                     }
                     echo $feedbackimg;
                     break;
@@ -487,7 +487,7 @@ class embedded_cloze_qtype extends default_questiontype {
                         echo $outputoptions;
                         echo '</select></span>';
                         if (!empty($feedback) && !empty($USER->screenreader)) {
-                            echo "<img src=\"" . $OUTPUT->old_icon_url('i/feedback') . "\" alt=\"$feedback\" />";
+                            echo "<img src=\"" . $OUTPUT->pix_url('i/feedback') . "\" alt=\"$feedback\" />";
                         }
                         echo $feedbackimg;
                     }else if ($wrapped->options->layout == 1 || $wrapped->options->layout == 2){
diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index a380815e615..f2442dde435 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -1016,7 +1016,7 @@ class default_questiontype {
         } else {
             $img = 'i/unflagged';
         }
-        return '<img ' . $id . 'src="' . $OUTPUT->old_icon_url($img) .
+        return '<img ' . $id . 'src="' . $OUTPUT->pix_url($img) .
                 '" alt="' . get_string('flagthisquestion', 'question') . '" />';
     }
 
@@ -1050,7 +1050,7 @@ class default_questiontype {
 
     /// Work out the contents of the link.
         $stredit = get_string('edit');
-        $linktext = '<img src="' . $OUTPUT->old_icon_url('t/edit') . '" alt="' . $stredit . '" />';
+        $linktext = '<img src="' . $OUTPUT->pix_url('t/edit') . '" alt="' . $stredit . '" />';
 
         if (!empty($cmoptions->thispageurl)) {
         /// The module allow editing in the same window, print an ordinary link.
diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php
index bdc09eac56c..c2c0ba3939e 100755
--- a/repository/alfresco/repository.class.php
+++ b/repository/alfresco/repository.class.php
@@ -123,11 +123,11 @@ class repository_alfresco extends repository {
                 {
                     $ret['list'][] = array('title'=>$child->child->cm_name,
                         'path'=>$child->child->id,
-                        'thumbnail'=>$OUTPUT->old_icon_url('f/folder-32') . '',
+                        'thumbnail'=>$OUTPUT->pix_url('f/folder-32') . '',
                         'children'=>array());
                 } elseif ($child->child->type == $file_filter) {
                     $ret['list'][] = array('title'=>$child->child->cm_name,
-                        'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($child->child->cm_name, 32)),
+                        'thumbnail' => $OUTPUT->pix_url(file_extension_icon($child->child->cm_name, 32)),
                         'source'=>$child->child->id);
                 }
             }
diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index cb0975db4fc..1a0e4d11061 100755
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -153,7 +153,7 @@ class repository_boxnet extends repository {
                             'date'=>$filedates[$n],
                             'source'=>'http://box.net/api/1.0/download/'
                                 .$this->auth_token.'/'.$fileids[$n],
-                            'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($v, 32)));
+                            'thumbnail' => $OUTPUT->pix_url(file_extension_icon($v, 32)));
                 }
             }
         }
diff --git a/repository/filepicker.php b/repository/filepicker.php
index 08ecfdba2e2..5c9d1f396c5 100755
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -525,7 +525,7 @@ default:
             } else {
                 // a folder
                 echo '<li>';
-                echo '<img src="'.$OUTPUT->old_icon_url('f/folder') . '" class="iconsmall" />';
+                echo '<img src="'.$OUTPUT->pix_url('f/folder') . '" class="iconsmall" />';
 
                 $url->param('action', 'browse');
                 $url->param('draftpath', $file->get_filepath());
diff --git a/repository/filesystem/repository.class.php b/repository/filesystem/repository.class.php
index f4c553c7d4a..9ff2ae3ef86 100644
--- a/repository/filesystem/repository.class.php
+++ b/repository/filesystem/repository.class.php
@@ -66,7 +66,7 @@ class repository_filesystem extends repository {
                             'source' => $path.'/'.$file,
                             'size' => filesize($this->root_path.$file),
                             'date' => time(),
-                            'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($this->root_path.$file, 32))
+                            'thumbnail' => $OUTPUT->pix_url(file_extension_icon($this->root_path.$file, 32))
                         );
                     } else {
                         if (!empty($path)) {
@@ -77,7 +77,7 @@ class repository_filesystem extends repository {
                         $list['list'][] = array(
                             'title' => $file,
                             'children' => array(),
-                            'thumbnail' => $OUTPUT->old_icon_url('f/folder-32'),
+                            'thumbnail' => $OUTPUT->pix_url('f/folder-32'),
                             'path' => $current_path
                             );
                     }
diff --git a/repository/lib.php b/repository/lib.php
index c68a0e432ba..321f135eefd 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -838,7 +838,7 @@ abstract class repository {
                     'url'=>$ret->get_url(),
                     'id'=>$file->get_itemid(),
                     'file'=>$file->get_filename(),
-                    'icon' => $OUTPUT->old_icon_url(file_extension_icon($path, 32))
+                    'icon' => $OUTPUT->pix_url(file_extension_icon($path, 32))
                 );
             } else {
                 return null;
@@ -944,7 +944,7 @@ abstract class repository {
                     'size' => 0,
                     'date' => $filedate,
                     'path' => array_reverse($path),
-                    'thumbnail' => $OUTPUT->old_icon_url('f/folder-32')
+                    'thumbnail' => $OUTPUT->pix_url('f/folder-32')
                 );
 
                 //if ($dynamicmode && $child->is_writable()) {
@@ -981,7 +981,7 @@ abstract class repository {
                     'date' => $filedate,
                     //'source' => $child->get_url(),
                     'source' => base64_encode($source),
-                    'thumbnail'=>$OUTPUT->old_icon_url(file_extension_icon($filename, 32)),
+                    'thumbnail'=>$OUTPUT->pix_url(file_extension_icon($filename, 32)),
                 );
                 $filecount++;
             }
@@ -1859,13 +1859,13 @@ function repository_get_client($context, $id = '',  $accepted_filetypes = '*', $
         } else {
             $options['externallink'] = true;
         }
-        $options['icons']['loading'] = $OUTPUT->old_icon_url('i/loading');
-        $options['icons']['logout']  = $OUTPUT->old_icon_url('a/logout');
-        $options['icons']['help']    = $OUTPUT->old_icon_url('a/help');
-        $options['icons']['progressbar'] = $OUTPUT->old_icon_url('i/progressbar');
-        $options['icons']['search']  = $OUTPUT->old_icon_url('a/search');
-        $options['icons']['setting'] = $OUTPUT->old_icon_url('a/setting');
-        $options['icons']['refresh'] = $OUTPUT->old_icon_url('a/refresh');
+        $options['icons']['loading'] = $OUTPUT->pix_url('i/loading');
+        $options['icons']['logout']  = $OUTPUT->pix_url('a/logout');
+        $options['icons']['help']    = $OUTPUT->pix_url('a/help');
+        $options['icons']['progressbar'] = $OUTPUT->pix_url('i/progressbar');
+        $options['icons']['search']  = $OUTPUT->pix_url('a/search');
+        $options['icons']['setting'] = $OUTPUT->pix_url('a/setting');
+        $options['icons']['refresh'] = $OUTPUT->pix_url('a/refresh');
         $options = json_encode($options);
         // fp_config includes filepicker options
 
diff --git a/repository/local/repository.class.php b/repository/local/repository.class.php
index c1190965848..2c083dc0fc7 100755
--- a/repository/local/repository.class.php
+++ b/repository/local/repository.class.php
@@ -109,7 +109,7 @@ class repository_local extends repository {
                             'date' => '',
                             'path' => $params,
                             'children'=>array(),
-                            'thumbnail' => $OUTPUT->old_icon_url('f/folder-32') . ''
+                            'thumbnail' => $OUTPUT->pix_url('f/folder-32') . ''
                         );
                         $list[] = $node;
                     } else {
@@ -120,7 +120,7 @@ class repository_local extends repository {
                             'size' => 0,
                             'date' => '',
                             'source'=> $params,
-                            'thumbnail' => $OUTPUT->old_icon_url($icon),
+                            'thumbnail' => $OUTPUT->pix_url($icon),
                         );
                         $list[] = $node;
                     }
diff --git a/repository/mahara/repository.class.php b/repository/mahara/repository.class.php
index c0de8ca9ffa..c3ddeef40f3 100644
--- a/repository/mahara/repository.class.php
+++ b/repository/mahara/repository.class.php
@@ -206,7 +206,7 @@ class repository_mahara extends repository {
         $list = array();
          if (!empty($filesandfolders['folders'])) {
             foreach ($filesandfolders['folders'] as $folder) {
-                $list[] =  array('path'=>$folder['id'], 'title'=>$folder['title'], 'date'=>$folder['mtime'], 'size'=>'0', 'children'=>array(), 'thumbnail' => $OUTPUT->old_icon_url('f/folder'));
+                $list[] =  array('path'=>$folder['id'], 'title'=>$folder['title'], 'date'=>$folder['mtime'], 'size'=>'0', 'children'=>array(), 'thumbnail' => $OUTPUT->pix_url('f/folder'));
             }
         }
         if (!empty($filesandfolders['files'])) {
@@ -214,7 +214,7 @@ class repository_mahara extends repository {
                 if ($file['artefacttype'] == 'image') {
                     $thumbnail = $host->wwwroot."/artefact/file/download.php?file=".$file['id']."&size=70x55";
                 } else {
-                    $thumbnail = $OUTPUT->old_icon_url(file_extension_icon( $file['title'], 32));
+                    $thumbnail = $OUTPUT->pix_url(file_extension_icon( $file['title'], 32));
                 }
                 $list[] = array( 'title'=>$file['title'], 'date'=>$file['mtime'], 'source'=>$file['id'], 'thumbnail' => $thumbnail);
             }
diff --git a/repository/merlot/repository.class.php b/repository/merlot/repository.class.php
index 3722e3a7ea4..ff6d46112f6 100755
--- a/repository/merlot/repository.class.php
+++ b/repository/merlot/repository.class.php
@@ -81,7 +81,7 @@ class repository_merlot extends repository {
         foreach ($xml->results->material as $entry) {
             $list[] = array(
                 'title'=>(string)$entry->title,
-                'thumbnail'=>$OUTPUT->old_icon_url('f/unknown-32'),
+                'thumbnail'=>$OUTPUT->pix_url('f/unknown-32'),
                 'date'=>userdate((int)$entry->creationDate),
                 'size'=>'',
                 'source'=>(string)$entry->URL
diff --git a/repository/s3/repository.class.php b/repository/s3/repository.class.php
index 10d7b852865..e6d6948d272 100644
--- a/repository/s3/repository.class.php
+++ b/repository/s3/repository.class.php
@@ -72,7 +72,7 @@ class repository_s3 extends repository {
                 $folder = array(
                     'title' => $bucket,
                     'children' => array(),
-                    'thumbnail'=>$OUTPUT->old_icon_url('f/folder-32'),
+                    'thumbnail'=>$OUTPUT->pix_url('f/folder-32'),
                     'path'=>$bucket
                     );
                 $tree[] = $folder;
@@ -86,7 +86,7 @@ class repository_s3 extends repository {
                     'size'=>$file['size'],
                     'date'=>userdate($file['time']),
                     'source'=>$path.'/'.$file['name'],
-                    'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($file['name'], 32))
+                    'thumbnail' => $OUTPUT->pix_url(file_extension_icon($file['name'], 32))
                     );
             }
         }
diff --git a/repository/url/repository.class.php b/repository/url/repository.class.php
index c36e7fad55d..3b6a349ab88 100755
--- a/repository/url/repository.class.php
+++ b/repository/url/repository.class.php
@@ -100,7 +100,7 @@ EOD;
                 $ret['list'][] = array(
                     'title'=>$filename,
                     'source'=>$this->file_url,
-                    'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($filename, 32))
+                    'thumbnail' => $OUTPUT->pix_url(file_extension_icon($filename, 32))
                     );
             }
         }
diff --git a/repository/webdav/repository.class.php b/repository/webdav/repository.class.php
index 80ae36d81bf..04847299993 100644
--- a/repository/webdav/repository.class.php
+++ b/repository/webdav/repository.class.php
@@ -107,7 +107,7 @@ class repository_webdav extends repository {
                     }
                     $ret['list'][] = array(
                         'title'=>$title,
-                        'thumbnail'=>$OUTPUT->old_icon_url('f/folder-32'),
+                        'thumbnail'=>$OUTPUT->pix_url('f/folder-32'),
                         'children'=>array(),
                         'date'=>$filedate,
                         'size'=>0,
@@ -120,7 +120,7 @@ class repository_webdav extends repository {
                 $size = !empty($v['getcontentlength'])? $v['getcontentlength']:'';
                 $ret['list'][] = array(
                     'title'=>$title,
-                    'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($title, 32)),
+                    'thumbnail' => $OUTPUT->pix_url(file_extension_icon($title, 32)),
                     'size'=>$size,
                     'date'=>$filedate,
                     'source'=>$v['href']
diff --git a/repository/wikimedia/repository.class.php b/repository/wikimedia/repository.class.php
index 69c1d220bec..833c1403e38 100644
--- a/repository/wikimedia/repository.class.php
+++ b/repository/wikimedia/repository.class.php
@@ -15,7 +15,7 @@ class repository_wikimedia extends repository {
         foreach ($result as $title=>$url) {
             $list['list'][] = array(
                 'title'=>substr($title, 5),
-                'thumbnail'=>$OUTPUT->old_icon_url(file_extension_icon('xx.jpg', 32)),
+                'thumbnail'=>$OUTPUT->pix_url(file_extension_icon('xx.jpg', 32)),
                 // plugin-dependent unique path to the file (id, url, path, etc.)
                 'source'=>$url,
                 // the accessible url of the file
diff --git a/search/query.php b/search/query.php
index 4c302d0c114..2839ea75f5b 100644
--- a/search/query.php
+++ b/search/query.php
@@ -345,7 +345,7 @@
                 if ($listing->doctype == 'user'){ // A special handle for users
                     $icon = $OUTPUT->user_picture(moodle_user_picture($listing->userid, 0));
                 } else {
-                    $iconpath = $OUTPUT->old_icon_url('icon', $listing->doctype);
+                    $iconpath = $OUTPUT->pix_url('icon', $listing->doctype);
                     $icon = "<img align=\"top\" src=\"".$iconpath."\" class=\"activityicon\" alt=\"\"/>";
                 }
                 $coursename = $DB->get_field('course', 'fullname', array('id' => $listing->courseid));
diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php
index 2ada5abfd3a..c7587c1e23a 100644
--- a/tag/coursetags_edit.php
+++ b/tag/coursetags_edit.php
@@ -131,7 +131,7 @@ echo $OUTPUT->header();
         $edittagthisunit = get_string('edittagthisunit', $tagslang);
         $arrowtitle = get_string('arrowtitle', $tagslang);
         $sesskey = sesskey();
-        $leftarrow = $OUTPUT->old_icon_url('t/arrow_left');
+        $leftarrow = $OUTPUT->pix_url('t/arrow_left');
         $outstr .= <<<EOT
             <form action="$CFG->wwwroot/tag/coursetags_edit.php" method="post" id="coursetag">
                 <div style="display: none;">
diff --git a/theme/base/layout/embedded.php b/theme/base/layout/embedded.php
index 250da5714a8..c305cfb428a 100644
--- a/theme/base/layout/embedded.php
+++ b/theme/base/layout/embedded.php
@@ -2,7 +2,7 @@
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
     <title><?php echo $PAGE->title ?></title>
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->old_icon_url('favicon', 'theme')?>" />
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 <body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
diff --git a/theme/base/layout/general.php b/theme/base/layout/general.php
index 5fc4ee55324..3d5db37b53e 100644
--- a/theme/base/layout/general.php
+++ b/theme/base/layout/general.php
@@ -12,7 +12,7 @@ echo $OUTPUT->doctype() ?>
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
     <title><?php echo $PAGE->title ?></title>
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->old_icon_url('favicon', 'theme')?>" />
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 <body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
diff --git a/theme/base/layout/home.php b/theme/base/layout/home.php
index 965c61882e1..80c3e20d27e 100644
--- a/theme/base/layout/home.php
+++ b/theme/base/layout/home.php
@@ -12,7 +12,7 @@ echo $OUTPUT->doctype() ?>
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
     <title><?php echo $PAGE->title ?></title>
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->old_icon_url('favicon', 'theme')?>" />
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
diff --git a/theme/standard/layout/embedded.php b/theme/standard/layout/embedded.php
index 94cde55734b..cc75449ca0f 100644
--- a/theme/standard/layout/embedded.php
+++ b/theme/standard/layout/embedded.php
@@ -2,7 +2,7 @@
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
     <title><?php echo $PAGE->title ?></title>
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->old_icon_url('favicon', 'theme')?>" />
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 <body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
diff --git a/theme/standard/layout/frametop.php b/theme/standard/layout/frametop.php
index 94cde55734b..cc75449ca0f 100644
--- a/theme/standard/layout/frametop.php
+++ b/theme/standard/layout/frametop.php
@@ -2,7 +2,7 @@
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
     <title><?php echo $PAGE->title ?></title>
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->old_icon_url('favicon', 'theme')?>" />
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 <body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
diff --git a/theme/standard/layout/home.php b/theme/standard/layout/home.php
index fd5ceb9f7b6..bba952486fc 100644
--- a/theme/standard/layout/home.php
+++ b/theme/standard/layout/home.php
@@ -2,7 +2,7 @@
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
     <title><?php echo $PAGE->title ?></title>
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->old_icon_url('favicon', 'theme')?>" />
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
diff --git a/theme/standard/layout/minimal.php b/theme/standard/layout/minimal.php
index 309fd9b8e9b..0c1a3e66038 100644
--- a/theme/standard/layout/minimal.php
+++ b/theme/standard/layout/minimal.php
@@ -2,7 +2,7 @@
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
     <title><?php echo $PAGE->title ?></title>
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->old_icon_url('favicon', 'theme')?>" />
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 <body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
diff --git a/theme/standard/layout/normal.php b/theme/standard/layout/normal.php
index c00eeab82f0..323b2cb3cb4 100644
--- a/theme/standard/layout/normal.php
+++ b/theme/standard/layout/normal.php
@@ -2,7 +2,7 @@
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
     <title><?php echo $PAGE->title ?></title>
-    <link rel="shortcut icon" href="<?php echo $OUTPUT->old_icon_url('favicon', 'theme')?>" />
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 <body id="<?php echo $PAGE->pagetype ?>" class="<?php echo $PAGE->bodyclasses ?>">
diff --git a/user/index.php b/user/index.php
index 1086de24807..aa2eb6e8121 100644
--- a/user/index.php
+++ b/user/index.php
@@ -343,7 +343,7 @@
                     $editgroupaction = new moodle_action_icon();
                     $editgroupaction->link->url = new moodle_url($CFG->wwwroot.'/group/group.php', array('id' => $group->id, 'courseid' => $group->courseid));
                     $editgroupaction->link->title = get_string('editgroupprofile');
-                    $editgroupaction->image->src = $OUTPUT->old_icon_url('t/edit');
+                    $editgroupaction->image->src = $OUTPUT->pix_url('t/edit');
                     $editgroupaction->image->alt = get_string('editgroupprofile');
 
                     $contentheading .= '&nbsp;' . $OUTPUT->action_icon($editgroupaction);
@@ -649,13 +649,13 @@
         $heading .= ": $a->number";
         if (user_can_assign($context, $roleid)) {
             $heading .= ' <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?roleid='.$roleid.'&amp;contextid='.$context->id.'">';
-            $heading .= '<img src="'.$OUTPUT->old_icon_url('i/edit') . '" class="icon" alt="" /></a>';
+            $heading .= '<img src="'.$OUTPUT->pix_url('i/edit') . '" class="icon" alt="" /></a>';
         }
         echo $OUTPUT->heading($heading, 3);
     } else {
         if ($course->id != SITEID && has_capability('moodle/role:assign', $context)) {
             $editlink  = ' <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id.'">';
-            $editlink .= '<img src="'.$OUTPUT->old_icon_url('i/edit') . '" class="icon" alt="" /></a>';
+            $editlink .= '<img src="'.$OUTPUT->pix_url('i/edit') . '" class="icon" alt="" /></a>';
         } else {
             $editlink = '';
         }
@@ -878,7 +878,7 @@
                 $user = make_context_subobj($user);
                 if ( !empty($user->hidden) ) {
                 // if the assignment is hidden, display icon
-                    $hidden = " <img src=\"" . $OUTPUT->old_icon_url('t/show') . "\" title=\"".get_string('userhashiddenassignments', 'role')."\" alt=\"".get_string('hiddenassign')."\" class=\"hide-show-image\"/>";
+                    $hidden = " <img src=\"" . $OUTPUT->pix_url('t/show') . "\" title=\"".get_string('userhashiddenassignments', 'role')."\" alt=\"".get_string('hiddenassign')."\" class=\"hide-show-image\"/>";
                 } else {
                     $hidden = '';
                 }
diff --git a/user/message.html b/user/message.html
index 20028e99754..05ac9e5ed65 100644
--- a/user/message.html
+++ b/user/message.html
@@ -60,7 +60,7 @@
                 $error = get_string('emailempty');
             }
             if (!empty($error)) {
-                echo '<img src="'.$OUTPUT->old_icon_url('t/emailno') . '" alt="'.$error.'" title="'.$error.'"/>';
+                echo '<img src="'.$OUTPUT->pix_url('t/emailno') . '" alt="'.$error.'" title="'.$error.'"/>';
                 unset($error);
             }
             echo '</td><td><input type="submit" onClick="this.form.deluser.value='.$user->id.';" value="' . get_string('remove') . '" /></td></tr>';
diff --git a/user/pix.php b/user/pix.php
index b333fd97536..ecb8408929c 100644
--- a/user/pix.php
+++ b/user/pix.php
@@ -12,7 +12,7 @@ define('NO_DEBUG_DISPLAY', true);
     if (!empty($CFG->forcelogin) and !isloggedin()) {
         // protect images if login required and not logged in;
         // do not use require_login() because it is expensive and not suitable here anyway
-        redirect($OUTPUT->old_icon_url('u/f1'));
+        redirect($OUTPUT->pix_url('u/f1'));
     }
 
     $relativepath = get_file_argument();
@@ -32,4 +32,4 @@ define('NO_DEBUG_DISPLAY', true);
     }
 
     // picture was deleted - use default instead
-    redirect($OUTPUT->old_icon_url('u/f1'));
+    redirect($OUTPUT->pix_url('u/f1'));
diff --git a/user/portfolio.php b/user/portfolio.php
index fc8eecb5327..374820e357e 100644
--- a/user/portfolio.php
+++ b/user/portfolio.php
@@ -114,8 +114,8 @@ if ($display) {
         $visible = $i->get_user_config('visible', $USER->id);
         $table->data[] = array($i->get('name'), $i->get('plugin'),
             ($i->has_user_config()
-                ?  '<a href="' . $baseurl . '?config=' . $i->get('id') . '"><img src="' . $OUTPUT->old_icon_url('t/edit') . '" alt="' . get_string('configure') . '" /></a>' : '') .
-                   ' <a href="' . $baseurl . '?hide=' . $i->get('id') . '"><img src="' . $OUTPUT->old_icon_url('t/' . (($visible) ? 'hide' : 'show')) . '" alt="' . get_string($visible ? 'hide' : 'show') . '" /></a><br />'
+                ?  '<a href="' . $baseurl . '?config=' . $i->get('id') . '"><img src="' . $OUTPUT->pix_url('t/edit') . '" alt="' . get_string('configure') . '" /></a>' : '') .
+                   ' <a href="' . $baseurl . '?hide=' . $i->get('id') . '"><img src="' . $OUTPUT->pix_url('t/' . (($visible) ? 'hide' : 'show')) . '" alt="' . get_string($visible ? 'hide' : 'show') . '" /></a><br />'
         );
     }
 
diff --git a/user/portfoliologs.php b/user/portfoliologs.php
index 8eb6686c841..3bf12694917 100644
--- a/user/portfoliologs.php
+++ b/user/portfoliologs.php
@@ -89,7 +89,7 @@ if (count($queued) > 0) {
 
         $cancel = new moodle_action_icon();
         $cancel->link->url = new moodle_url($base . '&cancel=1');
-        $cancel->image->src = $OUTPUT->old_icon_url('t/stop');
+        $cancel->image->src = $OUTPUT->pix_url('t/stop');
         $cancel->linktext = get_string('cancel');
 
         $iconstr = $OUTPUT->action_icon($cancel);
@@ -97,7 +97,7 @@ if (count($queued) > 0) {
         if (!$e->get('queued') && $e->get('expirytime') > $now) {
             $continue = new moodle_action_icon();
             $continue->link->url = new moodle_url($base);
-            $continue->image->src = $OUTPUT->old_icon_url('t/go');
+            $continue->image->src = $OUTPUT->pix_url('t/go');
             $continue->linktext = get_string('continue');
             $iconstr .= '&nbsp;' . $OUTPUT->action_icon($continue);
         }
diff --git a/user/profile/index.php b/user/profile/index.php
index 78c9ade03e5..a32dc56dae4 100644
--- a/user/profile/index.php
+++ b/user/profile/index.php
@@ -178,29 +178,29 @@ function profile_category_icons ($category) {
     $fieldcount    = $DB->count_records('user_info_field', array('categoryid'=>$category->id));
 
     /// Edit
-    $editstr = '<a title="'.$stredit.'" href="index.php?id='.$category->id.'&amp;action=editcategory"><img src="'.$OUTPUT->old_icon_url('t/edit') . '" alt="'.$stredit.'" class="iconsmall" /></a> ';
+    $editstr = '<a title="'.$stredit.'" href="index.php?id='.$category->id.'&amp;action=editcategory"><img src="'.$OUTPUT->pix_url('t/edit') . '" alt="'.$stredit.'" class="iconsmall" /></a> ';
 
     /// Delete
     /// Can only delete the last category if there are no fields in it
     if ( ($categorycount > 1) or ($fieldcount == 0) ) {
         $editstr .= '<a title="'.$strdelete.'" href="index.php?id='.$category->id.'&amp;action=deletecategory';
-        $editstr .= '"><img src="'.$OUTPUT->old_icon_url('t/delete') . '" alt="'.$strdelete.'" class="iconsmall" /></a> ';
+        $editstr .= '"><img src="'.$OUTPUT->pix_url('t/delete') . '" alt="'.$strdelete.'" class="iconsmall" /></a> ';
     } else {
-        $editstr .= '<img src="'.$OUTPUT->old_icon_url('spacer') . '" alt="" class="iconsmall" /> ';
+        $editstr .= '<img src="'.$OUTPUT->pix_url('spacer') . '" alt="" class="iconsmall" /> ';
     }
 
     /// Move up
     if ($category->sortorder > 1) {
-        $editstr .= '<a title="'.$strmoveup.'" href="index.php?id='.$category->id.'&amp;action=movecategory&amp;dir=up&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('t/up') . '" alt="'.$strmoveup.'" class="iconsmall" /></a> ';
+        $editstr .= '<a title="'.$strmoveup.'" href="index.php?id='.$category->id.'&amp;action=movecategory&amp;dir=up&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('t/up') . '" alt="'.$strmoveup.'" class="iconsmall" /></a> ';
     } else {
-        $editstr .= '<img src="'.$OUTPUT->old_icon_url('spacer') . '" alt="" class="iconsmall" /> ';
+        $editstr .= '<img src="'.$OUTPUT->pix_url('spacer') . '" alt="" class="iconsmall" /> ';
     }
 
     /// Move down
     if ($category->sortorder < $categorycount) {
-        $editstr .= '<a title="'.$strmovedown.'" href="index.php?id='.$category->id.'&amp;action=movecategory&amp;dir=down&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('t/down') . '" alt="'.$strmovedown.'" class="iconsmall" /></a> ';
+        $editstr .= '<a title="'.$strmovedown.'" href="index.php?id='.$category->id.'&amp;action=movecategory&amp;dir=down&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('t/down') . '" alt="'.$strmovedown.'" class="iconsmall" /></a> ';
     } else {
-        $editstr .= '<img src="'.$OUTPUT->old_icon_url('spacer') . '" alt="" class="iconsmall" /> ';
+        $editstr .= '<img src="'.$OUTPUT->pix_url('spacer') . '" alt="" class="iconsmall" /> ';
     }
 
     return $editstr;
@@ -225,24 +225,24 @@ function profile_field_icons($field) {
     $datacount  = $DB->count_records('user_info_data', array('fieldid'=>$field->id));
 
     /// Edit
-    $editstr = '<a title="'.$stredit.'" href="index.php?id='.$field->id.'&amp;action=editfield"><img src="'.$OUTPUT->old_icon_url('t/edit') . '" alt="'.$stredit.'" class="iconsmall" /></a> ';
+    $editstr = '<a title="'.$stredit.'" href="index.php?id='.$field->id.'&amp;action=editfield"><img src="'.$OUTPUT->pix_url('t/edit') . '" alt="'.$stredit.'" class="iconsmall" /></a> ';
 
     /// Delete
     $editstr .= '<a title="'.$strdelete.'" href="index.php?id='.$field->id.'&amp;action=deletefield';
-    $editstr .= '"><img src="'.$OUTPUT->old_icon_url('t/delete') . '" alt="'.$strdelete.'" class="iconsmall" /></a> ';
+    $editstr .= '"><img src="'.$OUTPUT->pix_url('t/delete') . '" alt="'.$strdelete.'" class="iconsmall" /></a> ';
 
     /// Move up
     if ($field->sortorder > 1) {
-        $editstr .= '<a title="'.$strmoveup.'" href="index.php?id='.$field->id.'&amp;action=movefield&amp;dir=up&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('t/up') . '" alt="'.$strmoveup.'" class="iconsmall" /></a> ';
+        $editstr .= '<a title="'.$strmoveup.'" href="index.php?id='.$field->id.'&amp;action=movefield&amp;dir=up&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('t/up') . '" alt="'.$strmoveup.'" class="iconsmall" /></a> ';
      } else {
-        $editstr .= '<img src="'.$OUTPUT->old_icon_url('spacer') . '" alt="" class="iconsmall" /> ';
+        $editstr .= '<img src="'.$OUTPUT->pix_url('spacer') . '" alt="" class="iconsmall" /> ';
     }
 
     /// Move down
     if ($field->sortorder < $fieldcount) {
-        $editstr .= '<a title="'.$strmovedown.'" href="index.php?id='.$field->id.'&amp;action=movefield&amp;dir=down&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('t/down') . '" alt="'.$strmovedown.'" class="iconsmall" /></a> ';
+        $editstr .= '<a title="'.$strmovedown.'" href="index.php?id='.$field->id.'&amp;action=movefield&amp;dir=down&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('t/down') . '" alt="'.$strmovedown.'" class="iconsmall" /></a> ';
     } else {
-        $editstr .= '<img src="'.$OUTPUT->old_icon_url('spacer') . '" alt="" class="iconsmall" /> ';
+        $editstr .= '<img src="'.$OUTPUT->pix_url('spacer') . '" alt="" class="iconsmall" /> ';
     }
 
     return $editstr;
diff --git a/user/selector/lib.php b/user/selector/lib.php
index 7fd5280be59..43192a9a1e6 100644
--- a/user/selector/lib.php
+++ b/user/selector/lib.php
@@ -640,7 +640,7 @@ abstract class user_selector_base {
         // Initialise the selector.
         $PAGE->requires->js_function_call('new user_selector', array($this->name, $hash, $this->extrafields,
                 $search, get_string('previouslyselectedusers', '', '%%SEARCHTERM%%'),
-                get_string('nomatchingusers', '', '%%SEARCHTERM%%'), get_string('none'), $OUTPUT->old_icon_url('i/loading')));
+                get_string('nomatchingusers', '', '%%SEARCHTERM%%'), get_string('none'), $OUTPUT->pix_url('i/loading')));
 
         return $output;
     }
diff --git a/user/view.php b/user/view.php
index f1ff0bb7065..dcb5b3a75f3 100644
--- a/user/view.php
+++ b/user/view.php
@@ -321,7 +321,7 @@ if ($user->maildisplay == 1 or
         }
         $emailswitch = "&nbsp;<a title=\"$switchclick\" ".
                        "href=\"view.php?id=$user->id&amp;course=$course->id&amp;$switchparam=1\">".
-                       "<img src=\"" . $OUTPUT->old_icon_url("$switchpix") . "\" alt=\"$switchclick\" /></a>";
+                       "<img src=\"" . $OUTPUT->pix_url("$switchpix") . "\" alt=\"$switchclick\" /></a>";
 
     } else if ($currentuser) {         /// Can only re-enable an email this way
         if ($user->emailstop) {   // Include link that tells how to re-enable their email