diff --git a/public/css/gogs.css b/public/css/gogs.css
index a9c3249c7..b064c1e7e 100644
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -108,6 +108,9 @@ code.wrap {
 .following.bar .avatar > .ui.image {
   margin-right: 0;
 }
+.following.bar .avatar .octicon-triangle-down {
+  margin-top: 6.5px;
+}
 .following.bar .searchbox {
   background-color: #f4f4f4 !important;
 }
@@ -439,6 +442,14 @@ footer .ui.language .menu {
   background: inherit !important;
   padding: 0 !important;
 }
+.ui.dropdown .menu > .item > .image,
+.ui.dropdown .menu > .item > img,
+.ui.dropdown > .text > .image,
+.ui.dropdown > .text > img {
+  vertical-align: middle;
+  margin-top: 0;
+  margin-bottom: 0;
+}
 .markdown:not(code) {
   overflow: hidden;
   font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;
diff --git a/public/less/_base.less b/public/less/_base.less
index ce422bf0f..b65b9f993 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -98,6 +98,9 @@ pre, code {
 	.avatar > .ui.image {
 		margin-right: 0;
 	}
+	.avatar .octicon-triangle-down {
+		margin-top: 6.5px;
+	}
 	.searchbox {
 		background-color: rgb(244, 244, 244) !important;
 		&:focus {
@@ -425,3 +428,13 @@ footer {
 	background: inherit !important;
 	padding: 0 !important;
 }
+
+// Reset CSS to prevent UI breaks
+.ui.dropdown .menu>.item>.image,
+.ui.dropdown .menu>.item>img,
+.ui.dropdown>.text>.image,
+.ui.dropdown>.text>img {
+	vertical-align: middle;
+	margin-top: 0;
+    margin-bottom: 0;
+}
\ No newline at end of file