diff --git a/src/components/Navigator/Navigator.tsx b/src/components/Navigator/Navigator.tsx
index 569eede26..203c39b5e 100644
--- a/src/components/Navigator/Navigator.tsx
+++ b/src/components/Navigator/Navigator.tsx
@@ -49,6 +49,9 @@ const useStyles = makeStyles(
       overflow: "hidden"
     },
     root: {
+      [theme.breakpoints.down("sm")]: {
+        height: "auto"
+      },
       height: 500,
       maxWidth: 600,
       outline: 0,
diff --git a/src/components/NavigatorButton/NavigatorButton.tsx b/src/components/NavigatorButton/NavigatorButton.tsx
index ad3189280..5e3c07341 100644
--- a/src/components/NavigatorButton/NavigatorButton.tsx
+++ b/src/components/NavigatorButton/NavigatorButton.tsx
@@ -66,6 +66,10 @@ const useStyles = makeStyles(
         "&:not(:hover)": {
           backgroundColor: theme.palette.background.paper
         },
+        [theme.breakpoints.down("sm")]: {
+          border: "none",
+          borderRadius: 16
+        },
         border: `1px solid ${theme.palette.divider}`,
         height: 40,
         marginRight: theme.spacing(2),
diff --git a/src/components/UserChip/UserChip.tsx b/src/components/UserChip/UserChip.tsx
index 5241d09b1..165499ea7 100644
--- a/src/components/UserChip/UserChip.tsx
+++ b/src/components/UserChip/UserChip.tsx
@@ -2,6 +2,7 @@ import Avatar from "@material-ui/core/Avatar";
 import Chip from "@material-ui/core/Chip";
 import ClickAwayListener from "@material-ui/core/ClickAwayListener";
 import Grow from "@material-ui/core/Grow";
+import Hidden from "@material-ui/core/Hidden";
 import MenuItem from "@material-ui/core/MenuItem";
 import Menu from "@material-ui/core/MenuList";
 import Paper from "@material-ui/core/Paper";
@@ -9,6 +10,7 @@ import Popper from "@material-ui/core/Popper";
 import makeStyles from "@material-ui/core/styles/makeStyles";
 import { User } from "@saleor/fragments/types/User";
 import ArrowDropdown from "@saleor/icons/ArrowDropdown";
+import { getUserInitials, getUserName } from "@saleor/misc";
 import classNames from "classnames";
 import React from "react";
 import { FormattedMessage } from "react-intl";
@@ -16,22 +18,43 @@ import { FormattedMessage } from "react-intl";
 const useStyles = makeStyles(
   theme => ({
     arrow: {
+      [theme.breakpoints.down("sm")]: {
+        marginLeft: 0
+      },
       marginLeft: theme.spacing(2),
       transition: theme.transitions.duration.standard + "ms"
     },
     avatar: {
       "&&": {
+        [theme.breakpoints.down("sm")]: {
+          height: 40,
+          width: 40
+        },
         height: 32,
         width: 32
       }
     },
+    avatarInitials: {
+      color: theme.palette.primary.contrastText
+    },
+    avatarPlaceholder: {
+      alignItems: "center",
+      background: theme.palette.primary.main,
+      borderRadius: "100%",
+      display: "flex",
+      justifyContent: "center"
+    },
     popover: {
+      marginTop: theme.spacing(2),
       zIndex: 1
     },
     rotate: {
       transform: "rotate(180deg)"
     },
     userChip: {
+      [theme.breakpoints.down("sm")]: {
+        height: 48
+      },
       backgroundColor: theme.palette.background.paper,
       borderRadius: 24,
       color: theme.palette.text.primary,
@@ -78,14 +101,24 @@ const UserChip: React.FC<UserChipProps> = ({
   return (
     <div className={classes.userMenuContainer} ref={anchor}>
       <Chip
-        avatar={user.avatar && <Avatar alt="user" src={user.avatar.url} />}
+        avatar={
+          user.avatar ? (
+            <Avatar alt="user" src={user.avatar.url} />
+          ) : (
+            <div className={classes.avatarPlaceholder}>
+              <div className={classes.avatarInitials}>
+                {getUserInitials(user)}
+              </div>
+            </div>
+          )
+        }
         classes={{
           avatar: classes.avatar
         }}
         className={classes.userChip}
         label={
           <>
-            {user.email}
+            <Hidden smDown>{getUserName(user, true)}</Hidden>
             <ArrowDropdown
               className={classNames(classes.arrow, {
                 [classes.rotate]: isMenuOpened