diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs
index 72f83a0661..f18ad409db 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs
@@ -16,22 +16,29 @@
   under the License.
 }}
 {{#zone "userMenu"}}
-    <a href="#" class="dropdown" data-toggle="dropdown">
-            <span class="hidden-xs add-padding-left-3x">
-                {{@user.username}}<span class="caret"></span>
-            </span>
-        <span class="icon fw-stack fw-lg"><i class="fw fw-user fw-stack-1x"></i></span>
-    </a>
-    <ul class="dropdown-menu float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
-        role="menu">
-        <li class="dropdown-header visible-xs">
-            {{@user.username}}<span class="caret"></span>
+    <ul class="nav navbar-right float-remove-xs text-center-xs">
+        <li class="visible-inline-block">
+            <a href="#" class="dropdown" data-toggle="dropdown">
+                <span class="icon fw-stack fw-lg">
+                   <i class="fw fw-circle fw-stack-2x"></i>
+                   <i class="fw fw-user fw-stack-1x fw-inverse"></i>
+                </span>
+                <span class="hidden-xs add-padding-left-1x">
+                    {{@user.username}}<span class="caret"></span>
+                </span>
+            </a>
+            <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+                role="menu">
+                <li class="dropdown-header visible-xs">
+                    {{@user.username}}<span class="caret"></span>
+                </li>
+                <li class="divider visible-xs"></li>
+                {{#defineZone "userMenu-items"}}
+                    <li>
+                        <a href="{{@app.context}}/signout">Sign Out</a>
+                    </li>
+                {{/defineZone}}
+            </ul>
         </li>
-        <li class="divider visible-xs"></li>
-        {{#defineZone "userMenu-items"}}
-            <li>
-                <a href="{{@app.context}}/signout">Sign Out</a>
-            </li>
-        {{/defineZone}}
     </ul>
 {{/zone}}
\ No newline at end of file