diff --git a/app/build.gradle b/app/build.gradle
index e4bc9985d..b065e67ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -101,7 +101,7 @@ dependencies {
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.gms:play-services-auth:20.1.0'
+    implementation 'com.google.android.gms:play-services-auth:20.2.0'
     implementation ('com.github.bumptech.glide:glide:4.13.0', {
         exclude group: 'com.android.support'
     })
@@ -116,6 +116,9 @@ dependencies {
     testImplementation "io.mockk:mockk:1.12.3"
     androidTestImplementation "io.mockk:mockk-android:1.12.3"
 
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.github.kenglxn.QRGen:android:2.6.0'
 }
 
 tasks.withType(Test) {
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
index e7a6d8c7c..b60ccb3cf 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt
@@ -10,8 +10,7 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
 import ch.sdp.vibester.TestMode
@@ -22,6 +21,7 @@ import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.mockk.every
 import io.mockk.mockk
+import org.hamcrest.CoreMatchers.not
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -77,7 +77,7 @@ class ProfileActivityTest {
     }
 
     @Test
-    fun clickBackToMain(){
+    fun clickBackToMain() {
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
         intent.putExtra("isUnitTest", true)
@@ -88,6 +88,33 @@ class ProfileActivityTest {
         Intents.intended(IntentMatchers.hasComponent(WelcomeActivity::class.java.name))
     }
 
+    @Test
+    fun shouldShowQrCode() {
+        val ctx = ApplicationProvider.getApplicationContext() as Context
+        val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
+
+        onView(withId(R.id.showQRCode)).perform(click())
+        onView(withId(R.id.QrCodePage)).check(matches(isDisplayed()))
+        onView(withId(R.id.profileContent)).check(matches(not(isDisplayed())))
+        onView(withId(R.id.qrCode)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun clickBackToProfile() {
+        val ctx = ApplicationProvider.getApplicationContext() as Context
+        val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
+        onView(withId(R.id.showQRCode)).perform(click())
+        onView(withId(R.id.qrCode_returnToProfile)).perform(click())
+        onView(withId(R.id.QrCodePage)).check(matches(not(isDisplayed())))
+        onView(withId(R.id.profileContent)).check(matches(isDisplayed()))
+    }
+
 
     @Test
     fun checkEditProfile() {
@@ -102,14 +129,13 @@ class ProfileActivityTest {
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         val newUsername = "Lalisa Bon idomesniu"
-        onView(withId(R.id.editUser)).perform(ViewActions.click())
+        onView(withId(R.id.editUser)).perform(click())
         onView(withId(0)).perform(
             ViewActions.typeText(newUsername),
             ViewActions.closeSoftKeyboard()
         )
-        onView(withText("OK")).perform(ViewActions.click())
+        onView(withText("OK")).perform(click())
         onView(withId(R.id.username)).check(matches(withText(newUsername)))
-
     }
 
     @Test
@@ -124,9 +150,24 @@ class ProfileActivityTest {
 
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
-        onView(withId(R.id.editUser)).perform(ViewActions.click())
-        onView(withText("Cancel")).perform(ViewActions.click())
+        onView(withId(R.id.editUser)).perform(click())
+        onView(withText("Cancel")).perform(click())
         onView(withId(R.id.username)).check(matches(withText("Lalisa Bon")))
     }
 
+    @Test
+    fun checkQrCodeGenerator() {
+        val inputProfile = User( "Lalisa Bon","bit.ly/3IUnyAF", "lisa@test.com",  12, 8, 29, 0, "VvPB47tQCLdjz3YebilS6h5EXdJ3")
+        val ctx = ApplicationProvider.getApplicationContext() as Context
+        val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile", inputProfile)
+
+        createMockInvocation(inputProfile)
+
+        val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
+        onView(withId(R.id.showQRCode)).perform(click())
+        onView(withId(R.id.qrCode)).check(matches(isDisplayed()))
+    }
+
 }
diff --git a/app/src/main/assets/logo.png b/app/src/main/assets/logo.png
new file mode 100644
index 000000000..8cb7069c7
Binary files /dev/null and b/app/src/main/assets/logo.png differ
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 303b81256..42f3a2d6f 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -1,9 +1,11 @@
 package ch.sdp.vibester.activity
 
-import android.graphics.Bitmap
+import android.graphics.*
 import android.os.Bundle
 import android.text.InputType
 import android.util.Log
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.Window
 import android.widget.Button
 import android.widget.EditText
@@ -11,6 +13,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.widget.ConstraintLayout
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.BitmapGetterApi
 import ch.sdp.vibester.auth.FireBaseAuthenticator
@@ -19,11 +22,16 @@ import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.user.User
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.firebase.auth.FirebaseAuth
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.qrcode.QRCodeWriter
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import net.glxn.qrgen.android.MatrixToImageWriter
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -32,7 +40,6 @@ class ProfileActivity : AppCompatActivity() {
     @Inject
     lateinit var dataGetter: DataGetter
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -41,41 +48,65 @@ class ProfileActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_profile)
 
-        val editUsername = findViewById<Button>(R.id.editUser)
+        setEditUserNameBtnListener()
+        setLogOutBtnListener()
+        setRetToMainBtnListener()
+        setShowQrCodeBtnListener()
+        setQrCodeToProfileBtnListener()
 
-        val logoutButton = findViewById<Button>(R.id.logout)
+        // Do not enable querying database while executing unit test
+        val isUnitTest: Boolean = intent.getBooleanExtra("isUnitTest", false)
 
-        val retToMain = findViewById<FloatingActionButton>(R.id.profile_returnToMain)
+        if (!isUnitTest) {
+            queryDatabase()
+        } else {
+            val upTest: User? = intent.getSerializableExtra("userTestProfile") as User?
+            if (upTest == null) {
+                setupProfile(User())
+            } else {
+                setupProfile(upTest)
+            }
+        }
 
-        editUsername.setOnClickListener {
+    }
+
+    private fun setEditUserNameBtnListener() {
+        findViewById<Button>(R.id.editUser).setOnClickListener {
             showGeneralDialog(R.id.username, "username")
         }
+    }
 
-        retToMain.setOnClickListener{
+    private fun setLogOutBtnListener() {
+        findViewById<Button>(R.id.logout).setOnClickListener {
+            FirebaseAuth.getInstance().signOut()
             IntentSwitcher.switchBackToWelcome(this)
             finish()
         }
+    }
 
-        logoutButton.setOnClickListener{
-            FirebaseAuth.getInstance().signOut()
+    private fun setRetToMainBtnListener() {
+        findViewById<FloatingActionButton>(R.id.profile_returnToMain).setOnClickListener {
             IntentSwitcher.switchBackToWelcome(this)
             finish()
         }
+    }
 
-        // Do not enable querying database while executing unit test
-        val isUnitTest: Boolean = intent.getBooleanExtra("isUnitTest", false)
+    private fun setShowQrCodeBtnListener() {
+        findViewById<Button>(R.id.showQRCode).setOnClickListener {
+            setLayoutVisibility(R.id.QrCodePage, true)
+            setLayoutVisibility(R.id.profileContent, false)
+        }
+    }
 
-        if (!isUnitTest) {
-            queryDatabase()
-        } else {
-            var upTest: User? = intent.getSerializableExtra("userTestProfile") as User?
-            if (upTest == null) {
-                setupProfile(User())
-            } else {
-                setupProfile(upTest)
-            }
+    private fun setQrCodeToProfileBtnListener() {
+        findViewById<FloatingActionButton>(R.id.qrCode_returnToProfile).setOnClickListener {
+            setLayoutVisibility(R.id.QrCodePage, false)
+            setLayoutVisibility(R.id.profileContent, true)
         }
+    }
 
+    private fun setLayoutVisibility(layout: Int, isVisible: Boolean){
+        findViewById<ConstraintLayout>(layout).visibility = if (isVisible) VISIBLE else GONE
     }
 
     /**
@@ -86,7 +117,6 @@ class ProfileActivity : AppCompatActivity() {
      * @param textId id of the text in the dialog
      * @param name of the dialog
      */
-
     private fun showDialog(title: String, hint: String, id: Int, textId: Int, name: String) {
         val builder: AlertDialog.Builder = AlertDialog.Builder(this)
         builder.setTitle(title)
@@ -123,15 +153,12 @@ class ProfileActivity : AppCompatActivity() {
      * A function that queries the database and fetched the correct user
      * Hard coded for now
      */
-
-
     private fun queryDatabase() {
         dataGetter.getUserData(this::setupProfile)
     }
 
 
-    private fun setupProfile(user: User){
-
+    private fun setupProfile(user: User) {
         // Currently assuming that empty username means no user !
         if (user.username != ""){
             findViewById<TextView>(R.id.username).text =  user.username
@@ -140,24 +167,55 @@ class ProfileActivity : AppCompatActivity() {
             findViewById<TextView>(R.id.bestScore).text = user.bestScore.toString()
             findViewById<TextView>(R.id.ranking).text = user.ranking.toString()
         }
+        setupProfilePhoto(user)
+
+        if (user.uid != "") {
+            generateQrCode(user.uid)
+        }
+    }
+
+    private fun setupProfilePhoto(user: User) {
         CoroutineScope(Dispatchers.Main).launch {
             val task = async(Dispatchers.IO) {
                 try {
                     Log.e(getString(R.string.log_tag),user.image)
                     val bit = BitmapGetterApi.download("https://raw.githubusercontent.com/Ashwinvalento/cartoon-avatar/master/lib/images/male/45.png")
                     bit.get(10, TimeUnit.SECONDS)
-                }catch (e: Exception){
+                } catch (e: Exception) {
                     null
                 }
             }
             val bm = task.await()
-
-            if(bm != null){
+            if (bm != null) {
                 val avatar = findViewById<ImageView>(R.id.avatar)
                 avatar.setImageBitmap(Bitmap.createScaledBitmap(bm, 1000,1000, false))
             }
         }
+    }
+
+    /**
+     * generate the qr code bitmap of the given data
+     * @param data Qr Code data
+     */
+
+    private fun generateQrCode(data: String) {
+        val size = 512
+        val hints = HashMap<EncodeHintType?, Any?>()
+        hints[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.H
+
+        val bits = QRCodeWriter().encode(data, BarcodeFormat.QR_CODE, size, size)
+        val bmp = MatrixToImageWriter.toBitmap(bits)
+        val qrCodeCanvas = Canvas(bmp)
+
+        val scaleFactor = 4 // resize the image
+        val logo = BitmapFactory.decodeStream(assets.open("logo.png"))
+        logo.density = logo.density * scaleFactor
+        val xLogo = (size - logo.width / scaleFactor) / 2f
+        val yLogo = (size - logo.height / scaleFactor) / 2f
+
+        qrCodeCanvas.drawBitmap(logo, xLogo, yLogo, null)
 
+        findViewById<ImageView>(R.id.qrCode).setImageBitmap(bmp)
     }
 }
 
diff --git a/app/src/main/logo-playstore.png b/app/src/main/logo-playstore.png
new file mode 100644
index 000000000..6bd16c1aa
Binary files /dev/null and b/app/src/main/logo-playstore.png differ
diff --git a/app/src/main/res/drawable/logo_background.xml b/app/src/main/res/drawable/logo_background.xml
new file mode 100644
index 000000000..ca3826a46
--- /dev/null
+++ b/app/src/main/res/drawable/logo_background.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 394587eb7..2560ec5ae 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -4,207 +4,228 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".profile.ProfileActivity"
     android:background="@color/floral_white"
-    >
-
-    <ImageView
-        android:id="@+id/avatar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:foregroundGravity="left"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_max="150dp"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.058"
-        app:layout_constraintWidth_max="150dp"
-        tools:srcCompat="@tools:sample/avatars" />
-
-    <TextView
-        android:id="@+id/username"
-        android:layout_width="200dp"
-        android:layout_height="30dp"
-        android:layout_marginBottom="109dp"
-        android:fontFamily="monospace"
-        android:text="@string/authentication_placeholderUsername"
-        android:textAlignment="center"
-        android:textColor="#000"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/avatar" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/profile_returnToMain"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:backgroundTint="@color/light_coral"
-        app:borderWidth="0dp"
-        android:clickable="true"
-        android:src="@android:drawable/ic_menu_revert"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <TableLayout
-        android:id="@+id/profileStatistics"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/table_shape"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.495"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.82">
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="monospace"
-                android:padding="18dip"
-                android:text="@string/ranking"
-                android:textAlignment="viewStart"
-                android:textColor="#000"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/ranking"
+    tools:context=".profile.ProfileActivity">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/profileContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/avatar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:foregroundGravity="left"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="150dp"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.058"
+            app:layout_constraintWidth_max="150dp"
+            tools:srcCompat="@tools:sample/avatars" />
+
+        <TextView
+            android:id="@+id/username"
+            android:layout_width="200dp"
+            android:layout_height="30dp"
+            android:layout_marginBottom="109dp"
+            android:fontFamily="monospace"
+            android:text="@string/authentication_placeholderUsername"
+            android:textAlignment="center"
+            android:textColor="#000"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.284"
+            app:layout_constraintRight_toLeftOf="@+id/editUser"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/avatar"
+            app:layout_constraintVertical_bias="0.678" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/profile_returnToMain"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:backgroundTint="@color/light_coral"
+            android:clickable="true"
+            android:src="@android:drawable/ic_menu_revert"
+            app:borderWidth="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <TableLayout
+            android:id="@+id/profileStatistics"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/table_shape"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.495"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.82">
+
+            <TableRow
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fontFamily="monospace"
-                android:padding="18dip"
-                android:text="@string/authentication_placeholderEmptyScore"
-                android:textAlignment="viewEnd"
-                android:textColor="#000"
-                android:textSize="16sp" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="18dip"
-                android:text="@string/total_games"
-                android:textColor="#000"
-                android:textSize="16sp"
-                android:typeface="monospace" />
-
-            <TextView
-                android:id="@+id/totalGames"
-                android:layout_width="147dp"
-                android:layout_height="wrap_content"
-                android:fontFamily="monospace"
-                android:padding="18dip"
-                android:text="@string/authentication_placeholderEmptyScore"
-                android:textAlignment="viewEnd"
-                android:textColor="#000"
-                android:textSize="16sp"
-                tools:text="@string/authentication_placeholderEmptyScore" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="18dip"
-                android:text="@string/best_score"
-                android:textColor="#000"
-                android:textSize="16sp"
-                android:typeface='monospace' />
-
-            <TextView
-                android:id="@+id/bestScore"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="monospace"
+                    android:padding="18dip"
+                    android:text="@string/ranking"
+                    android:textAlignment="viewStart"
+                    android:textColor="#000"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/ranking"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:fontFamily="monospace"
+                    android:padding="18dip"
+                    android:text="@string/authentication_placeholderEmptyScore"
+                    android:textAlignment="viewEnd"
+                    android:textColor="#000"
+                    android:textSize="16sp" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="18dip"
+                    android:text="@string/total_games"
+                    android:textColor="#000"
+                    android:textSize="16sp"
+                    android:typeface="monospace" />
+
+                <TextView
+                    android:id="@+id/totalGames"
+                    android:layout_width="147dp"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="monospace"
+                    android:padding="18dip"
+                    android:text="@string/authentication_placeholderEmptyScore"
+                    android:textAlignment="viewEnd"
+                    android:textColor="#000"
+                    android:textSize="16sp"
+                    tools:text="@string/authentication_placeholderEmptyScore" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="18dip"
+                    android:text="@string/best_score"
+                    android:textColor="#000"
+                    android:textSize="16sp"
+                    android:typeface='monospace' />
+
+                <TextView
+                    android:id="@+id/bestScore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="monospace"
+                    android:padding="18dip"
+                    android:text="@string/authentication_placeholderEmptyScore"
+                    android:textAlignment="viewEnd"
+                    android:textColor="#000"
+                    android:textSize="16sp"
+                    tools:text="@string/authentication_placeholderEmptyScore" />
+            </TableRow>
+
+            <TableRow
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="monospace"
-                android:padding="18dip"
-                android:text="@string/authentication_placeholderEmptyScore"
-                android:textAlignment="viewEnd"
-                android:textColor="#000"
-                android:textSize="16sp"
-                tools:text="@string/authentication_placeholderEmptyScore" />
-        </TableRow>
-
-        <TableRow
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="monospace"
+                    android:padding="18dip"
+                    android:text="@string/correct_songs"
+                    android:textColor="#000"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/correctSongs"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="monospace"
+                    android:padding="18dip"
+                    android:text="@string/authentication_placeholderEmptyScore"
+                    android:textAlignment="viewEnd"
+                    android:textColor="#000"
+                    android:textSize="16sp"
+                    tools:text="@string/authentication_placeholderEmptyScore" />
+
+            </TableRow>
+
+        </TableLayout>
+
+        <Button
+            android:id="@+id/editUser"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="36dp"
+            android:layout_marginBottom="136dp"
+            android:backgroundTint="@color/cg_blue"
+            android:elevation="10dp"
+            android:stateListAnimator="@null"
+            android:text="Edit"
+            android:translationZ="10dp"
+            app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/username" />
+
+        <Button
+            android:id="@+id/logout"
+            android:layout_width="200dp"
+            android:layout_height="48dp"
+            android:layout_marginBottom="24dp"
+            android:backgroundTint="@color/cg_blue"
+            android:elevation="10dp"
+            android:stateListAnimator="@null"
+            android:text="logout"
+            android:translationZ="10dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.497"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <Button
+            android:id="@+id/showQRCode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="66dp"
+            android:backgroundTint="@color/cg_blue"
+            android:text="QR Code"
+            app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/username" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="monospace"
-                android:padding="18dip"
-                android:text="@string/correct_songs"
-                android:textColor="#000"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/correctSongs"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="monospace"
-                android:padding="18dip"
-                android:text="@string/authentication_placeholderEmptyScore"
-                android:textAlignment="viewEnd"
-                android:textColor="#000"
-                android:textSize="16sp"
-                tools:text="@string/authentication_placeholderEmptyScore" />
-
-        </TableRow>
-
-    </TableLayout>
-
-    <Button
-        android:id="@+id/editUser"
-        android:layout_width="157dp"
-        android:layout_height="58dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="14dp"
-        android:layout_marginBottom="27dp"
-        android:backgroundTint="@color/cg_blue"
-        android:elevation="10dp"
-        android:stateListAnimator="@null"
-        android:text="@string/editUsername"
-        android:translationZ="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/profileStatistics"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.479"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/username"
-        app:layout_constraintVertical_bias="0.515" />
-
-    <Button
-        android:id="@+id/logout"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginBottom="24dp"
-        android:backgroundTint="@color/cg_blue"
-        android:elevation="10dp"
-        android:stateListAnimator="@null"
-        android:text="logout"
-        android:translationZ="10dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <include layout="@layout/display_qr_code" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/display_qr_code.xml b/app/src/main/res/layout/display_qr_code.xml
new file mode 100644
index 000000000..865eeb9ea
--- /dev/null
+++ b/app/src/main/res/layout/display_qr_code.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/QrCodePage"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone">
+
+    <ImageView
+        android:id="@+id/qrCode"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_marginTop="200dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/qrCode_returnToProfile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="@color/light_coral"
+        app:borderWidth="0dp"
+        android:clickable="true"
+        android:src="@android:drawable/ic_menu_revert"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/logo.xml b/app/src/main/res/mipmap-anydpi-v26/logo.xml
new file mode 100644
index 000000000..e5e851a89
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/logo.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/logo_background"/>
+    <foreground android:drawable="@mipmap/logo_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/logo_round.xml b/app/src/main/res/mipmap-anydpi-v26/logo_round.xml
new file mode 100644
index 000000000..e5e851a89
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/logo_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/logo_background"/>
+    <foreground android:drawable="@mipmap/logo_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/logo.png b/app/src/main/res/mipmap-hdpi/logo.png
new file mode 100644
index 000000000..34a2d363f
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-hdpi/logo_foreground.png b/app/src/main/res/mipmap-hdpi/logo_foreground.png
new file mode 100644
index 000000000..71eb46b79
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/logo_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/logo_round.png b/app/src/main/res/mipmap-hdpi/logo_round.png
new file mode 100644
index 000000000..36e28813c
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/logo_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/logo.png b/app/src/main/res/mipmap-mdpi/logo.png
new file mode 100644
index 000000000..710964b3e
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-mdpi/logo_foreground.png b/app/src/main/res/mipmap-mdpi/logo_foreground.png
new file mode 100644
index 000000000..7bf3848ca
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/logo_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/logo_round.png b/app/src/main/res/mipmap-mdpi/logo_round.png
new file mode 100644
index 000000000..090a143a8
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/logo_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/logo.png b/app/src/main/res/mipmap-xhdpi/logo.png
new file mode 100644
index 000000000..a768b9042
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/logo_foreground.png b/app/src/main/res/mipmap-xhdpi/logo_foreground.png
new file mode 100644
index 000000000..650eaaa87
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/logo_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/logo_round.png b/app/src/main/res/mipmap-xhdpi/logo_round.png
new file mode 100644
index 000000000..57c481e8f
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/logo_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/logo.png b/app/src/main/res/mipmap-xxhdpi/logo.png
new file mode 100644
index 000000000..c50fbbb4e
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/logo_foreground.png b/app/src/main/res/mipmap-xxhdpi/logo_foreground.png
new file mode 100644
index 000000000..c2235a613
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/logo_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/logo_round.png b/app/src/main/res/mipmap-xxhdpi/logo_round.png
new file mode 100644
index 000000000..3f9568d66
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/logo_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/logo.png b/app/src/main/res/mipmap-xxxhdpi/logo.png
new file mode 100644
index 000000000..9231e67b5
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/logo_foreground.png b/app/src/main/res/mipmap-xxxhdpi/logo_foreground.png
new file mode 100644
index 000000000..2d58aa1c8
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/logo_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/logo_round.png b/app/src/main/res/mipmap-xxxhdpi/logo_round.png
new file mode 100644
index 000000000..3d7690be3
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/logo_round.png differ