diff --git a/public/css/gogs.css b/public/css/gogs.css
index fa81cd5d4..3fc0805e6 100644
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -5,7 +5,7 @@
   background-size: contain;
 }
 body {
-  font-family: "PingFang SC", "Helvetica Neue", "Microsoft YaHei", SimSun, Arial, Helvetica, sans-serif !important;
+  font-family: "PingFang SC", "Helvetica Neue", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
   background-color: #fff;
   overflow-y: scroll;
 }
@@ -15,9 +15,10 @@ h3,
 h4,
 h5,
 .ui.header,
+.ui.menu,
 .ui.input input,
 .ui.button:not(.label) {
-  font-family: "PingFang SC", 'Hiragino Sans GB', "Helvetica Neue", "Microsoft YaHei", SimSun, Arial, Helvetica, sans-serif !important;
+  font-family: "PingFang SC", 'Hiragino Sans GB', "Helvetica Neue", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
 }
 img {
   border-radius: 3px;
diff --git a/public/less/_base.less b/public/less/_base.less
index c6e416f36..0c71bd9d1 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -1,15 +1,16 @@
 @footer-margin: 40px;
 
 body {
-	font-family: "PingFang SC", "Helvetica Neue", "Microsoft YaHei", SimSun, Arial, Helvetica, sans-serif !important;
+	font-family: "PingFang SC", "Helvetica Neue", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
 	background-color: #fff;
 	overflow-y: scroll;
 }
 h1, h2, h3, h4, h5,
 .ui.header,
+.ui.menu,
 .ui.input input,
 .ui.button:not(.label) {
-	font-family: "PingFang SC", 'Hiragino Sans GB', "Helvetica Neue", "Microsoft YaHei", SimSun, Arial, Helvetica, sans-serif !important;
+	font-family: "PingFang SC", 'Hiragino Sans GB', "Helvetica Neue", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
 }
 img {
 	border-radius: 3px;
diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index ae09b2524..1a8c7aa81 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -18,12 +18,12 @@
 					<div class="two column row">
 						<a class="reference column" href="#" data-target="#branch-list">
 							<span class="text {{if not .IsViewTag}}black{{end}}">
-								<i class="octicon octicon-git-branch"></i> {{.i18n.Tr "repo.branches"}}
+								{{.i18n.Tr "repo.branches"}}
 							</span>
 						</a>
 						<a class="reference column" href="#" data-target="#tag-list">
 							<span class="text {{if .IsViewTag}}black{{end}}">
-								<i class="reference tags icon"></i> {{.i18n.Tr "repo.tags"}}
+								{{.i18n.Tr "repo.tags"}}
 							</span>
 						</a>
 					</div>