diff --git a/public/css/gogs.css b/public/css/gogs.css
index c3ac5ffce1..426d85243e 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -5,9 +5,7 @@
   font-style: normal;
 }
 .octicon,
-.mega-octicon,
-.icon.octicon,
-.icon.mega-octicon {
+.mega-octicon {
   font: normal normal normal 16px/1 octicons;
   display: inline-block;
   text-decoration: none;
@@ -1052,6 +1050,7 @@ footer .container .links > *:first-child {
 .octicon.icon,
 .mega-octicon.icon {
   font-family: octicons;
+  font-size: 16px;
   opacity: 1 !important;
 }
 .sr-only {
diff --git a/public/less/_base.less b/public/less/_base.less
index 77ed754518..fd12c80b2b 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -313,9 +313,11 @@ footer {
   .generate-img(@n, (@i + 1));
 }
 
+// ensure Semantic UI .icon font family and 14px size does not apply to .icon.octicon
 .octicon.icon,
 .mega-octicon.icon {
 	font-family: octicons;
+	font-size: 16px;
 	opacity: 1 !important;
 }
 
diff --git a/public/less/_octicons.less b/public/less/_octicons.less
index a159dec851..dfd437e6b1 100755
--- a/public/less/_octicons.less
+++ b/public/less/_octicons.less
@@ -14,9 +14,7 @@
 
 // .octicon is optimized for 16px.
 // .mega-octicon is optimized for 32px but can be used larger.
-.octicon, .mega-octicon,
-// ensure Semantic UI .icon of 14px does not apply to .icon.octicon:
-.icon.octicon, .icon.mega-octicon {
+.octicon, .mega-octicon {
   font: normal normal normal 16px/1 octicons;
   display: inline-block;
   text-decoration: none;