diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index bca7adc7ee0..3b60787881d 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -845,8 +845,7 @@ M.util.add_spinner = function(Y, node) {
 
     var spinner = Y.Node.create('<img />')
         .setAttribute('src', M.util.image_url(WAITICON.pix, WAITICON.component))
-        .addClass('spinner')
-        .addClass('iconsmall')
+        .addClass('spinner icon')
         .hide();
 
     node.append(spinner);
diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss
index 5e07a8c1a9b..911805ded70 100644
--- a/theme/boost/scss/moodle/course.scss
+++ b/theme/boost/scss/moodle/course.scss
@@ -612,9 +612,9 @@ span.editinstructions {
     .coursebox > .info > .coursename a {
         display: block;
         background-image: url([[pix:moodle|i/course]]);
+        background-size: $icon-width $icon-height;
         background-repeat: no-repeat;
         padding-left: 21px;
-        background-position: left 0.2em;
     }
 }
 
@@ -690,6 +690,7 @@ span.editinstructions {
 
 .course_category_tree .category.with_children > .info > .categoryname {
     background-image: url([[pix:moodle|t/expanded]]);
+    background-size: $icon-width $icon-height;
     background-repeat: no-repeat;
     background-position: center left;
 }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 501e2488272..b124ff59554 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -28613,9 +28613,9 @@ span.editinstructions .alert-link {
 #frontpage-category-combo .coursebox > .info > .coursename a {
   display: block;
   background-image: url([[pix:moodle|i/course]]);
+  background-size: 16px 16px;
   background-repeat: no-repeat;
   padding-left: 21px;
-  background-position: left 0.2em;
 }
 
 .coursebox > .info > .coursename {
@@ -28688,6 +28688,7 @@ span.editinstructions .alert-link {
 
 .course_category_tree .category.with_children > .info > .categoryname {
   background-image: url([[pix:moodle|t/expanded]]);
+  background-size: 16px 16px;
   background-repeat: no-repeat;
   background-position: center left;
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index a334001a704..11e5a7d3be4 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -28613,9 +28613,9 @@ span.editinstructions .alert-link {
 #frontpage-category-combo .coursebox > .info > .coursename a {
   display: block;
   background-image: url([[pix:moodle|i/course]]);
+  background-size: 16px 16px;
   background-repeat: no-repeat;
   padding-left: 21px;
-  background-position: left 0.2em;
 }
 
 .coursebox > .info > .coursename {
@@ -28688,6 +28688,7 @@ span.editinstructions .alert-link {
 
 .course_category_tree .category.with_children > .info > .categoryname {
   background-image: url([[pix:moodle|t/expanded]]);
+  background-size: 16px 16px;
   background-repeat: no-repeat;
   background-position: center left;
 }