diff --git a/components/navbar/navbar.sass b/components/navbar/navbar.sass
index c373f185..0ccfe119 100644
--- a/components/navbar/navbar.sass
+++ b/components/navbar/navbar.sass
@@ -87,7 +87,7 @@
 
       .avatar-wrap
         @apply bg-ps-primary relative rounded-full
-        @apply w-54 h-54 mr-2
+        @apply w-54 h-54 mr-2 cursor-pointer
 
         @screen md
           @apply h-72 w-72
@@ -99,6 +99,17 @@
           @screen md
             @apply h-66 w-66
 
+        .change-wrap
+          @apply absolute w-full bg-ps-white rounded-full
+          @apply w-48 h-48 ps-center-absolute opacity-50
+          @apply flex items-center justify-center
+
+          @screen md
+            @apply h-66 w-66
+
+          .icon
+            @apply opacity-100
+
       .user-info
         @screen md
           @apply pl-5
@@ -119,3 +130,25 @@
 
         .microsoft-btn
           border-bottom: 1px solid black
+
+.picture-modal-wrapper
+  @apply text-ps-white
+
+  .title
+    @apply text-ps-green text-2xl
+
+  .placeholder
+    @apply my-6 mx-auto
+    @apply flex items-center justify-center
+
+    img
+      @apply rounded-full
+      @apply border-solid border-4 border-ps-green
+
+      width: 100px
+      height: 100px
+
+      object-fit: cover
+
+  .actions
+    @apply flex justify-end
diff --git a/components/navbar/navbar.vue b/components/navbar/navbar.vue
index 0e4346b7..446c1ce3 100644
--- a/components/navbar/navbar.vue
+++ b/components/navbar/navbar.vue
@@ -2,8 +2,10 @@
 .navbar
   .user
     .user-wrap
-      .avatar-wrap(v-if='mainStore.isLoggedIn')
+      .avatar-wrap(v-if='mainStore.isLoggedIn', @click='pictureModal = !pictureModal', @mouseover='pictureHover = true', @mouseleave='pictureHover = false')
         img.avatar(:src='mainStore.profilePicture')/
+        .change-wrap(v-if='pictureHover')
+          edit-icon.icon
       .user-info.flex(@click='toggleSettings', v-on-clickaway='closeSettings')
         .user-text(v-if='mainStore.isLoggedIn')
           span.user-name {{ mainStore.displayName }}
@@ -29,12 +31,20 @@
   .menu-btn(v-if='!isDesktop', @click='toggleBurger')
     .burger(:class='{ active: burger }')
   ps-modal(v-model='loginModal')
-    .flex.justify-center 
+    .flex.justify-center
       ps-login-form(@login-complete='toggleLoginModal')
+  ps-modal(v-model='pictureModal')
+    .picture-modal-wrapper
+      span.title Změna profilového obrázku
+      .placeholder
+        img(:src='placeholderImage')
+      ps-drag-drop(tile, :draggable='false', accept='.jpg,.jpeg,.gif,.png', v-model='selectedPicture', @input='changePlaceholder', :disabled='uploading')
+      .actions
+        ps-btn(@click='uploadPicture', :disabled='uploading', :loading='uploading') nahrát
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, onMounted, computed, watchEffect } from '@nuxtjs/composition-api';
+import { defineComponent, ref, onMounted, computed, watchEffect, unref } from '@nuxtjs/composition-api';
 
 import { useMainStore } from '@/store';
 
@@ -44,10 +54,13 @@ import user from 'vue-material-design-icons/Account.vue';
 import logout from 'vue-material-design-icons/Logout.vue';
 import microsoftLogo from 'vue-material-design-icons/Microsoft.vue';
 import arrowRight from 'vue-material-design-icons/ChevronRight.vue';
+import editIcon from 'vue-material-design-icons/ImageEdit.vue';
 
 import { directive as onClickaway } from 'vue-clickaway';
 
