diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 951ee590d1c..01cda71e47c 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -122,10 +122,10 @@
 			</div><!-- end dropdown menu create new -->
 
 			<div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
-				<span class="text tw-flex tw-items-center">
+				{{ctx.AvatarUtils.Avatar .SignedUser 36 "not-mobile"}}
+				<span class="text tw-flex tw-items-center only-mobile">
 					{{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
 					<span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
-					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu">
 					<div class="ui header">
diff --git a/web_src/css/modules/navbar.css b/web_src/css/modules/navbar.css
index 556da2df3b0..d3004d71fbf 100644
--- a/web_src/css/modules/navbar.css
+++ b/web_src/css/modules/navbar.css
@@ -39,6 +39,19 @@
   border-radius: .28571429rem;
 }
 
+@media (min-width: 768px) {
+
+  .navbar-right > .item:not(:has(.ui.avatar)) {
+    border: 1px solid;
+    border-color: var(--color-secondary);
+  }
+
+  .navbar-right > .item:has(.ui.avatar) {
+    padding: 0!important;
+  }
+
+}
+
 #navbar .item {
   min-height: 36px;
   min-width: 36px;