6 files changed, 60 insertions, 19 deletions
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index ea0b8c5566..d2b1b6e66b 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -66,7 +66,15 @@
     font-weight: 700;
 }
 
-@default-fonts: -apple-system, BlinkMacSystemFont, system-ui, 'Segoe UI', Roboto, Helvetica, Arial;
+@font-face {
+    font-family: 'Noto Color Emoji';
+    src:
+        local('Noto Color Emoji'),
+        local('Noto-Color-Emoji'),
+        url('../vendor/assets/noto-color-emoji/NotoColorEmoji.ttf') format('truetype');
+}
+
+@default-fonts: -apple-system, BlinkMacSystemFont, system-ui, 'Segoe UI', Roboto, Helvetica, Arial, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 @monospaced-fonts: 'SF Mono', Consolas, Menlo, 'Liberation Mono', Monaco, 'Lucida Console';
 
 .override-fonts(@fonts) {
@@ -1237,3 +1245,29 @@ i.icon.centerlock {
 .text-label .color-icon {
     position: static !important;
 }
+
+.emoji,
+.reaction {
+    font-size: 1.5em;
+    line-height: 1.2;
+    font-weight: 400;
+    vertical-align: middle;
+    font-style: normal;
+}
+
+#issue-title > .emoji {
+    font-size: 1em;
+}
+
+.commit-summary > .emoji {
+    font-size: 1em;
+}
+
+.emoji img,
+.reaction img {
+    border-width: 0 !important;
+    margin: 0 !important;
+    width: 1em !important;
+    height: 1em !important;
+    vertical-align: middle !important;
+}
diff --git a/web_src/less/_dashboard.less b/web_src/less/_dashboard.less
index 9cfbb6db95..1a578d3fb0 100644
--- a/web_src/less/_dashboard.less
+++ b/web_src/less/_dashboard.less
@@ -79,6 +79,9 @@
 
 &.feeds {
     .news {
+
+        line-height: 1.2;
+
         > .ui.grid {
             margin-left: auto;
             margin-right: auto;
@@ -97,6 +100,7 @@
         }
 
         .push.news .content ul {
+            line-height: initial;
             font-size: 13px;
             list-style: none;
             padding-left: 10px;
diff --git a/web_src/less/_emojify.less b/web_src/less/_emojify.less
deleted file mode 100644
index 4cd9da3f21..0000000000
--- a/web_src/less/_emojify.less
+++ /dev/null
@@ -1,10 +0,0 @@
-.emoji {
-    width: 1.5em;
-    height: 1.5em;
-    display: inline-block;
-    background-size: contain;
-}
-
-.ui.label .emoji {
-    height: 1.2em !important;
-}
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 979d2ab45b..863f2bad8e 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -2175,6 +2175,7 @@
         &.dropdown .menu {
             right: 0 !important;
             left: auto !important;
+            min-width: 15em;
 
             > .header {
                 margin: .75rem 0 .5rem;
@@ -2183,6 +2184,7 @@
             > .item {
                 float: left;
                 padding: .5rem .5rem !important;
+                font-size: 1.5em;
 
                 img.emoji {
                     margin-right: 0;
@@ -2196,24 +2198,20 @@
         display: flex;
 
         .ui.label {
-            padding: .4em;
-            padding-right: 1em;
-            padding-left: 1em;
+            max-height: 40px;
+            padding: 9px 15px 7px;
             border: 0;
             border-right: 1px solid;
             border-radius: 0;
             margin: 0;
             font-size: 14px;
+            font-weight: 100;
             border-color: inherit !important;
 
             &.disabled {
                 cursor: default;
                 opacity: .5;
             }
-
-            > img {
-                height: 1.5em !important;
-            }
         }
 
         .ui.label.basic.blue {
@@ -2221,6 +2219,10 @@
             border-color: inherit !important;
         }
 
+        .reaction-count {
+            margin-left: 4px;
+        }
+
         .select-reaction {
             float: left;
             padding: .4em;
@@ -2229,6 +2231,9 @@
             &:not(.active) a {
                 display: none;
             }
+            > svg {
+                vertical-align: middle;
+            }
         }
 
         &:hover .select-reaction a {
diff --git a/web_src/less/_tribute.less b/web_src/less/_tribute.less
index 82ae6ee73e..d0baaf51e1 100644
--- a/web_src/less/_tribute.less
+++ b/web_src/less/_tribute.less
@@ -30,3 +30,12 @@
         color: #ffffff;
     }
 }
+
+.tribute-item {
+    display: flex;
+    align-items: center;
+}
+
+.tribute-item .emoji {
+    margin-right: .5rem;
+}
diff --git a/web_src/less/index.less b/web_src/less/index.less
index 12eb8cf8e5..968ef8dbfa 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -3,7 +3,6 @@
 
 @import "_svg";
 @import "_tribute";
-@import "_emojify";
 @import "_base";
 @import "_markdown";
 @import "_home";