diff --git a/CHANGELOG.md b/CHANGELOG.md
index 103d8e49d..5467352ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Add navigator button - #635 by @dominik-zeglen
 - Update to newest schema - #638 by @dominik-zeglen
 - Fix missing save button - #636 by @dominik-zeglen
+- Fix user avatars - #639 by @dominik-zeglen
 
 ## 2.10.1
 
diff --git a/src/fragments/permissionGroups.ts b/src/fragments/permissionGroups.ts
index d16a0afbe..e2ea84ec2 100644
--- a/src/fragments/permissionGroups.ts
+++ b/src/fragments/permissionGroups.ts
@@ -33,6 +33,9 @@ export const permissionGroupDetailsFragment = gql`
     }
     users {
       ...StaffMemberFragment
+      avatar(size: 48) {
+        url
+      }
     }
   }
 `;
diff --git a/src/fragments/staff.ts b/src/fragments/staff.ts
index 4262563c8..edc469c7e 100644
--- a/src/fragments/staff.ts
+++ b/src/fragments/staff.ts
@@ -7,9 +7,6 @@ export const staffMemberFragment = gql`
     firstName
     isActive
     lastName
-    avatar {
-      url
-    }
   }
 `;
 export const staffMemberDetailsFragment = gql`
@@ -25,5 +22,8 @@ export const staffMemberDetailsFragment = gql`
       code
       name
     }
