diff --git a/comment/lib.php b/comment/lib.php
index fe26ee20816..4f62b149918 100644
--- a/comment/lib.php
+++ b/comment/lib.php
@@ -587,7 +587,7 @@ class comment {
             $c->fullname = fullname($u);
             $c->time = userdate($c->timecreated, $c->strftimeformat);
             $c->content = format_text($c->content, $c->format, $formatoptions);
-            $c->avatar = $OUTPUT->user_picture($u, array('size'=>18));
+            $c->avatar = $OUTPUT->user_picture($u, array('size' => 16));
             $c->userid = $u->id;
 
             if ($this->can_delete($c)) {
@@ -928,7 +928,7 @@ class comment {
             $strdelete = get_string('deletecommentbyon', 'moodle', (object)['user' => $cmt->fullname, 'time' => $cmt->time]);
             $deletelink  = html_writer::start_tag('div', array('class'=>'comment-delete'));
             $deletelink .= html_writer::start_tag('a', array('href' => '#', 'id' => 'comment-delete-'.$this->cid.'-'.$cmt->id,
-                                                             'title' => $strdelete));
+                'class' => 'icon-no-margin', 'title' => $strdelete));
 
             $deletelink .= $OUTPUT->pix_icon('t/delete', get_string('delete'));
             $deletelink .= html_writer::end_tag('a');
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 9a5da7c9d83..4e245d47158 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -657,8 +657,8 @@ table.mod_index {
 }
 
 .comment-message .picture {
-    width: 20px;
     float: left;
+    margin-right: 0.25rem;
 }
 
 .comment-message .text {
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index 33e873e4dbb..a106b5ad6ef 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -1172,6 +1172,7 @@ div#dock {
     font-weight: normal;
     &.size-16,
     &.size-30 {
+        font-size: 0.7rem;
         width: 30px;
         height: 30px;
     }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 07a01806c0c..f1b10bb04b7 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10416,8 +10416,8 @@ table.mod_index {
   border: 1px solid #ccc; }
 
 .comment-message .picture {
-  width: 20px;
-  float: left; }
+  float: left;
+  margin-right: 0.25rem; }
 
 .comment-message .text {
   margin: 0;
@@ -18471,6 +18471,7 @@ div#dock {
   color: #343a40;
   font-weight: normal; }
   .userinitials.size-16, .userinitials.size-30 {
+    font-size: 0.7rem;
     width: 30px;
     height: 30px; }
   .userinitials.size-35 {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 6e7eee23b33..d4bec312a7e 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -10416,8 +10416,8 @@ table.mod_index {
   border: 1px solid #ccc; }
 
 .comment-message .picture {
-  width: 20px;
-  float: left; }
+  float: left;
+  margin-right: 0.25rem; }
 
 .comment-message .text {
   margin: 0;
@@ -18471,6 +18471,7 @@ div#dock {
   color: #343a40;
   font-weight: normal; }
   .userinitials.size-16, .userinitials.size-30 {
+    font-size: 0.7rem;
     width: 30px;
     height: 30px; }
   .userinitials.size-35 {