-import * as firebase from 'firebase/app';
+import firebase from 'firebase/app';
+import 'firebase/auth';
+import axios from 'axios';
 
 type Props = {
   value: boolean;
@@ -61,6 +74,7 @@ export default defineComponent({
     logout,
     microsoftLogo,
     arrowRight,
+    editIcon,
   },
 
   // @ts-ignore
@@ -114,8 +128,6 @@ export default defineComponent({
     const closeNotifications = () => (displayNotifications.value = false);
 
     const logOut = async () => {
-      await require('firebase/auth');
-
       try {
         await firebase.auth().signOut();
         mainStore.reset();
@@ -137,6 +149,51 @@ export default defineComponent({
       notificationsLength.value = length;
     };
 
+    const pictureHover = ref(false);
+    const pictureModal = ref(false);
+    const selectedPicture = ref([]);
+
+    const placeholderImage = ref(unref(mainStore.state.user.profilePicture));
+    const uploading = ref(false);
+
+    const uploadPicture = async () => {
+      uploading.value = true;
+      const fd = new FormData();
+
+      fd.append('avatar', selectedPicture.value[0]);
+
+      try {
+        const response = await axios.patch('/api/user/picture', fd, {
+          headers: {
+            authorization: `Bearer ${await firebase.auth().currentUser?.getIdToken()}`,
+          },
+        });
+
+        mainStore.patch({ user: { profilePicture: response.data } });
+      } catch (e) {
+        console.error(e);
+      }
+
+      uploading.value = false;
+      pictureModal.value = false;
+    };
+
+    const changePlaceholder = () => {
+      if (!selectedPicture.value.length) {
+        placeholderImage.value = unref(mainStore.state.user.profilePicture);
+        return;
+      }
+
+      const reader = new FileReader();
+
+      reader.onload = (e) => {
+        // @ts-ignore
+        placeholderImage.value = e.target?.result;
+      };
+
+      reader.readAsDataURL(selectedPicture.value[0]);
+    };
+
     return {
       burger,
       toggleBurger,
@@ -153,6 +210,13 @@ export default defineComponent({
       updateNotifications,
       notificationsLength,
       toggleLoginModal,
+      pictureModal,
+      uploadPicture,
+      pictureHover,
+      selectedPicture,
+      changePlaceholder,
+      placeholderImage,
+      uploading,
     };
   },
 });
diff --git a/components/notifications-list/notifications-list.sass b/components/notifications-list/notifications-list.sass
index 3f63de4d..470cdda9 100644
--- a/components/notifications-list/notifications-list.sass
+++ b/components/notifications-list/notifications-list.sass
@@ -5,11 +5,11 @@
   max-height: 325px
 
   .wrapper
-    @apply p-2
+    @apply p-1 w-full
     overflow-y: overlay
 
   .wrapper::-webkit-scrollbar, .wrapper::-webkit-scrollbar-thumb
-    width: 23px
+    width: 24px
     border-radius: 13px
     background-clip: padding-box
     border: 10px solid transparent
diff --git a/server/api/index.ts b/server/api/index.ts
index ca4c79bc..6d4559c0 100644
--- a/server/api/index.ts
+++ b/server/api/index.ts
@@ -21,6 +21,7 @@ if (!admin.apps.length)
 // user
 app.post('/user/create', async (req, res) => (await import('./user/create-user')).default(req, res));
 app.put('/user/year', async (req, res) => (await import('./user/update-year')).default(req, res));
+app.patch('/user/picture', uploader.single('avatar'), async (req, res) => (await import('./user/profile-picture')).default(req, res));
 
 // proposal
 app.put('/proposal/accept/:id', async (req, res) => (await import('./proposal/accept')).default(req, res));
diff --git a/server/api/user/profile-picture.ts b/server/api/user/profile-picture.ts
new file mode 100644
index 00000000..10b2f476
--- /dev/null
+++ b/server/api/user/profile-picture.ts
@@ -0,0 +1,75 @@
+import { Request, Response } from 'express';
+import admin from 'firebase-admin';
+
+import short from 'short-uuid';
+
+export default async (req: Request, res: Response) => {
+  const idToken = req.headers.authorization?.split(' ')[1] ?? '';
+  // @ts-ignore
+  const avatarImg = req.file;
+
+  const splittedName = avatarImg.originalname.split('.');
+  const extension = splittedName[splittedName.length - 1];
+
+  const acceptedExtensions = ['jpeg', 'jpg', 'png', 'gif'];
+
+  if (!avatarImg.mimetype.includes('image/') || !acceptedExtensions.some((acceptedExtension) => acceptedExtension === extension)) return res.status(400).send();
+
+  try {
+    const userAuth = await admin.auth().verifyIdToken(idToken);
+
+    try {
+      const bucket = admin.storage().bucket('ps-profile-pictures');
+      const userRef = admin.firestore().collection('users').doc(userAuth.uid);
+
+      const fileName = `${short().new()}.${extension}`;
+
+      const uploadedUrl = await new Promise((resolve, reject) => {
+        const blob = bucket.file(fileName);
+
+        const blobStream = blob.createWriteStream({
+          metadata: {
+            contentType: avatarImg.mimetype,
+          },
+          resumable: false,
+        });
+
+        blobStream.on('finish', async () => {
+          try {
+            await admin.firestore().runTransaction(async (transaction) => {
+              const sfDoc = await transaction.get(userRef);
+
+              if (!sfDoc.data()?.profilePicture.includes('empty')) {
+                const splittedUrl = sfDoc.data()?.profilePicture.split('/');
+                await bucket.file(splittedUrl[splittedUrl.length - 1]).delete();
+              }
+
+              transaction.update(userRef, {
+                profilePicture: `https://storage.googleapis.com/ps-profile-pictures/${fileName}`,
+              });
+
+              return transaction;
+            });
+          } catch (e) {
+            reject(e);
+          }
+
+          resolve(`https://storage.googleapis.com/ps-profile-pictures/${fileName}`);
+        });
+
+        blobStream.on('error', (e) => {
+          reject(e);
+        });
+
+        blobStream.end(avatarImg.buffer);
+      });
+
+      return res.status(200).send(uploadedUrl);
+    } catch (e) {
+      console.error(e);
+      return res.status(500).send(e);
+    }
+  } catch (_) {
+    return res.status(401).send();
+  }
+};