diff --git a/public/css/index.css b/public/css/index.css
index ec92e8358bd..5976ac71955 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -668,6 +668,7 @@ footer .ui.left,footer .ui.right{line-height:40px}
 .repository .diff-file-box .code-diff-split tbody tr td:nth-child(4){border-left-width:1px;border-left-style:solid}
 .repository .diff-file-box.file-content{clear:right}
 .repository .diff-file-box.file-content img{max-width:100%;padding:5px 5px 0 5px}
+.repository .diff-file-box.file-content img.emoji{padding:0}
 .repository .code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}
 .repository .repo-search-result{padding-top:10px;padding-bottom:10px}
 .repository .repo-search-result .lines-num a{color:inherit}
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 76ad0226393..5cad42b98a6 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -1544,6 +1544,9 @@
                 max-width: 100%;
                 padding: 5px 5px 0 5px;
             }
+            img.emoji {
+                padding: 0;
+            }
 
             clear: right;
         }