5 files changed, 16 insertions, 23 deletions
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index bed672a35a..31f71d3c00 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -692,12 +692,9 @@ a.ui.card:hover,
   border-color: var(--color-secondary);
 }
 
-.ui.avatar.images .image,
-.ui.avatar.images img,
-.ui.avatar.images svg,
-.ui.avatar.image img,
-.ui.avatar.image svg,
-.ui.avatar.image,
+.ui.avatar img,
+.ui.avatar svg,
+.ui.avatar.img,
 .ui.cards > .card img.avatar,
 .ui.cards > .card .avatar img,
 .ui.card img.avatar,
@@ -758,10 +755,6 @@ a.ui.card:hover,
     padding-left: 0;
   }
 
-  .brand .ui.mini.image {
-    width: 30px;
-  }
-
   .top.menu a.item:hover,
   .top.menu .dropdown.item:hover,
   .top.menu .dropdown.item.active {
@@ -1686,7 +1679,7 @@ a.ui.label:hover {
     }
   }
 
-  .ui.avatar.image {
+  .ui.avatar {
     height: 18px;
     width: 18px;
     display: block;
diff --git a/web_src/less/_explore.less b/web_src/less/_explore.less
index 3a31fe44d8..b07b33461e 100644
--- a/web_src/less/_explore.less
+++ b/web_src/less/_explore.less
@@ -75,7 +75,7 @@
       padding-top: 25px;
     }
 
-    .ui.avatar.image {
+    img.ui.avatar {
       width: 40px;
       height: 40px;
     }
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 219597190d..f5be0b34e6 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -846,8 +846,8 @@
           display: none;
         }
 
-        .avatar.image,
-        .avatar.image img {
+        img.avatar,
+        .avatar img {
           width: 20px;
           height: 20px;
           margin: 0 .25rem;
@@ -908,8 +908,8 @@
             line-height: 34px; /* this must be same as .badge height, to avoid overflow */
             clear: both; // reset the "float right shabox", in the future, use flexbox instead
 
-            > .avatar.image,
-            > .avatar.image img {
+            > img.avatar,
+            > .avatar img {
               position: relative;
               top: -2px;
             }
@@ -1125,7 +1125,7 @@
           margin-left: 36px;
         }
 
-        .avatar.image {
+        img.avatar {
           width: 28px;
           height: 28px;
         }
@@ -2497,7 +2497,7 @@
 #search-user-box {
   .results {
     .result {
-      .image {
+      img {
         float: left;
         margin-right: 8px;
         width: 2em;
@@ -3305,7 +3305,7 @@ td.blob-excerpt {
         display: flex;
         margin-bottom: auto;
 
-        img.avatar.image {
+        img.avatar {
           height: 24px;
           width: 24px;
         }
diff --git a/web_src/less/_review.less b/web_src/less/_review.less
index 2fa8efd67e..e3b88ed928 100644
--- a/web_src/less/_review.less
+++ b/web_src/less/_review.less
@@ -90,10 +90,10 @@
         float: none;
         margin: 0 .5rem 0 0;
         flex-shrink: 0;
+      }
 
-        &.image {
-          margin: 0 !important;
-        }
+      img.avatar {
+        margin: 0 !important;
       }
 
       .comment-content {
diff --git a/web_src/less/features/gitgraph.less b/web_src/less/features/gitgraph.less
index efb6071e49..f6b1be5ba6 100644
--- a/web_src/less/features/gitgraph.less
+++ b/web_src/less/features/gitgraph.less
@@ -134,7 +134,7 @@
       padding-bottom: 1px;
     }
 
-    .author .ui.avatar.image {
+    .author img.ui.avatar {
       width: auto;
       height: 18px;
       max-width: none;