diff --git a/theme/boost/scss/moodle/buttons.scss b/theme/boost/scss/moodle/buttons.scss
index 9aac63e0045..32728d953b0 100644
--- a/theme/boost/scss/moodle/buttons.scss
+++ b/theme/boost/scss/moodle/buttons.scss
@@ -40,7 +40,7 @@ p.arrow_button {
 
 .btn.btn-icon {
     height: ($icon-height + 20px);
-    width: ($icon-width + 20px);
+    width: ($icon-width + 16px);
     font-size: $icon-height;
     line-height: $icon-height;
     padding: 0;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 41c84b8b697..acedc807255 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -37396,7 +37396,7 @@ p.arrow_button {
 
 .btn.btn-icon {
   height: 36px;
-  width: 40px;
+  width: 36px;
   font-size: 16px;
   line-height: 16px;
   padding: 0;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index dd1b017579c..85ba48df1a8 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -37402,7 +37402,7 @@ p.arrow_button {
 
 .btn.btn-icon {
   height: 36px;
-  width: 40px;
+  width: 36px;
   font-size: 16px;
   line-height: 16px;
   padding: 0;