+    avatar(size: 120) {
+      url
+    }
   }
 `;
diff --git a/src/fragments/types/StaffMemberDetailsFragment.ts b/src/fragments/types/StaffMemberDetailsFragment.ts
index a52f00126..22f80c5d8 100644
--- a/src/fragments/types/StaffMemberDetailsFragment.ts
+++ b/src/fragments/types/StaffMemberDetailsFragment.ts
@@ -8,11 +8,6 @@ import { PermissionEnum } from "./../../types/globalTypes";
 // GraphQL fragment: StaffMemberDetailsFragment
 // ====================================================
 
-export interface StaffMemberDetailsFragment_avatar {
-  __typename: "Image";
-  url: string;
-}
-
 export interface StaffMemberDetailsFragment_permissionGroups {
   __typename: "Group";
   id: string;
@@ -26,6 +21,11 @@ export interface StaffMemberDetailsFragment_userPermissions {
   name: string;
 }
 
+export interface StaffMemberDetailsFragment_avatar {
+  __typename: "Image";
+  url: string;
+}
+
 export interface StaffMemberDetailsFragment {
   __typename: "User";
   id: string;
@@ -33,7 +33,7 @@ export interface StaffMemberDetailsFragment {
   firstName: string;
   isActive: boolean;
   lastName: string;
-  avatar: StaffMemberDetailsFragment_avatar | null;
   permissionGroups: (StaffMemberDetailsFragment_permissionGroups | null)[] | null;
   userPermissions: (StaffMemberDetailsFragment_userPermissions | null)[] | null;
+  avatar: StaffMemberDetailsFragment_avatar | null;
 }
diff --git a/src/fragments/types/StaffMemberFragment.ts b/src/fragments/types/StaffMemberFragment.ts
index f5098fcdf..118b747c1 100644
--- a/src/fragments/types/StaffMemberFragment.ts
+++ b/src/fragments/types/StaffMemberFragment.ts
@@ -6,11 +6,6 @@
 // GraphQL fragment: StaffMemberFragment
 // ====================================================
 
-export interface StaffMemberFragment_avatar {
-  __typename: "Image";
-  url: string;
-}
-
 export interface StaffMemberFragment {
   __typename: "User";
   id: string;
@@ -18,5 +13,4 @@ export interface StaffMemberFragment {
   firstName: string;
   isActive: boolean;
   lastName: string;
-  avatar: StaffMemberFragment_avatar | null;
 }
diff --git a/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx b/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx
index fc1448a9a..ec51ca259 100644
--- a/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx
+++ b/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx
@@ -52,8 +52,8 @@ const useStyles = makeStyles(
       width: 47
     },
     avatarDefault: {
-      "& p": {
-        color: "#fff",
+      "& div": {
+        color: theme.palette.primary.contrastText,
         lineHeight: "47px"
       },
       background: theme.palette.primary.main,
diff --git a/src/staff/components/StaffList/StaffList.tsx b/src/staff/components/StaffList/StaffList.tsx
index e00898098..2f60804de 100644
--- a/src/staff/components/StaffList/StaffList.tsx
+++ b/src/staff/components/StaffList/StaffList.tsx
@@ -38,8 +38,8 @@ const useStyles = makeStyles(
       width: 47
     },
     avatarDefault: {
-      "& p": {
-        color: "#fff",
+      "& div": {
+        color: theme.palette.primary.contrastText,
         lineHeight: "47px"
       },
       background: theme.palette.primary.main,
diff --git a/src/staff/queries.ts b/src/staff/queries.ts
index b8a86103c..4c2c6ef0e 100644
--- a/src/staff/queries.ts
+++ b/src/staff/queries.ts
@@ -34,6 +34,9 @@ const staffList = gql`
         cursor
         node {
           ...StaffMemberFragment
+          avatar(size: 48) {
+            url
+          }
         }
       }
       pageInfo {
diff --git a/src/staff/types/StaffMemberAdd.ts b/src/staff/types/StaffMemberAdd.ts
index d42e80dcf..d5b176cff 100644
--- a/src/staff/types/StaffMemberAdd.ts
+++ b/src/staff/types/StaffMemberAdd.ts
@@ -14,11 +14,6 @@ export interface StaffMemberAdd_staffCreate_errors {
   field: string | null;
 }
 
-export interface StaffMemberAdd_staffCreate_user_avatar {
-  __typename: "Image";
-  url: string;
-}
-
 export interface StaffMemberAdd_staffCreate_user_permissionGroups {
   __typename: "Group";
   id: string;
@@ -32,6 +27,11 @@ export interface StaffMemberAdd_staffCreate_user_userPermissions {
   name: string;
 }
 
+export interface StaffMemberAdd_staffCreate_user_avatar {
+  __typename: "Image";
+  url: string;
+}
+
 export interface StaffMemberAdd_staffCreate_user {
   __typename: "User";
   id: string;
@@ -39,9 +39,9 @@ export interface StaffMemberAdd_staffCreate_user {
   firstName: string;
   isActive: boolean;
   lastName: string;
-  avatar: StaffMemberAdd_staffCreate_user_avatar | null;
   permissionGroups: (StaffMemberAdd_staffCreate_user_permissionGroups | null)[] | null;
   userPermissions: (StaffMemberAdd_staffCreate_user_userPermissions | null)[] | null;
+  avatar: StaffMemberAdd_staffCreate_user_avatar | null;
 }
 
 export interface StaffMemberAdd_staffCreate {
diff --git a/src/staff/types/StaffMemberDetails.ts b/src/staff/types/StaffMemberDetails.ts
index 1935e7461..2ec999c1a 100644
--- a/src/staff/types/StaffMemberDetails.ts
+++ b/src/staff/types/StaffMemberDetails.ts
@@ -8,11 +8,6 @@ import { PermissionEnum } from "./../../types/globalTypes";
 // GraphQL query operation: StaffMemberDetails
 // ====================================================
 
-export interface StaffMemberDetails_user_avatar {
-  __typename: "Image";
-  url: string;
-}
-
 export interface StaffMemberDetails_user_permissionGroups {
   __typename: "Group";
   id: string;
@@ -26,6 +21,11 @@ export interface StaffMemberDetails_user_userPermissions {
   name: string;
 }
 
+export interface StaffMemberDetails_user_avatar {
+  __typename: "Image";
+  url: string;
+}
+
 export interface StaffMemberDetails_user {
   __typename: "User";
   id: string;
@@ -33,9 +33,9 @@ export interface StaffMemberDetails_user {
   firstName: string;
   isActive: boolean;
   lastName: string;
-  avatar: StaffMemberDetails_user_avatar | null;
   permissionGroups: (StaffMemberDetails_user_permissionGroups | null)[] | null;
   userPermissions: (StaffMemberDetails_user_userPermissions | null)[] | null;
+  avatar: StaffMemberDetails_user_avatar | null;
 }
 
 export interface StaffMemberDetails {
diff --git a/src/staff/types/StaffMemberUpdate.ts b/src/staff/types/StaffMemberUpdate.ts
index b7ce4c317..abf093d50 100644
--- a/src/staff/types/StaffMemberUpdate.ts
+++ b/src/staff/types/StaffMemberUpdate.ts
@@ -14,11 +14,6 @@ export interface StaffMemberUpdate_staffUpdate_errors {
   field: string | null;
 }
 
-export interface StaffMemberUpdate_staffUpdate_user_avatar {
-  __typename: "Image";
-  url: string;
-}
-
 export interface StaffMemberUpdate_staffUpdate_user_permissionGroups {
   __typename: "Group";
   id: string;
@@ -32,6 +27,11 @@ export interface StaffMemberUpdate_staffUpdate_user_userPermissions {
   name: string;
 }
 
+export interface StaffMemberUpdate_staffUpdate_user_avatar {
+  __typename: "Image";
+  url: string;
+}
+
 export interface StaffMemberUpdate_staffUpdate_user {
   __typename: "User";
   id: string;
@@ -39,9 +39,9 @@ export interface StaffMemberUpdate_staffUpdate_user {
   firstName: string;
   isActive: boolean;
   lastName: string;
-  avatar: StaffMemberUpdate_staffUpdate_user_avatar | null;
   permissionGroups: (StaffMemberUpdate_staffUpdate_user_permissionGroups | null)[] | null;
   userPermissions: (StaffMemberUpdate_staffUpdate_user_userPermissions | null)[] | null;
+  avatar: StaffMemberUpdate_staffUpdate_user_avatar | null;
 }
 
 export interface StaffMemberUpdate_staffUpdate {