diff --git a/core/static/core/navbar.scss b/core/static/core/navbar.scss
index d3c1d4a4..abb8795a 100644
--- a/core/static/core/navbar.scss
+++ b/core/static/core/navbar.scss
@@ -181,46 +181,43 @@
 
       > .user {
         display: flex;
-        flex-direction: column;
-        gap: 5px;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        gap: 15px;
 
-        @media (max-width: 400px) {
+        @media (max-width: 1200px) {
           width: 100%;
+          flex-direction: row-reverse;
         }
 
-        > .options,
-        > .name {
-          > a {
-            color: white;
-            &:hover {
-              color: #1a78b3;
-            }
-          }
-        }
-
-        > .name {
-          color: white;
-          max-width: 250px;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          overflow: hidden;
-
-          @media (max-width: 400px) {
-            max-width: 100%;
-          }
-
-          &:hover {
-            color: #1a78b3;
-          }
+        > a > img {
+          width: 40px;
+          height: 40px;
+          border-radius: 50%;
         }
 
         > .options {
           width: 100%;
           display: flex;
-          gap: 20px;
           justify-content: flex-end;
+          flex-direction: column;
+          gap: 5px;
+
+          @media (max-width: 1200px) {
+            justify-content: flex-start;
+            flex-direction: row;
+            gap: 15px;
+          }
 
           > a {
+            text-align: right;
+            color: white;
+
+            &:hover {
+              color: #1a78b3;
+            }
+
             &:last-child {
               color: #eb2f06;
 
@@ -229,10 +226,6 @@
               }
             }
           }
-
-          @media (max-width: 1200px) {
-            justify-content: flex-start;
-          }
         }
       }
 
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 15000ee1..5b06902e 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -87,11 +87,17 @@
                             </div>
                             <div class="right">
                                 <div class="user">
-                                    <a class="name" href="{{ url('core:user_profile', user_id=user.id) }}">{{ user.get_display_name() }}</a>
                                     <div class="options">
                                         <a href="{{ url('core:user_tools') }}">{% trans %}Tools{% endtrans %}</a>
                                         <a href="{{ url('core:logout') }}">{% trans %}Logout{% endtrans %}</a>
                                     </div>
+                                    <a href="{{ url('core:user_profile', user_id=user.id) }}">
+                                         {% if user.profile_pict %}
+                                            <img src="{{ user.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}" title="{% trans %}Profile{% endtrans %}" />
+                                        {% else %}
+                                            <img src="{{ static('core/img/unknown.jpg') }}" alt="{% trans %}Profile{% endtrans %}" title="{% trans %}Profile{% endtrans %}" />
+                                        {% endif %}
+                                    </a>
                                 </div>
                                 <div class="notification">
                                     <a href="#" onclick="display_notif()">