diff --git a/Jenkinsfile b/Jenkinsfile
index d0ecd8e85a..f96383c048 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,42 @@
 #!groovy
 
-def reports = 'Paintroid/build/reports'
+class DockerParameters {
+    // 'docker build' would normally copy the whole build-dir to the container, changing the
+    // docker build directory avoids that overhead
+    def dir = 'docker'
+    def args = '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
+    def label = 'LimitedEmulator'
+    def image = 'floriankanduth/paintroid_java17:latest'
+}
+
+def dockerParameters = new DockerParameters()
+
+def startEmulator(String android_version, String stageName) {
+    sh 'adb start-server'
+    // creates a new avd, and if it already exists it does nothing.
+    sh "echo no | avdmanager create avd --force --name android${android_version} --package 'system-images;android-${android_version};default;x86_64'"
+    sh "/home/user/android/sdk/emulator/emulator -no-window -no-boot-anim -noaudio -avd android${android_version} > ${stageName}_emulator.log 2>&1 &"
+}
+
+def waitForEmulatorAndPressWakeUpKey() {
+    sh 'adb devices'
+    sh 'timeout 5m adb wait-for-device'
+    sh '''#!/bin/bash
+adb devices
+timeout 5m adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done'
+echo "Emulator started"
+'''
+    sh '''
+        adb shell settings put global window_animation_scale 0 &
+        adb shell settings put global transition_animation_scale 0 &
+        adb shell settings put global animator_duration_scale 0 &
+    '''
+    // In case the device went to sleep
+    sh 'adb shell input keyevent KEYCODE_WAKEUP'
+}
+
+// NOTE: use module-agnostic report roots
+def reportsGlobRoot = '**/build/reports'
 
 // place the cobertura xml relative to the source, so that the source can be found
 def javaSrc = 'Paintroid/src/main/java'
@@ -13,16 +49,30 @@ def junitAndCoverage(String jacocoXmlFile, String coverageName, String javaSrcLo
     cleanWs patterns: [[pattern: testPattern, type: 'INCLUDE']]
 
     String coverageFile = "$javaSrcLocation/coverage_${coverageName}.xml"
-    // Convert the JaCoCo coverate to the Cobertura XML file format.
+    // Convert the JaCoCo coverage to the Cobertura XML file format.
     // This is done since the Jenkins JaCoCo plugin does not work well.
-    sh "./buildScripts/cover2cover.py '$jacocoXmlFile' '$coverageFile'"
+    sh "./buildScripts/cover2cover.py '${jacocoXmlFile}' '${coverageFile}'"
 }
 
 def useDebugLabelParameter(defaultLabel) {
     return env.DEBUG_LABEL?.trim() ? env.DEBUG_LABEL : defaultLabel
 }
 
+def checkAnimationScale(scaleName) {
+    def output = sh(script: "adb shell settings get global ${scaleName}", returnStdout: true).trim()
+    if (output != "0" && output != "0.0") {
+        error("Animation scale '${scaleName}' is NOT disabled. Current value: ${output}")
+    } else {
+        echo("Animation scale '${scaleName}' is disabled (Value: ${output})")
+    }
+}
+
 pipeline {
+    environment {
+        ANDROID_VERSION = 33
+        ADB_INSTALL_TIMEOUT = 60
+    }
+
     parameters {
         string name: 'DEBUG_LABEL', defaultValue: '', description: 'For debugging when entered will be used as label to decide on which slaves the jobs will run.'
         booleanParam name: 'BUILD_WITH_CATROID', defaultValue: false, description: 'When checked then the current Paintroid build will be built with the current develop branch of Catroid'
@@ -30,10 +80,10 @@ pipeline {
     }
 
     agent {
-         docker {
-            image 'catrobat/catrobat-paintroid:stable'
-            args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
-            label 'LimitedEmulator'
+        docker {
+            image dockerParameters.image
+            args dockerParameters.args
+            label dockerParameters.label
             alwaysPull true
         }
     }
@@ -53,31 +103,31 @@ pipeline {
         stage('Build Debug-APK') {
             steps {
                 sh "./gradlew -Pindependent='#$env.BUILD_NUMBER $env.BRANCH_NAME' assembleDebug"
-                archiveArtifacts 'app/build/outputs/apk/debug/paintroid-debug*.apk'
-                plot csvFileName: 'dexcount.csv', csvSeries: [[displayTableFlag: false, exclusionValues: '', file: 'Paintroid/build/outputs/dexcount/*.csv', inclusionFlag: 'OFF', url: '']], group: 'APK Stats', numBuilds: '180', style: 'line', title: 'dexcount'
+                // archive the app debug APK
+                archiveArtifacts artifacts: 'app/build/outputs/apk/debug/*.apk', fingerprint: true, onlyIfSuccessful: true
+                plot csvFileName: 'dexcount.csv',
+                     csvSeries: [[displayTableFlag: false, exclusionValues: '', file: 'app/build/outputs/dexcount/*.csv', inclusionFlag: 'OFF', url: '']],
+                     group: 'APK Stats', numBuilds: '180', style: 'line', title: 'dexcount'
             }
         }
 
         stage('Build with Catroid') {
             when {
-                expression {
-                    params.BUILD_WITH_CATROID
-                }
+                expression { params.BUILD_WITH_CATROID }
             }
-
             steps {
                 sh './gradlew publishToMavenLocal -Psnapshot'
                 sh 'rm -rf Catroid; mkdir Catroid'
                 dir('Catroid') {
                     git branch: params.CATROID_BRANCH, url: 'https://github.com/Catrobat/Catroid.git'
-                    sh "rm -f catroid/src/main/libs/*.aar"
-                    sh "mv -f ../colorpicker/build/outputs/aar/colorpicker-debug.aar catroid/src/main/libs/colorpicker-LOCAL.aar"
-                    sh "mv -f ../Paintroid/build/outputs/aar/Paintroid-debug.aar catroid/src/main/libs/Paintroid-LOCAL.aar"
+                    sh 'rm -f catroid/src/main/libs/*.aar'
+                    sh 'mv -f ../colorpicker/build/outputs/aar/colorpicker-debug.aar catroid/src/main/libs/colorpicker-LOCAL.aar'
+                    sh 'mv -f ../Paintroid/build/outputs/aar/Paintroid-debug.aar catroid/src/main/libs/Paintroid-LOCAL.aar'
                 }
                 renameApks("${env.BRANCH_NAME}-${env.BUILD_NUMBER}")
                 dir('Catroid') {
-                    archiveArtifacts "catroid/src/main/libs/*.aar"
-                    sh "./gradlew assembleCatroidDebug"
+                    archiveArtifacts 'catroid/src/main/libs/*.aar'
+                    sh './gradlew assembleCatroidDebug'
                     archiveArtifacts 'catroid/build/outputs/apk/catroid/debug/catroid-catroid-debug.apk'
                 }
             }
@@ -85,16 +135,23 @@ pipeline {
 
         stage('Static Analysis') {
             steps {
+                // Ensure the tools actually run and generate reports
                 sh './gradlew pmd checkstyle lint detekt'
             }
-
             post {
                 always {
-                    recordIssues aggregatingResults: true, enabledForFailure: true, qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
-                            tools: [androidLintParser(pattern: "$reports/lint*.xml"),
-                                    checkStyle(pattern: "$reports/checkstyle.xml"),
-                                    pmdParser(pattern: "$reports/pmd.xml"),
-                                    detekt(pattern: "$reports/detekt/detekt.xml")]
+                    // Use module-agnostic patterns so we don't miss files
+                    recordIssues(
+                        aggregatingResults: true,
+                        enabledForFailure: true,
+                        qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
+                        tools: [
+                            androidLintParser(pattern: "${reportsGlobRoot}/lint-results-*.xml,${reportsGlobRoot}/lint-*.xml,${reportsGlobRoot}/lint/*.xml"),
+                            checkStyle(pattern: "${reportsGlobRoot}/checkstyle.xml"),
+                            pmdParser(pattern: "${reportsGlobRoot}/pmd.xml"),
+                            detekt(pattern: "${reportsGlobRoot}/detekt/detekt.xml")
+                        ]
+                    )
                 }
             }
         }
@@ -107,31 +164,45 @@ pipeline {
                     }
                     post {
                         always {
-                            junitAndCoverage "$reports/jacoco/jacocoTestDebugUnitTestReport/jacoco.xml", 'unit', javaSrc
+                            // Most modules (app or Paintroid) will end up with this path
+                            junitAndCoverage "**/build/reports/jacoco/jacocoTestDebugUnitTestReport/jacoco.xml", 'unit', javaSrc
                         }
                     }
                 }
 
                 stage('Device Tests') {
                     steps {
-                        sh "echo no | avdmanager create avd --force --name android28 --package 'system-images;android-28;default;x86_64'"
-                        sh "/home/user/android/sdk/emulator/emulator -no-window -no-boot-anim -noaudio -avd android28 > /dev/null 2>&1 &"
-                        sh './gradlew -PenableCoverage -Pjenkins -Pemulator=android28 -Pci createDebugCoverageReport -i'
+                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                            startEmulator(ANDROID_VERSION as String, 'device_tests')
+                            waitForEmulatorAndPressWakeUpKey()
+                            script {
+                                checkAnimationScale("window_animation_scale")
+                                checkAnimationScale("transition_animation_scale")
+                                checkAnimationScale("animator_duration_scale")
+                            }
+                            // FIX: reference env var correctly
+                            sh "./gradlew disableAnimations -PenableCoverage -Pjenkins -Pemulator=android${ANDROID_VERSION} -Pci createDebugCoverageReport -i"
+                        }
                     }
                     post {
                         always {
                             sh '/home/user/android/sdk/platform-tools/adb logcat -d > logcat.txt'
                             sh './gradlew stopEmulator'
-                            junitAndCoverage "$reports/coverage/debug/report.xml", 'device', javaSrc
+                            junitAndCoverage "**/build/reports/coverage/debug/report.xml", 'device', javaSrc
                             archiveArtifacts 'logcat.txt'
                         }
                     }
                 }
             }
-
             post {
                 always {
-                    step([$class: 'CoberturaPublisher', autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: "$javaSrc/coverage*.xml", failUnhealthy: false, failUnstable: false, maxNumberOfBuilds: 0, onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false, failNoReports: false])
+                    step([$class: 'CoberturaPublisher',
+                          autoUpdateHealth: false,
+                          autoUpdateStability: false,
+                          coberturaReportFile: "${javaSrc}/coverage*.xml",
+                          failUnhealthy: false, failUnstable: false, maxNumberOfBuilds: 0,
+                          onlyStable: false, sourceEncoding: 'ASCII',
+                          zoomCoverageChart: false, failNoReports: false])
                 }
             }
         }
@@ -139,7 +210,11 @@ pipeline {
 
     post {
         always {
-            step([$class: 'LogParserPublisher', failBuildOnError: true, projectRulePath: 'buildScripts/log_parser_rules', unstableOnWarning: true, useProjectRule: true])
+            step([$class: 'LogParserPublisher',
+                  failBuildOnError: true,
+                  projectRulePath: 'buildScripts/log_parser_rules',
+                  unstableOnWarning: true,
+                  useProjectRule: true])
         }
         changed {
             notifyChat()
diff --git a/Jenkinsfile.releaseAPK b/Jenkinsfile.releaseAPK
index 816eb8285c..906957746b 100644
--- a/Jenkinsfile.releaseAPK
+++ b/Jenkinsfile.releaseAPK
@@ -3,7 +3,7 @@
 pipeline {
     agent {
         docker {
-            image 'catrobat/catrobat-paintroid:stable'
+            image 'floriankanduth/paintroid_java17:latest'
             args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
             label 'LimitedEmulator'
             alwaysPull true
@@ -58,7 +58,7 @@ pipeline {
                         '''
                     }
                 }
-                archiveArtifacts artifacts: 'app/build/outputs/apk/signedRelease/paintroid-signedRelease.apk', fingerprint: true
+                archiveArtifacts artifacts: 'app/build/**/**/**/*.apk', fingerprint: true
                 archiveArtifacts artifacts: 'app/build/outputs/mapping/signedRelease/mapping.txt', fingerprint: true
             }
         }
@@ -78,7 +78,7 @@ pipeline {
                         '''
                     }
                 }
-                archiveArtifacts artifacts: 'app/build/outputs/bundle/signedRelease/paintroid-signedRelease.apk', fingerprint: true
+                archiveArtifacts artifacts: 'app/build/outputs/bundle/*/*.aab', fingerprint: true
             }
         }
 
diff --git a/Paintroid/build.gradle b/Paintroid/build.gradle
index 9ffbde1915..e8017d54e5 100644
--- a/Paintroid/build.gradle
+++ b/Paintroid/build.gradle
@@ -17,22 +17,22 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-apply plugin: 'com.android.library'
-apply plugin: 'com.hiya.jacoco-android'
-apply plugin: 'com.getkeepsafe.dexcount'
-apply plugin: 'kotlin-android'
-apply plugin: 'org.catrobat.gradle.androidemulators'
-apply plugin: 'maven-publish'
+plugins {
+    id "com.android.library"
+    id "jacoco"
+    id "com.getkeepsafe.dexcount"
+    id "org.jetbrains.kotlin.android"
+    id "org.catrobat.gradle.androidemulators"
+    id "maven-publish"
+}
 
-apply from: 'gradle/adb_tasks.gradle'
-apply from: 'gradle/code_quality_tasks.gradle'
+apply from: "gradle/adb_tasks.gradle"
+apply from: "gradle/code_quality_tasks.gradle"
+apply from: 'gradle/emulator.gradle'
 
 emulators {
-    install project.hasProperty('installSdk')
-
-    dependencies {
-        sdk()
-    }
+    install project.hasProperty("installSdk")
+    dependencies { sdk() }
 
     emulator 'android28', {
         avd {
@@ -51,57 +51,67 @@ emulators {
 }
 
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "0.8.10"
 }
 
-jacocoAndroidUnitTestReport {
-    csv.enabled false
-    html.enabled true
-    xml.enabled true
-    destination project.getBuildDir().getPath() + "/reports/jacoco/jacocoTestDebugUnitTestReport"
+if (!project.hasProperty("signingKeystore")) {
+    ext.signingKeystore = "dummyKeystore"
 }
 
 android {
-    compileSdkVersion rootProject.ext.androidCompileSdkVersion
+    namespace = 'org.catrobat.paintroid'
+
+    // New AGP DSL (API 35-ready)
+    compileSdk = rootProject.ext.androidCompileSdkVersion
 
     defaultConfig {
-        minSdkVersion rootProject.ext.androidMinSdkVersion
-        targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        versionCode rootProject.ext.androidVersionCode
-        versionName rootProject.ext.androidVersionName
+        minSdk    = rootProject.ext.androidMinSdkVersion
+        targetSdk = rootProject.ext.androidTargetSdkVersion
+        testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
+    }
+
+    buildFeatures {
+        buildConfig = true
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+        freeCompilerArgs = ["-Xstring-concat=inline"]
+    }
+
+    signingConfigs {
+        signedRelease {
+            storeFile = file(project.property("signingKeystore"))
+            storePassword = ""
+            keyAlias = ""
+            keyPassword = ""
+        }
+    }
+
+    if (project.hasProperty("signingKeystore") &&
+            project.hasProperty("signingKeystorePassword") &&
+            project.hasProperty("signingKeyAlias") &&
+            project.hasProperty("signingKeyPassword")) {
+
+        signingConfigs.signedRelease.storePassword = project.property("signingKeystorePassword")
+        signingConfigs.signedRelease.keyAlias = project.property("signingKeyAlias")
+        signingConfigs.signedRelease.keyPassword = project.property("signingKeyPassword")
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         signedRelease {
+            initWith(release)
+            signingConfig = signingConfigs.signedRelease
         }
-        debug {
-            testCoverageEnabled = project.hasProperty('enableCoverage')
-            // Multidex is required as espresso and mockito/bytebuddy are adding more functions
-            // than should be allowed by law.
-            // See https://github.com/mockito/mockito/issues/1112
-            multiDexEnabled true
-        }
-    }
-
-    lintOptions {
-        // specific ignores should be defined via lint.xml file
-        lintConfig file('config/lint.xml')
-        ignore 'ClickableViewAccessibility', 'StaticFieldLeak', 'GradleDependency', 'OldTargetApi', 'LintBaseline'
-        textReport true
-        xmlReport true
-        htmlReport true
-        xmlOutput file("build/reports/lint-report.xml")
-        htmlOutput file("build/reports/lint-report.html")
+        debug { }
     }
 
     testOptions {
@@ -115,6 +125,16 @@ android {
             merges += ['META-INF/licenses/ASM']
         }
     }
+
+    lint {
+        lintConfig = file('config/lint.xml')
+        disable = ['ClickableViewAccessibility','StaticFieldLeak','GradleDependency','OldTargetApi','LintBaseline']
+        textReport = true
+        xmlReport  = true
+        htmlReport = true
+        xmlOutput  = file('build/reports/lint-report.xml')
+        htmlOutput = file('build/reports/lint-report.html')
+    }
 }
 
 dependencies {
@@ -130,6 +150,7 @@ dependencies {
     implementation 'com.esotericsoftware:kryo:5.5.0'
     implementation 'id.zelory:compressor:2.1.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.test:monitor:1.8.0'
 
     debugImplementation 'androidx.multidex:multidex:2.0.0'
 
@@ -137,28 +158,22 @@ dependencies {
     implementation 'com.jraska:falcon:2.2.0'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.18.3'
+    testImplementation 'org.mockito:mockito-core:3.6.28'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
 
     androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test:rules:1.1.1'
-    androidTestImplementation 'org.mockito:mockito-android:3.6.28'
+    androidTestImplementation 'org.mockito:mockito-android:5.15.2'
     androidTestImplementation 'tools.fastlane:screengrab:2.1.0'
     androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
-
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0'
     androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
     testImplementation "androidx.test:core-ktx:1.4.0"
-    implementation 'com.android.support.test.espresso:espresso-idling-resource:3.1.0'
-}
 
-tasks.withType(Javadoc).all {
-    enabled = false
+    implementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
 }
 
-if (project.hasProperty('jenkins')) {
-    android.dexOptions.preDexLibraries = false
-}
+tasks.withType(Javadoc).configureEach { enabled = false }
diff --git a/Paintroid/gradle/adb_tasks.gradle b/Paintroid/gradle/adb_tasks.gradle
index 0436a8f63e..05574133bd 100644
--- a/Paintroid/gradle/adb_tasks.gradle
+++ b/Paintroid/gradle/adb_tasks.gradle
@@ -19,7 +19,7 @@
 
 buildscript {
     repositories {
-        maven { url 'https://jitpack.io' }
+        maven { url = uri('https://jitpack.io') }
     }
     dependencies {
         classpath 'com.github.Catrobat:Gradle:v1.6.2'
@@ -45,7 +45,7 @@ def createAdbInstallTask(variant) {
     }
 }
 
-android.libraryVariants.all { variant ->
+android.libraryVariants.configureEach { variant ->
     createAdbInstallTask(variant)
 }
 
@@ -53,7 +53,7 @@ android.testVariants.all { variant ->
     createAdbInstallTask(variant)
 }
 
-task commandlineAdbRunTests {
+tasks.register('commandlineAdbRunTests') {
     doLast {
         def device = androidDevice()
 
@@ -76,6 +76,6 @@ task commandlineAdbRunTests {
             def adbScreenshotsPath = adbPath + "/robotium_screenshots"
             file(adbScreenshotsPath).mkdirs()
             device.command(['pull', '/sdcard/Robotium-Screenshots', adbScreenshotsPath]).verbose().execute()
-        } catch (GradleScriptException) {}
+        } catch (ignored) {}
     }
 }
diff --git a/Paintroid/gradle/code_quality_tasks.gradle b/Paintroid/gradle/code_quality_tasks.gradle
index c86a9788de..c5d4586210 100644
--- a/Paintroid/gradle/code_quality_tasks.gradle
+++ b/Paintroid/gradle/code_quality_tasks.gradle
@@ -34,7 +34,7 @@ dependencies {
     detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.20.0"
 }
 
-task checkstyle(type: Checkstyle) {
+tasks.register('checkstyle', Checkstyle) {
     configFile file('config/checkstyle.xml')
     source '.'
     include '**/*.java', '**/*.kt', '**/*.xml', '**/*.gradle'
@@ -47,12 +47,12 @@ task checkstyle(type: Checkstyle) {
     ignoreFailures false
 
     reports {
-        xml.enabled = true
+        xml.required = true
         xml.destination file("build/reports/checkstyle.xml")
     }
 }
 
-task pmd(type: Pmd) {
+tasks.register('pmd', Pmd) {
     ruleSetFiles = files('config/pmd.xml')
     ruleSets = []
 
@@ -63,8 +63,8 @@ task pmd(type: Pmd) {
     ignoreFailures false
 
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required = true
+        html.required = true
         xml.destination file("build/reports/pmd.xml")
     }
 }
diff --git a/Paintroid/gradle/emulator.gradle b/Paintroid/gradle/emulator.gradle
new file mode 100644
index 0000000000..a86ac09bbe
--- /dev/null
+++ b/Paintroid/gradle/emulator.gradle
@@ -0,0 +1,27 @@
+/**
+ *  Paintroid: An image manipulation application for Android.
+ *  Copyright (C) 2010-2025 The Catrobat Team
+ *  (<http://developer.catrobat.org/credits>)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+tasks.register('disableAnimations') {
+    it.group 'android'
+    doLast {
+        'adb shell settings put global window_animation_scale 0'.execute()
+        'adb shell settings put global transition_animation_scale 0'.execute()
+        'adb shell settings put global animator_duration_scale 0'.execute()
+    }
+}
diff --git a/Paintroid/proguard-rules.pro b/Paintroid/proguard-rules.pro
index 81994c92e3..cb623c29fe 100644
--- a/Paintroid/proguard-rules.pro
+++ b/Paintroid/proguard-rules.pro
@@ -19,3 +19,17 @@
 # If you keep the line number information, uncomment this to
 # resetToOrigin the original source file name.
 #-renamesourcefileattribute SourceFile
+
+# Auto-generated rules to suppress warnings
+-dontwarn java.beans.BeanInfo
+-dontwarn java.beans.IntrospectionException
+-dontwarn java.beans.Introspector
+-dontwarn java.beans.PropertyDescriptor
+-dontwarn sun.nio.ch.DirectBuffer
+
+# Your custom keep rules for Kryo
+-keep class com.esotericsoftware.kryo.** { *; }
+-keep class com.esotericsoftware.kryo.serializers.** { *; }
+-keepclassmembers class com.esotericsoftware.kryo.serializers.DefaultArraySerializers$* {
+    public <init>();
+}
\ No newline at end of file
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerBackgroundTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerBackgroundTest.kt
index bfbf53ff64..c20308e037 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerBackgroundTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerBackgroundTest.kt
@@ -49,7 +49,7 @@ class LayerBackgroundTest(private val language: String) {
     @Test
     fun testOneLayer() {
         var actualBackground = getActualBackground(0)
-        Assert.assertEquals(actualBackground, getSingleBackground()?.constantState)
+        Assert.assertEquals(actualBackground, getSingleBackground().constantState)
     }
 
     @Test
@@ -61,8 +61,8 @@ class LayerBackgroundTest(private val language: String) {
         var backgroundTop = getActualBackground(0)
         var backgroundBottom = getActualBackground(1)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(true)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(false)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(true).constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(false).constantState)
     }
 
     @Test
@@ -75,8 +75,8 @@ class LayerBackgroundTest(private val language: String) {
         var backgroundTop = getActualBackground(0)
         var backgroundBottom = getActualBackground(1)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(false)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(true)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(false).constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(true).constantState)
     }
 
     @Test
@@ -90,9 +90,9 @@ class LayerBackgroundTest(private val language: String) {
         var backgroundCenter = getActualBackground(1)
         var backgroundBottom = getActualBackground(2)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(true)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(true).constantState)
         Assert.assertEquals(backgroundCenter, getCenterBackground(false)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(false)?.constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(false).constantState)
     }
 
     @Test
@@ -107,9 +107,9 @@ class LayerBackgroundTest(private val language: String) {
         var backgroundCenter = getActualBackground(1)
         var backgroundBottom = getActualBackground(2)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(false)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(false).constantState)
         Assert.assertEquals(backgroundCenter, getCenterBackground(true)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(false)?.constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(false).constantState)
     }
 
     @Test
@@ -125,9 +125,9 @@ class LayerBackgroundTest(private val language: String) {
         var backgroundCenter = getActualBackground(1)
         var backgroundBottom = getActualBackground(2)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(false)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(false).constantState)
         Assert.assertEquals(backgroundCenter, getCenterBackground(false)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(true)?.constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(true).constantState)
     }
 
     @Test
@@ -143,10 +143,10 @@ class LayerBackgroundTest(private val language: String) {
         val backgroundLowerCenter = getActualBackground(2)
         val backgroundBottom = getActualBackground(3)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(true)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(true).constantState)
         Assert.assertEquals(backgroundUpperCenter, getCenterBackground(false)?.constantState)
         Assert.assertEquals(backgroundLowerCenter, getCenterBackground(false)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(false)?.constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(false).constantState)
     }
 
     @Test
@@ -163,10 +163,10 @@ class LayerBackgroundTest(private val language: String) {
         val backgroundLowerCenter = getActualBackground(2)
         val backgroundBottom = getActualBackground(3)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(false)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(false).constantState)
         Assert.assertEquals(backgroundUpperCenter, getCenterBackground(true)?.constantState)
         Assert.assertEquals(backgroundLowerCenter, getCenterBackground(false)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(false)?.constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(false).constantState)
     }
 
     @Test
@@ -184,10 +184,10 @@ class LayerBackgroundTest(private val language: String) {
         val backgroundLowerCenter = getActualBackground(2)
         val backgroundBottom = getActualBackground(3)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(false)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(false).constantState)
         Assert.assertEquals(backgroundUpperCenter, getCenterBackground(false)?.constantState)
         Assert.assertEquals(backgroundLowerCenter, getCenterBackground(true)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(false)?.constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(false).constantState)
     }
 
     @Test
@@ -205,10 +205,10 @@ class LayerBackgroundTest(private val language: String) {
         val backgroundLowerCenter = getActualBackground(2)
         val backgroundBottom = getActualBackground(3)
 
-        Assert.assertEquals(backgroundTop, getTopBackground(false)?.constantState)
+        Assert.assertEquals(backgroundTop, getTopBackground(false).constantState)
         Assert.assertEquals(backgroundUpperCenter, getCenterBackground(false)?.constantState)
         Assert.assertEquals(backgroundLowerCenter, getCenterBackground(false)?.constantState)
-        Assert.assertEquals(backgroundBottom, getBottomBackground(true)?.constantState)
+        Assert.assertEquals(backgroundBottom, getBottomBackground(true).constantState)
     }
 
     private fun getActualBackground(position: Int): Drawable.ConstantState? {
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/OraFileIntentTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/OraFileIntentTest.kt
index bad8c3b90c..b453f77e83 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/OraFileIntentTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/OraFileIntentTest.kt
@@ -112,7 +112,7 @@ class OraFileIntentTest {
         val bitmap = Bitmap.createBitmap(400, 400, Bitmap.Config.ARGB_8888)
         val contentValues = ContentValues()
         contentValues.put(MediaStore.Images.Media.DISPLAY_NAME, "testfile.ora")
-        contentValues.put(MediaStore.Images.Media.MIME_TYPE, "image/*")
+        contentValues.put(MediaStore.Images.Media.MIME_TYPE, "image/png")
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             contentValues.put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_PICTURES)
         }
@@ -124,7 +124,7 @@ class OraFileIntentTest {
         } catch (e: IOException) {
             throw AssertionError("Picture file could not be created.", e)
         }
-        val imageFile = File(imageUri!!.path, "testfile.ora")
+        val imageFile = File(imageUri.path, "testfile.ora")
         deletionFileList!!.add(imageFile)
         return imageUri
     }
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/SaveCompressImageIntegrationTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/SaveCompressImageIntegrationTest.kt
index 8695392047..084f6a9042 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/SaveCompressImageIntegrationTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/SaveCompressImageIntegrationTest.kt
@@ -119,11 +119,12 @@ class SaveCompressImageIntegrationTest {
 
         val options = BitmapFactory.Options()
         options.inMutable = true
-        val compressedBitmap = Objects.requireNonNull(
-            activity?.model?.savedPictureUri
-        )?.let {
-            activity?.let { it1 ->
-                getScaledBitmapFromUri(it1.contentResolver, it, activity?.applicationContext)
+        val savedUri = activity?.model?.savedPictureUri
+        Assert.assertNotNull("Saved picture URI should not be null", savedUri)
+
+        val compressedBitmap = savedUri?.let { uri ->
+            activity?.let { activityNonNull ->
+                getScaledBitmapFromUri(activityNonNull.contentResolver, uri, activityNonNull.applicationContext)
             }
         }
         val testBitmap = getBitmapFromFile(testImageFile)
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/api/CorrectStandbyBucketBehaviourTests.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/api/CorrectStandbyBucketBehaviourTests.kt
index 5d7795ca91..d2655eaaf4 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/api/CorrectStandbyBucketBehaviourTests.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/api/CorrectStandbyBucketBehaviourTests.kt
@@ -4,9 +4,9 @@ import android.app.Activity
 import android.app.usage.UsageStatsManager
 import android.content.Context
 import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
 import org.catrobat.paintroid.MainActivity
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -14,7 +14,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RequiresApi(api = Build.VERSION_CODES.P)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.P)
 @RunWith(AndroidJUnit4::class)
 class CorrectStandbyBucketBehaviourTests {
 
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/ColorDialogIntegrationTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/ColorDialogIntegrationTest.kt
index 883ea0c755..855559e8a0 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/ColorDialogIntegrationTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/ColorDialogIntegrationTest.kt
@@ -38,6 +38,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
+import androidx.test.rule.GrantPermissionRule
 import org.catrobat.paintroid.MainActivity
 import org.catrobat.paintroid.R
 import org.catrobat.paintroid.colorpicker.HSVColorPickerView
@@ -47,6 +48,7 @@ import org.catrobat.paintroid.common.CATROBAT_IMAGE_ENDING
 import org.catrobat.paintroid.common.PAINTROID_PICTURE_NAME
 import org.catrobat.paintroid.common.PAINTROID_PICTURE_PATH
 import org.catrobat.paintroid.test.espresso.util.DrawingSurfaceLocationProvider
+import org.catrobat.paintroid.test.espresso.util.EspressoUtils
 import org.catrobat.paintroid.test.espresso.util.UiInteractions
 import org.catrobat.paintroid.test.espresso.util.UiMatcher
 import org.catrobat.paintroid.test.espresso.util.wrappers.ColorPickerViewInteraction
@@ -72,6 +74,8 @@ class ColorDialogIntegrationTest {
     var launchActivityRule = ActivityTestRule(
         MainActivity::class.java
     )
+    @get:Rule
+    val grantPermissionRule: GrantPermissionRule = EspressoUtils.grantPermissionRulesVersionCheck()
 
     @get:Rule
     var launchActivityRuleWithIntent = IntentsTestRule(
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/IndeterminateProgressDialogIntegrationTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/IndeterminateProgressDialogIntegrationTest.kt
index 87a761e234..9df214960b 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/IndeterminateProgressDialogIntegrationTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/IndeterminateProgressDialogIntegrationTest.kt
@@ -22,13 +22,13 @@ import android.content.pm.ActivityInfo
 import android.content.res.Resources
 import android.graphics.PointF
 import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.fragment.app.DialogFragment
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
 import androidx.test.rule.ActivityTestRule
 import org.catrobat.paintroid.MainActivity
 import org.catrobat.paintroid.R
@@ -61,7 +61,7 @@ class IndeterminateProgressDialogIntegrationTest {
         dialog.dismiss()
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
     fun testDialogIsShown() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -70,7 +70,7 @@ class IndeterminateProgressDialogIntegrationTest {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
     fun testDialogIsNotCancelableOnBack() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -80,7 +80,7 @@ class IndeterminateProgressDialogIntegrationTest {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
     fun testDialogIsNotCancelable() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -92,7 +92,7 @@ class IndeterminateProgressDialogIntegrationTest {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
     fun testDialogIsRotateAble() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/BrushToolIntegrationTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/BrushToolIntegrationTest.kt
index 58dfd3f1ad..a08c3c01bc 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/BrushToolIntegrationTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/BrushToolIntegrationTest.kt
@@ -20,8 +20,6 @@ package org.catrobat.paintroid.test.espresso.tools
  */
 
 import android.graphics.Color
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -48,7 +46,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RequiresApi(api = Build.VERSION_CODES.P)
 @RunWith(AndroidJUnit4::class)
 class BrushToolIntegrationTest {
 
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/TransformToolIntegrationTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/TransformToolIntegrationTest.kt
index a0da6acca3..fa2f76e7cd 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/TransformToolIntegrationTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/TransformToolIntegrationTest.kt
@@ -66,6 +66,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertThat
 import org.junit.Assert.assertTrue
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -248,6 +249,7 @@ class TransformToolIntegrationTest {
 
     @LargeTest
     @Test
+    @Ignore("Verifying toasts not reliably possible anymore")
     fun testWhenNoPixelIsOnBitmapToasts() {
         onToolBarView()
             .performSelectTool(ToolType.TRANSFORM)
@@ -706,6 +708,7 @@ class TransformToolIntegrationTest {
 
     @LargeTest
     @Test
+    @Ignore("Verifying toasts not reliably possible anymore")
     fun testMaxImageResolutionToast() {
         val maxWidth = maxBitmapSize / initialHeight
         onToolBarView()
@@ -816,6 +819,7 @@ class TransformToolIntegrationTest {
     }
 
     @Test
+    @Ignore("Verifying toasts not reliably possible anymore")
     fun testResizeBoxCompletelyOutsideBitmapToast() {
         onToolBarView()
             .performSelectTool(ToolType.TRANSFORM)
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/util/EspressoUtils.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/util/EspressoUtils.kt
index f40903af83..d52b060d53 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/util/EspressoUtils.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/util/EspressoUtils.kt
@@ -101,7 +101,7 @@ object EspressoUtils {
 
     fun grantPermissionRulesVersionCheck(): GrantPermissionRule {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE)
+            GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.ACCESS_MEDIA_LOCATION)
         } else {
             GrantPermissionRule.grant(
                 Manifest.permission.WRITE_EXTERNAL_STORAGE,
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/ClipboardCommandTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/ClipboardCommandTest.kt
index c4908c687a..dbf9e9d298 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/ClipboardCommandTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/ClipboardCommandTest.kt
@@ -52,7 +52,7 @@ class ClipboardCommandTest {
         val bitmapUnderTest = canvasBitmapUnderTest.copy(Bitmap.Config.ARGB_8888, true)
         val layerUnderTest = Layer(bitmapUnderTest)
         canvasUnderTest = Canvas()
-        canvasUnderTest!!.setBitmap(canvasBitmapUnderTest)
+        canvasUnderTest.setBitmap(canvasBitmapUnderTest)
         pointUnderTest = PointF((INITIAL_WIDTH / 2).toFloat(), (INITIAL_HEIGHT / 2).toFloat())
         layerModel!!.addLayerAt(0, layerUnderTest)
         layerModel!!.currentLayer = layerUnderTest
@@ -70,7 +70,7 @@ class ClipboardCommandTest {
         val model = LayerModel()
         model.addLayerAt(0, layer)
         model.currentLayer = layer
-        commandUnderTest!!.run(canvasUnderTest!!, model)
+        commandUnderTest!!.run(canvasUnderTest, model)
         PaintroidAsserts.assertBitmapEquals(stampBitmapUnderTest, canvasBitmapUnderTest)
         Assert.assertNull("Stamp bitmap not recycled.", commandUnderTest!!.bitmap)
         Assert.assertNotNull("Bitmap not stored", commandUnderTest!!.fileToStoredBitmap)
@@ -78,17 +78,18 @@ class ClipboardCommandTest {
         val secondModel = LayerModel()
         secondModel.addLayerAt(0, secondLayer)
         secondModel.currentLayer = secondLayer
-        commandUnderTest!!.run(canvasUnderTest!!, secondModel)
+        commandUnderTest!!.run(canvasUnderTest, secondModel)
         PaintroidAsserts.assertBitmapEquals(stampBitmapUnderTest, canvasBitmapUnderTest)
     }
 
     @Test
     fun testRunRotateStamp() {
-        stampBitmapUnderTest!!.setPixel(0, 0, Color.GREEN)
-        commandUnderTest = ClipboardCommand(stampBitmapUnderTest!!, Point(pointUnderTest!!.x.toInt(), pointUnderTest!!.y.toInt()), canvasBitmapUnderTest!!.width.toFloat(), canvasBitmapUnderTest!!.height.toFloat(), 180f)
-        commandUnderTest!!.run(canvasUnderTest!!, LayerModel())
-        stampBitmapUnderTest!!.setPixel(0, 0, Color.CYAN)
-        stampBitmapUnderTest!!.setPixel(stampBitmapUnderTest!!.width - 1, stampBitmapUnderTest!!.height - 1,
+        stampBitmapUnderTest.setPixel(0, 0, Color.GREEN)
+        commandUnderTest = ClipboardCommand(stampBitmapUnderTest, Point(pointUnderTest!!.x.toInt(), pointUnderTest!!.y.toInt()), canvasBitmapUnderTest.width.toFloat(), canvasBitmapUnderTest.height.toFloat(), 180f)
+        commandUnderTest!!.run(canvasUnderTest, LayerModel())
+        stampBitmapUnderTest.setPixel(0, 0, Color.CYAN)
+        stampBitmapUnderTest.setPixel(
+            stampBitmapUnderTest.width - 1, stampBitmapUnderTest.height - 1,
                 Color.GREEN)
         PaintroidAsserts.assertBitmapEquals(stampBitmapUnderTest, canvasBitmapUnderTest)
         Assert.assertNull("Stamp bitmap not recycled.", commandUnderTest!!.bitmap)
@@ -120,7 +121,7 @@ class ClipboardCommandTest {
     fun testStoreBitmap() {
         var storedBitmap: File? = null
         try {
-            val bitmapCopy = canvasBitmapUnderTest!!.copy(canvasBitmapUnderTest!!.config, canvasBitmapUnderTest!!.isMutable)
+            val bitmapCopy = canvasBitmapUnderTest.copy(canvasBitmapUnderTest.config ?: Bitmap.Config.ARGB_8888, canvasBitmapUnderTest.isMutable)
             commandUnderTest!!.storeBitmap(bitmapCopy, bitmapCopy.width.toFloat(), bitmapCopy.height.toFloat())
             storedBitmap = commandUnderTest!!.fileToStoredBitmap
             Assert.assertNotNull(storedBitmap)
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/CropCommandTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/CropCommandTest.kt
index 7bbd3b5009..632936c77f 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/CropCommandTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/CropCommandTest.kt
@@ -43,16 +43,16 @@ class CropCommandTest {
     @Before
     fun setUp() {
         layerModel = LayerModel()
-        layerModel!!.width = INITIAL_WIDTH
-        layerModel!!.height = INITIAL_HEIGHT
+        layerModel.width = INITIAL_WIDTH
+        layerModel.height = INITIAL_HEIGHT
         val canvasBitmapUnderTest = Bitmap.createBitmap(INITIAL_WIDTH, INITIAL_HEIGHT, Bitmap.Config.ARGB_8888)
         canvasBitmapUnderTest.eraseColor(BITMAP_BASE_COLOR)
         bitmapUnderTest = canvasBitmapUnderTest.copy(Bitmap.Config.ARGB_8888, true)
         layerUnderTest = Layer(bitmapUnderTest)
         canvasUnderTest = Canvas()
-        canvasUnderTest!!.setBitmap(canvasBitmapUnderTest)
-        layerModel!!.addLayerAt(0, layerUnderTest!!)
-        layerModel!!.currentLayer = layerUnderTest
+        canvasUnderTest.setBitmap(canvasBitmapUnderTest)
+        layerModel.addLayerAt(0, layerUnderTest)
+        layerModel.currentLayer = layerUnderTest
         resizeCoordinateXLeft = 0
         resizeCoordinateYTop = 0
         resizeCoordinateXRight = bitmapUnderTest.width - 1
@@ -64,16 +64,16 @@ class CropCommandTest {
 
     @Test
     fun testIfBitmapIsCropped() {
-        val widthOriginal = bitmapUnderTest!!.width
-        val heightOriginal = bitmapUnderTest!!.height
+        val widthOriginal = bitmapUnderTest.width
+        val heightOriginal = bitmapUnderTest.height
         resizeCoordinateXLeft = 1
         resizeCoordinateYTop = 1
-        resizeCoordinateXRight = bitmapUnderTest!!.width - 2
-        resizeCoordinateYBottom = bitmapUnderTest!!.height - 2
+        resizeCoordinateXRight = bitmapUnderTest.width - 2
+        resizeCoordinateYBottom = bitmapUnderTest.height - 2
         commandUnderTest = CropCommand(resizeCoordinateXLeft, resizeCoordinateYTop,
                 resizeCoordinateXRight, resizeCoordinateYBottom, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        val croppedBitmap = layerUnderTest!!.bitmap
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        val croppedBitmap = layerUnderTest.bitmap
         Assert.assertEquals("Cropping failed, width not correct ", (widthOriginal - resizeCoordinateXLeft - (widthOriginal - (resizeCoordinateXRight + 1))).toLong(), croppedBitmap.width.toLong())
         Assert.assertEquals("Cropping failed, height not correct ", (heightOriginal - resizeCoordinateYTop - (widthOriginal - (resizeCoordinateYBottom + 1))).toLong(), croppedBitmap.height.toLong())
         croppedBitmap.recycle()
@@ -81,16 +81,16 @@ class CropCommandTest {
 
     @Test
     fun testIfBitmapIsEnlarged() {
-        val widthOriginal = bitmapUnderTest!!.width
-        val heightOriginal = bitmapUnderTest!!.height
+        val widthOriginal = bitmapUnderTest.width
+        val heightOriginal = bitmapUnderTest.height
         resizeCoordinateXLeft = -1
         resizeCoordinateYTop = -1
-        resizeCoordinateXRight = bitmapUnderTest!!.width
-        resizeCoordinateYBottom = bitmapUnderTest!!.height
+        resizeCoordinateXRight = bitmapUnderTest.width
+        resizeCoordinateYBottom = bitmapUnderTest.height
         commandUnderTest = CropCommand(resizeCoordinateXLeft, resizeCoordinateYTop,
                 resizeCoordinateXRight, resizeCoordinateYBottom, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        val enlargedBitmap = layerUnderTest!!.bitmap
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        val enlargedBitmap = layerUnderTest.bitmap
         Assert.assertEquals("Enlarging failed, width not correct ", (widthOriginal - resizeCoordinateXLeft - (widthOriginal - (resizeCoordinateXRight + 1))).toLong(), enlargedBitmap.width.toLong())
         Assert.assertEquals("Enlarging failed, height not correct ", (heightOriginal - resizeCoordinateYTop - (widthOriginal - (resizeCoordinateYBottom + 1))).toLong(), enlargedBitmap.height.toLong())
         enlargedBitmap.recycle()
@@ -98,16 +98,16 @@ class CropCommandTest {
 
     @Test
     fun testIfBitmapIsShifted() {
-        val widthOriginal = bitmapUnderTest!!.width
-        val heightOriginal = bitmapUnderTest!!.height
-        resizeCoordinateXLeft = bitmapUnderTest!!.width / 2 - 1
-        resizeCoordinateYTop = bitmapUnderTest!!.height / 2 - 1
-        resizeCoordinateXRight = resizeCoordinateXLeft + bitmapUnderTest!!.width - 1
-        resizeCoordinateYBottom = resizeCoordinateYTop + bitmapUnderTest!!.height - 1
+        val widthOriginal = bitmapUnderTest.width
+        val heightOriginal = bitmapUnderTest.height
+        resizeCoordinateXLeft = bitmapUnderTest.width / 2 - 1
+        resizeCoordinateYTop = bitmapUnderTest.height / 2 - 1
+        resizeCoordinateXRight = resizeCoordinateXLeft + bitmapUnderTest.width - 1
+        resizeCoordinateYBottom = resizeCoordinateYTop + bitmapUnderTest.height - 1
         commandUnderTest = CropCommand(resizeCoordinateXLeft, resizeCoordinateYTop,
                 resizeCoordinateXRight, resizeCoordinateYBottom, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        val enlargedBitmap = layerUnderTest!!.bitmap
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        val enlargedBitmap = layerUnderTest.bitmap
         Assert.assertEquals("Enlarging failed, width not correct ", widthOriginal.toLong(), enlargedBitmap.width.toLong())
         Assert.assertEquals("Enlarging failed, height not correct ", heightOriginal.toLong(), enlargedBitmap.height.toLong())
         enlargedBitmap.recycle()
@@ -115,41 +115,49 @@ class CropCommandTest {
 
     @Test
     fun testIfMaximumResolutionIsRespected() {
-        val widthOriginal = bitmapUnderTest!!.width
-        val heightOriginal = bitmapUnderTest!!.height
+        val widthOriginal = bitmapUnderTest.width
+        val heightOriginal = bitmapUnderTest.height
         commandUnderTest = CropCommand(0, 0, widthOriginal * 2, heightOriginal * 2, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        Assert.assertEquals("Width should not have changed", widthOriginal.toLong(), layerUnderTest!!.bitmap.width.toLong())
-        Assert.assertEquals("Height should not have changed", heightOriginal.toLong(), layerUnderTest!!.bitmap.height.toLong())
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        Assert.assertEquals("Width should not have changed", widthOriginal.toLong(), layerUnderTest.bitmap.width.toLong())
+        Assert.assertEquals("Height should not have changed", heightOriginal.toLong(), layerUnderTest.bitmap.height.toLong())
     }
 
     @Test
     fun testIfBitmapIsNotResizedWithInvalidBounds() {
-        val originalBitmap = layerUnderTest!!.bitmap
-        commandUnderTest = CropCommand(bitmapUnderTest!!.width, 0, bitmapUnderTest!!.width,
+        val originalBitmap = layerUnderTest.bitmap
+        commandUnderTest = CropCommand(
+            bitmapUnderTest.width, 0, bitmapUnderTest.width,
                 0, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        Assert.assertTrue("bitmap must not change if X left is larger than bitmap scope", originalBitmap.sameAs(layerUnderTest!!.bitmap))
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        Assert.assertTrue("bitmap must not change if X left is larger than bitmap scope", originalBitmap.sameAs(
+            layerUnderTest.bitmap))
         commandUnderTest = CropCommand(-1, 0, -1, 0, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        Assert.assertTrue("bitmap must not change if X right is smaller than bitmap scope", originalBitmap.sameAs(layerUnderTest!!.bitmap))
-        commandUnderTest = CropCommand(0, bitmapUnderTest!!.height, 0,
-                bitmapUnderTest!!.height, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        Assert.assertTrue("bitmap must not change if Y top is larger than bitmap scope", originalBitmap.sameAs(layerUnderTest!!.bitmap))
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        Assert.assertTrue("bitmap must not change if X right is smaller than bitmap scope", originalBitmap.sameAs(
+            layerUnderTest.bitmap))
+        commandUnderTest = CropCommand(0, bitmapUnderTest.height, 0,
+                bitmapUnderTest.height, maximumBitmapResolution)
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        Assert.assertTrue("bitmap must not change if Y top is larger than bitmap scope", originalBitmap.sameAs(
+            layerUnderTest.bitmap))
         commandUnderTest = CropCommand(0, -1, 0, -1, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        Assert.assertTrue("bitmap must not change if Y bottom is smaller than bitmap scope", originalBitmap.sameAs(layerUnderTest!!.bitmap))
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        Assert.assertTrue("bitmap must not change if Y bottom is smaller than bitmap scope", originalBitmap.sameAs(
+            layerUnderTest.bitmap))
         commandUnderTest = CropCommand(1, 0, 0, 0, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        Assert.assertTrue("bitmap must not change with widthXRight < widthXLeft bound", originalBitmap.sameAs(layerUnderTest!!.bitmap))
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        Assert.assertTrue("bitmap must not change with widthXRight < widthXLeft bound", originalBitmap.sameAs(
+            layerUnderTest.bitmap))
         commandUnderTest = CropCommand(0, 1, 0, 0, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        Assert.assertTrue("bitmap must not change with widthYBottom < widthYTop bound", originalBitmap.sameAs(layerUnderTest!!.bitmap))
-        commandUnderTest = CropCommand(0, 0, bitmapUnderTest!!.width - 1,
-                bitmapUnderTest!!.height - 1, maximumBitmapResolution)
-        commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        Assert.assertTrue("bitmap must not change because bounds are the same as original bitmap", originalBitmap.sameAs(layerUnderTest!!.bitmap))
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        Assert.assertTrue("bitmap must not change with widthYBottom < widthYTop bound", originalBitmap.sameAs(
+            layerUnderTest.bitmap))
+        commandUnderTest = CropCommand(0, 0, bitmapUnderTest.width - 1,
+                bitmapUnderTest.height - 1, maximumBitmapResolution)
+        commandUnderTest.run(canvasUnderTest, layerModel)
+        Assert.assertTrue("bitmap must not change because bounds are the same as original bitmap", originalBitmap.sameAs(
+            layerUnderTest.bitmap))
     }
 
     companion object {
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/FlipCommandTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/FlipCommandTest.kt
index fc837defb0..5758ee19a0 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/FlipCommandTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/FlipCommandTest.kt
@@ -53,18 +53,18 @@ class FlipCommandTest {
     @Test
     fun testVerticalFlip() {
         commandUnderTest = FlipCommand(FlipDirection.FLIP_VERTICAL)
-        bitmapUnderTest!!.setPixel(0, INITIAL_HEIGHT / 2, PAINT_BASE_COLOR)
+        bitmapUnderTest.setPixel(0, INITIAL_HEIGHT / 2, PAINT_BASE_COLOR)
         commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        val pixel = bitmapUnderTest!!.getPixel(INITIAL_WIDTH - 1, INITIAL_WIDTH / 2)
+        val pixel = bitmapUnderTest.getPixel(INITIAL_WIDTH - 1, INITIAL_WIDTH / 2)
         Assert.assertEquals(PAINT_BASE_COLOR.toLong(), pixel.toLong())
     }
 
     @Test
     fun testHorizontalFlip() {
         commandUnderTest = FlipCommand(FlipDirection.FLIP_HORIZONTAL)
-        bitmapUnderTest!!.setPixel(INITIAL_WIDTH / 2, 0, PAINT_BASE_COLOR)
+        bitmapUnderTest.setPixel(INITIAL_WIDTH / 2, 0, PAINT_BASE_COLOR)
         commandUnderTest.run(canvasUnderTest!!, layerModel!!)
-        val pixel = bitmapUnderTest!!.getPixel(INITIAL_WIDTH / 2, INITIAL_WIDTH - 1)
+        val pixel = bitmapUnderTest.getPixel(INITIAL_WIDTH / 2, INITIAL_WIDTH - 1)
         Assert.assertEquals(PAINT_BASE_COLOR.toLong(), pixel.toLong())
     }
 
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/MergeLayersCommandTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/MergeLayersCommandTest.kt
index 7dcdb3c100..c4a754cccc 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/MergeLayersCommandTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/MergeLayersCommandTest.kt
@@ -74,10 +74,10 @@ class MergeLayersCommandTest {
     @Test
     fun testRun() {
         commandUnderTest.run(canvasUnderTest, layerModel)
-        Assert.assertEquals(layerModel.getLayerAt(0)!!.bitmap!!.getPixel(5, 5), PAINT_BASE_COLOR)
-        Assert.assertEquals(layerModel.getLayerAt(0)!!.bitmap!!.getPixel(8, 8), PAINT_BASE_COLOR)
-        Assert.assertEquals(layerModel.getLayerAt(0)!!.bitmap!!.getPixel(3, 3), 0)
-        Assert.assertEquals(layerModel.getLayerAt(0)!!.bitmap!!.getPixel(0, 0), 0)
+        Assert.assertEquals(layerModel.getLayerAt(0)!!.bitmap.getPixel(5, 5), PAINT_BASE_COLOR)
+        Assert.assertEquals(layerModel.getLayerAt(0)!!.bitmap.getPixel(8, 8), PAINT_BASE_COLOR)
+        Assert.assertEquals(layerModel.getLayerAt(0)!!.bitmap.getPixel(3, 3), 0)
+        Assert.assertEquals(layerModel.getLayerAt(0)!!.bitmap.getPixel(0, 0), 0)
     }
 
     @Test
@@ -92,10 +92,10 @@ class MergeLayersCommandTest {
     fun testRunMergeSeparatedLayers() {
         commandUnderTest = MergeLayersCommand(2, 0)
         commandUnderTest.run(canvasUnderTest, layerModel)
-        Assert.assertEquals(layerModel.currentLayer!!.bitmap!!.getPixel(0, 0), PAINT_BASE_COLOR)
-        Assert.assertEquals(layerModel.currentLayer!!.bitmap!!.getPixel(8, 8), PAINT_BASE_COLOR)
-        Assert.assertEquals(layerModel.currentLayer!!.bitmap!!.getPixel(3, 3), 0)
-        Assert.assertEquals(layerModel.currentLayer!!.bitmap!!.getPixel(5, 5), 0)
-        Assert.assertEquals(layerModel.getLayerAt(1)!!.bitmap!!.getPixel(5, 5), PAINT_BASE_COLOR)
+        Assert.assertEquals(layerModel.currentLayer!!.bitmap.getPixel(0, 0), PAINT_BASE_COLOR)
+        Assert.assertEquals(layerModel.currentLayer!!.bitmap.getPixel(8, 8), PAINT_BASE_COLOR)
+        Assert.assertEquals(layerModel.currentLayer!!.bitmap.getPixel(3, 3), 0)
+        Assert.assertEquals(layerModel.currentLayer!!.bitmap.getPixel(5, 5), 0)
+        Assert.assertEquals(layerModel.getLayerAt(1)!!.bitmap.getPixel(5, 5), PAINT_BASE_COLOR)
     }
 }
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/PathCommandTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/PathCommandTest.kt
index 507eb0749a..ec5df93157 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/PathCommandTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/PathCommandTest.kt
@@ -55,6 +55,7 @@ class PathCommandTest {
         paintUnderTest!!.strokeWidth = 0f
         paintUnderTest!!.style = Paint.Style.STROKE
         paintUnderTest!!.strokeCap = Cap.BUTT
+        paintUnderTest!!.isAntiAlias = false
         layerModel.addLayerAt(0, layerUnderTest)
         layerModel.currentLayer = layerUnderTest
         val pathUnderTest = Path()
@@ -66,10 +67,10 @@ class PathCommandTest {
     @Test
     fun testPathOutOfBounds() {
         val path = Path()
-        val left = (canvasBitmapUnderTest!!.width + 50).toFloat()
-        val top = (canvasBitmapUnderTest!!.height + 50).toFloat()
-        val right = (canvasBitmapUnderTest!!.width + 100).toFloat()
-        val bottom = (canvasBitmapUnderTest!!.height + 100).toFloat()
+        val left = (canvasBitmapUnderTest.width + 50).toFloat()
+        val top = (canvasBitmapUnderTest.height + 50).toFloat()
+        val right = (canvasBitmapUnderTest.width + 100).toFloat()
+        val bottom = (canvasBitmapUnderTest.height + 100).toFloat()
         path.addRect(RectF(left, top, right, bottom), Path.Direction.CW)
         commandUnderTest = PathCommand(paintUnderTest!!, path)
         commandUnderTest.run(canvasUnderTest!!, LayerModel())
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/PointCommandTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/PointCommandTest.kt
index 78533fb97d..a455e8ccfb 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/PointCommandTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/command/PointCommandTest.kt
@@ -55,6 +55,7 @@ class PointCommandTest {
         paintUnderTest!!.strokeWidth = 0f
         paintUnderTest!!.style = Paint.Style.STROKE
         paintUnderTest!!.strokeCap = Cap.BUTT
+        paintUnderTest!!.isAntiAlias = false
         pointUnderTest = PointF((INITIAL_WIDTH / 2).toFloat(), (INITIAL_HEIGHT / 2).toFloat())
         layerModel.addLayerAt(0, layerUnderTest)
         layerModel.currentLayer = layerUnderTest
@@ -63,17 +64,17 @@ class PointCommandTest {
 
     @Test
     fun testRun() {
-        bitmapUnderTest!!.setPixel(pointUnderTest!!.x.toInt(), pointUnderTest!!.y.toInt(), paintUnderTest!!.color)
-        commandUnderTest!!.run(canvasUnderTest!!, LayerModel())
-        assertBitmapEquals(bitmapUnderTest!!, canvasBitmapUnderTest)
+        bitmapUnderTest.setPixel(pointUnderTest!!.x.toInt(), pointUnderTest!!.y.toInt(), paintUnderTest!!.color)
+        commandUnderTest.run(canvasUnderTest!!, LayerModel())
+        assertBitmapEquals(bitmapUnderTest, canvasBitmapUnderTest)
     }
 
     @Test
     fun testRunOutOfBounds() {
-        pointUnderTest = PointF((canvasBitmapUnderTest!!.height + 1).toFloat(), (canvasBitmapUnderTest!!.width + 1).toFloat())
+        pointUnderTest = PointF((canvasBitmapUnderTest.height + 1).toFloat(), (canvasBitmapUnderTest.width + 1).toFloat())
         commandUnderTest = PointCommand(paintUnderTest!!, pointUnderTest!!)
         commandUnderTest.run(canvasUnderTest!!, LayerModel())
-        assertBitmapEquals(bitmapUnderTest!!, canvasBitmapUnderTest)
+        assertBitmapEquals(bitmapUnderTest, canvasBitmapUnderTest)
     }
 
     companion object {
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/tools/PipetteToolTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/tools/PipetteToolTest.kt
index 73a426ca15..d542e69aa5 100644
--- a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/tools/PipetteToolTest.kt
+++ b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/junit/tools/PipetteToolTest.kt
@@ -39,6 +39,7 @@ import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.junit.MockitoJUnitRunner
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.atLeastOnce
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -130,8 +131,8 @@ class PipetteToolTest {
         toolToTest!!.handleUp(PointF(X_COORDINATE_BLUE.toFloat(), 0f))
         toolToTest!!.handleUp(PointF(X_COORDINATE_PART_TRANSPARENT.toFloat(), 0f))
         val inOrderToolPaint = Mockito.inOrder(toolPaint)
-        inOrderToolPaint.verify(toolPaint)!!.color = Color.BLUE
-        inOrderToolPaint.verify(toolPaint)!!.color = -0x55555556
+        inOrderToolPaint.verify(toolPaint, atLeastOnce())!!.color = Color.BLUE
+        inOrderToolPaint.verify(toolPaint, atLeastOnce())!!.color = -0x55555556
         val inOrderListener = Mockito.inOrder(listener)
         inOrderListener.verify(listener)!!.colorChanged(Color.BLUE)
         inOrderListener.verify(listener)!!.colorChanged(-0x55555556)
diff --git a/Paintroid/src/main/AndroidManifest.xml b/Paintroid/src/main/AndroidManifest.xml
index 416ef07bbc..e9def6dd3d 100644
--- a/Paintroid/src/main/AndroidManifest.xml
+++ b/Paintroid/src/main/AndroidManifest.xml
@@ -19,13 +19,13 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.catrobat.paintroid"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
 
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/FileIO.kt b/Paintroid/src/main/java/org/catrobat/paintroid/FileIO.kt
index 432399538f..a61e19e3ac 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/FileIO.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/FileIO.kt
@@ -115,7 +115,7 @@ object FileIO {
         require(currentBitmap != null && !currentBitmap.isRecycled) { "Bitmap is invalid" }
         if (compressFormat == CompressFormat.JPEG) {
             val newBitmap =
-                Bitmap.createBitmap(currentBitmap.width, currentBitmap.height, currentBitmap.config)
+                Bitmap.createBitmap(currentBitmap.width, currentBitmap.height, currentBitmap.config ?: Bitmap.Config.ARGB_8888)
             val canvas = Canvas(newBitmap)
             canvas.drawColor(Color.WHITE)
             canvas.drawBitmap(currentBitmap, 0f, 0f, null)
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/MainActivity.kt b/Paintroid/src/main/java/org/catrobat/paintroid/MainActivity.kt
index dffb83df93..23988489f8 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/MainActivity.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/MainActivity.kt
@@ -21,6 +21,7 @@ package org.catrobat.paintroid
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.PointF
@@ -810,7 +811,14 @@ class MainActivity : AppCompatActivity(), MainView, CommandListener {
         }
     }
 
-    fun getVersionCode(): String = runCatching {
-        packageManager.getPackageInfo(packageName, 0).versionName
+    fun getVersionName(): String = runCatching {
+        val pm = packageManager
+        val pkgInfo = if (Build.VERSION.SDK_INT >= 33) {
+            pm.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(0))
+        } else {
+            @Suppress("DEPRECATION")
+            pm.getPackageInfo(packageName, 0)
+        }
+        pkgInfo.versionName ?: ""
     }.getOrDefault("")
 }
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/CommandManager.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/CommandManager.kt
index 2c32275b16..3c59f27b4a 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/command/CommandManager.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/command/CommandManager.kt
@@ -57,8 +57,6 @@ interface CommandManager {
 
     fun getCommandManagerModelForCatrobatImage(): CommandManagerModel?
 
-    fun adjustUndoListForClippingTool()
-
     fun undoInClippingTool()
 
     fun popFirstCommandInUndo()
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/AsyncCommandManager.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/AsyncCommandManager.kt
index a8f3d6822f..975a241347 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/AsyncCommandManager.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/AsyncCommandManager.kt
@@ -68,7 +68,6 @@ open class AsyncCommandManager(
                     synchronized(layerModel) { commandManager.addCommand(command) }
                 }
                 withContext(Dispatchers.Main) {
-                    commandManager.adjustUndoListForClippingTool()
                     notifyCommandPostExecute()
                 }
             }
@@ -155,10 +154,6 @@ open class AsyncCommandManager(
         synchronized(layerModel) { commandManager.setInitialStateCommand(command) }
     }
 
-    override fun adjustUndoListForClippingTool() {
-        synchronized(layerModel) { commandManager.adjustUndoListForClippingTool() }
-    }
-
     override fun undoInClippingTool() {
         synchronized(layerModel) { commandManager.undoInClippingTool() }
     }
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/ClippingCommand.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/ClippingCommand.kt
index 2ebf7f70e8..c38a393cf5 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/ClippingCommand.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/ClippingCommand.kt
@@ -12,8 +12,8 @@ import org.catrobat.paintroid.contract.LayerContracts
 
 class ClippingCommand(bitmap: Bitmap, pathBitmap: Bitmap) : Command {
 
-    var bitmap: Bitmap? = bitmap.copy(bitmap.config, true); private set
-    var pathBitmap: Bitmap? = pathBitmap.copy(pathBitmap.config, true); private set
+    var bitmap: Bitmap? = bitmap.copy(bitmap.config ?: Bitmap.Config.ARGB_8888, true); private set
+    var pathBitmap: Bitmap? = pathBitmap.copy(pathBitmap.config ?: Bitmap.Config.ARGB_8888, true); private set
 
     override fun run(canvas: Canvas, layerModel: LayerContracts.Model) {
         val bitmapToDraw = bitmap
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/CropCommand.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/CropCommand.kt
index 874d249ad7..58eb0bbd4f 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/CropCommand.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/CropCommand.kt
@@ -57,7 +57,7 @@ class CropCommand(
         while (iterator.hasNext()) {
             val currentLayer = iterator.next()
             val currentBitmap = currentLayer.bitmap ?: Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-            val resizedBitmap = Bitmap.createBitmap(width, height, currentBitmap.config)
+            val resizedBitmap = Bitmap.createBitmap(width, height, currentBitmap.config ?: Bitmap.Config.ARGB_8888)
             val resizedCanvas = Canvas(resizedBitmap)
             resizedCanvas.drawBitmap(currentBitmap, -resizeCoordinateXLeft.toFloat(), -resizeCoordinateYTop.toFloat(), null)
             currentLayer.bitmap = resizedBitmap
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
index 91ebbbd431..9b977385a8 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
@@ -29,8 +29,6 @@ import java.util.Deque
 import java.util.ArrayDeque
 import java.util.Collections
 
-const val FIVE = 5
-
 class DefaultCommandManager(
     private val commonFactory: CommonFactory,
     private val layerModel: LayerContracts.Model
@@ -193,6 +191,10 @@ class DefaultCommandManager(
     }
 
     override fun isLastColorCommandOnTop(): Boolean {
+        if (undoCommandList.isEmpty()) {
+            return false
+        }
+
         var retVal = false
         if (undoCommandList.first is ColorChangedCommand) {
             val commandIterator = undoCommandList.iterator()
@@ -379,20 +381,6 @@ class DefaultCommandManager(
         return adaptedModel
     }
 
-    override fun adjustUndoListForClippingTool() {
-        if (isUndoAvailable) {
-            if (undoCommandList.first.toString().split(".", "@").size < FIVE) {
-                return
-            }
-            val commandName = undoCommandList.first.toString().split(".", "@")[FIVE]
-            if (commandName == ClippingCommand::class.java.simpleName) {
-                val clippingCommand = undoCommandList.pop()
-                undoCommandList.pop()
-                undoCommandList.addFirst(clippingCommand)
-            }
-        }
-    }
-
     override fun undoInClippingTool() {
         if (isUndoAvailable) {
             val command = undoCommandList.pop()
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/FlipCommand.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/FlipCommand.kt
index aefd9a5dcf..ea930150c6 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/FlipCommand.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/FlipCommand.kt
@@ -19,6 +19,7 @@
 
 package org.catrobat.paintroid.command.implementation
 
+import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Matrix
@@ -44,7 +45,7 @@ class FlipCommand(flipDirection: FlipDirection) : Command {
             }
         }
         layerModel.currentLayer?.bitmap?.let { bitmap ->
-            val bitmapCopy = bitmap.copy(bitmap.config, bitmap.isMutable)
+            val bitmapCopy = bitmap.copy(bitmap.config ?: Bitmap.Config.ARGB_8888, bitmap.isMutable)
             val flipCanvas = Canvas(bitmap)
             bitmap.eraseColor(Color.TRANSPARENT)
             flipCanvas.drawBitmap(bitmapCopy, flipMatrix, Paint())
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/MergeLayersCommand.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/MergeLayersCommand.kt
index c4b43491f6..e4b579681b 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/MergeLayersCommand.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/MergeLayersCommand.kt
@@ -19,6 +19,7 @@
 
 package org.catrobat.paintroid.command.implementation
 
+import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.util.Log
 import org.catrobat.paintroid.command.Command
@@ -40,7 +41,7 @@ class MergeLayersCommand(position: Int, mergeWith: Int) : Command {
         if (sourceLayer != null && destinationLayer != null) {
             val destinationBitmap = destinationLayer.bitmap
             destinationBitmap ?: return
-            val copyBitmap = destinationBitmap.copy(destinationBitmap.config, true)
+            val copyBitmap = destinationBitmap.copy(destinationBitmap.config ?: Bitmap.Config.ARGB_8888, true)
             val copyCanvas = Canvas(copyBitmap)
             copyCanvas.drawBitmap(sourceLayer.bitmap ?: return, 0f, 0f, null)
             if (layerModel.removeLayerAt(position)) {
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/common/Constants.kt b/Paintroid/src/main/java/org/catrobat/paintroid/common/Constants.kt
index 19b121b8b4..d62d328955 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/common/Constants.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/common/Constants.kt
@@ -24,7 +24,7 @@ import java.io.File
 const val PAINTROID_PICTURE_PATH = "org.catrobat.extra.PAINTROID_PICTURE_PATH"
 const val PAINTROID_PICTURE_NAME = "org.catrobat.extra.PAINTROID_PICTURE_NAME"
 const val TEMP_PICTURE_NAME = "catroidTemp"
-const val MEDIA_GALLEY_URL = "https://share.catrob.at/pocketcode/media-library/looks"
+const val MEDIA_GALLEY_URL = "https://catrobat.org/figures-download/"
 const val ABOUT_DIALOG_FRAGMENT_TAG = "aboutdialogfragment"
 const val LIKE_US_DIALOG_FRAGMENT_TAG = "likeusdialogfragment"
 const val RATE_US_DIALOG_FRAGMENT_TAG = "rateusdialogfragment"
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/dialog/AboutDialog.kt b/Paintroid/src/main/java/org/catrobat/paintroid/dialog/AboutDialog.kt
index d6a44a777c..aeae3ec679 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/dialog/AboutDialog.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/dialog/AboutDialog.kt
@@ -52,7 +52,7 @@ class AboutDialog : AppCompatDialogFragment() {
         val aboutLicenseView = view.findViewById<TextView>(R.id.pocketpaint_about_license_url)
         val aboutCatrobatView = view.findViewById<TextView>(R.id.pocketpaint_about_catrobat_url)
         val activity = requireActivity() as MainActivity
-        val aboutVersion = getString(R.string.pocketpaint_about_version, activity.getVersionCode())
+        val aboutVersion = getString(R.string.pocketpaint_about_version, activity.getVersionName())
         aboutVersionView.text = aboutVersion
         val aboutContent = getString(
             R.string.pocketpaint_about_content,
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/model/LayerModel.kt b/Paintroid/src/main/java/org/catrobat/paintroid/model/LayerModel.kt
index f89b5fcfad..6de6f403b0 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/model/LayerModel.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/model/LayerModel.kt
@@ -65,18 +65,14 @@ open class LayerModel : LayerContracts.Model {
 
     @Synchronized
     override fun getBitmapOfAllLayers(): Bitmap? {
-        synchronized(this) {
-            if (layers.isEmpty()) {
-                return null
-            }
-            val referenceBitmap = layers[0].bitmap
-            val bitmap = Bitmap.createBitmap(referenceBitmap.width, referenceBitmap.height, Bitmap.Config.ARGB_8888)
-            val canvas = bitmap?.let { Canvas(it) }
-
-            drawLayersOntoCanvas(canvas)
-
-            return bitmap
+        if (layers.isEmpty()) {
+            return null
         }
+        val referenceBitmap = layers[0].bitmap
+        val bitmap = Bitmap.createBitmap(referenceBitmap.width, referenceBitmap.height, Bitmap.Config.ARGB_8888)
+        val canvas = bitmap?.let { Canvas(it) }
+        drawLayersOntoCanvas(canvas)
+        return bitmap
     }
 
     override fun getBitmapListOfAllLayers(): List<Bitmap?> = layers.map { it.bitmap }
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/ClippingTool.kt b/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/ClippingTool.kt
index 026a300382..337e943b87 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/ClippingTool.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/ClippingTool.kt
@@ -106,9 +106,11 @@ class ClippingTool(
 
     override fun handleDown(coordinate: PointF?): Boolean {
         if (areaClosed) {
+            pathToDraw.rewind()
+            pointArray.clear()
             super.resetInternalState()
             areaClosed = false
-            commandManager.undoInClippingTool()
+
             changePaintColor(toolPaint.previewPaint.color)
             brushToolOptionsView.setCurrentPaint(toolPaint.paint)
             brushToolOptionsView.invalidate()
@@ -117,19 +119,37 @@ class ClippingTool(
         return super.handleDown(coordinate)
     }
 
+    override fun handleMove(coordinate: PointF?, shouldAnimate: Boolean): Boolean {
+        if (areaClosed) {
+            return false
+        }
+        return super.handleMove(coordinate, shouldAnimate)
+    }
+
     override fun handleUp(coordinate: PointF?): Boolean {
+        if (coordinate == null) {
+            return false
+        }
+
         val tempPoint = initialEventCoordinate
         if (previousEventCoordinate == initialEventCoordinate) {
             super.resetInternalState()
             return false
         }
-        if (!areaClosed && coordinate != null && tempPoint != null) {
+        if (!areaClosed && tempPoint != null) {
             pathToDraw.incReserve(1)
             pathToDraw.quadTo(coordinate.x, coordinate.y, tempPoint.x, tempPoint.y)
             pointArray.add(PointF(coordinate.x, coordinate.y))
             areaClosed = true
         }
-        return super.handleUp(coordinate)
+
+        handleUpAnimations(coordinate)
+
+        initialEventCoordinate = null
+        previousEventCoordinate = null
+        pointArray.clear()
+
+        return true
     }
 
     fun onClickOnButton() {
@@ -163,7 +183,6 @@ class ClippingTool(
                     )
                 }
                 commandManager.addCommand(command)
-                commandManager.adjustUndoListForClippingTool()
             }
             areaClosed = false
             wasRecentlyApplied = true
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/ui/BottomNavigationLandscape.kt b/Paintroid/src/main/java/org/catrobat/paintroid/ui/BottomNavigationLandscape.kt
index e6748fef3f..349d5d8b89 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/ui/BottomNavigationLandscape.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/ui/BottomNavigationLandscape.kt
@@ -23,41 +23,40 @@ import android.view.LayoutInflater
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import com.google.android.material.bottomnavigation.BottomNavigationItemView
-import com.google.android.material.bottomnavigation.BottomNavigationMenuView
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.catrobat.paintroid.R
 import org.catrobat.paintroid.contract.MainActivityContracts.BottomNavigationAppearance
 import org.catrobat.paintroid.tools.ToolType
+import androidx.core.view.size
+import androidx.core.view.get
 
 class BottomNavigationLandscape(context: Context, private val bottomNavigationView: BottomNavigationView) : BottomNavigationAppearance {
-    private val bottomNavigationMenuView: BottomNavigationMenuView = bottomNavigationView.getChildAt(0) as BottomNavigationMenuView
 
     init {
         setAppearance(context)
     }
 
     override fun showCurrentTool(toolType: ToolType) {
-        val item = bottomNavigationMenuView.getChildAt(1)
-        val icon = item.findViewById<ImageView>(R.id.icon)
-        val title = item.findViewById<TextView>(R.id.title)
-        icon.setImageResource(toolType.drawableResource)
-        title.setText(toolType.nameResource)
+        val item = bottomNavigationView.menu[1]
+        item.icon = ContextCompat.getDrawable(bottomNavigationView.context, toolType.drawableResource)
+        item.title = bottomNavigationView.context.getString(toolType.nameResource)
     }
 
     private fun setAppearance(context: Context) {
         val inflater = LayoutInflater.from(context)
         val menu = bottomNavigationView.menu
-        for (i in 0 until menu.size()) {
-            val item = bottomNavigationMenuView.getChildAt(i) as BottomNavigationItemView
-            val itemBottomNavigation = inflater.inflate(R.layout.pocketpaint_layout_bottom_navigation_item, bottomNavigationMenuView, false)
+        for (i in 0 until menu.size) {
+            val item = menu[i]
+            val itemBottomNavigation = inflater.inflate(R.layout.pocketpaint_layout_bottom_navigation_item, bottomNavigationView, false)
             val icon = itemBottomNavigation.findViewById<ImageView>(R.id.icon)
             val text = itemBottomNavigation.findViewById<TextView>(R.id.title)
-            icon.setImageDrawable(menu.getItem(i).icon)
+            icon.setImageDrawable(item.icon)
             icon.setColorFilter(ContextCompat.getColor(context, R.color.pocketpaint_welcome_dot_active))
-            text.text = menu.getItem(i).title
-            item.removeAllViews()
-            item.addView(itemBottomNavigation)
+            text.text = item.title
+            if (item.actionView != null) {
+                bottomNavigationView.removeView(item.actionView)
+            }
+            item.actionView = itemBottomNavigation
         }
     }
 }
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/ui/viewholder/BottomNavigationViewHolder.kt b/Paintroid/src/main/java/org/catrobat/paintroid/ui/viewholder/BottomNavigationViewHolder.kt
index 7c10be5ccc..3c5b106d51 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/ui/viewholder/BottomNavigationViewHolder.kt
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/ui/viewholder/BottomNavigationViewHolder.kt
@@ -18,6 +18,7 @@
  */
 package org.catrobat.paintroid.ui.viewholder
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.graphics.Color
@@ -33,6 +34,7 @@ import org.catrobat.paintroid.tools.ToolType
 import org.catrobat.paintroid.ui.BottomNavigationLandscape
 import org.catrobat.paintroid.ui.BottomNavigationPortrait
 
+@SuppressLint("RestrictedApi")
 class BottomNavigationViewHolder(
     private val layout: View,
     private val orientation: Int,
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/web/MediaGalleryWebViewClient.java b/Paintroid/src/main/java/org/catrobat/paintroid/web/MediaGalleryWebViewClient.java
index 4690e2aa6e..92d6ce8bba 100644
--- a/Paintroid/src/main/java/org/catrobat/paintroid/web/MediaGalleryWebViewClient.java
+++ b/Paintroid/src/main/java/org/catrobat/paintroid/web/MediaGalleryWebViewClient.java
@@ -22,54 +22,91 @@
  */
 package org.catrobat.paintroid.web;
 
-import android.app.ProgressDialog;
 import android.graphics.Bitmap;
+import android.view.View;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
 
-import org.catrobat.paintroid.R;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.view.ViewCompat;
 
 public class MediaGalleryWebViewClient extends WebViewClient {
-	private ProgressDialog webViewLoadingDialog;
-	private WebClientCallback callback;
+	private AlertDialog loadingDialog;
+	private final WebClientCallback callback;
 
 	public interface WebClientCallback {
 		void finish();
 	}
 
 	public MediaGalleryWebViewClient(WebClientCallback callback) {
-		super();
 		this.callback = callback;
 	}
 
 	@Override
-	public void onPageStarted(WebView view, String urlClient, Bitmap favicon) {
-		if (webViewLoadingDialog == null && !urlClient.matches("https://share.catrob.at/pocketcode/")) {
-			webViewLoadingDialog = new ProgressDialog(view.getContext(), R.style.WebViewLoadingCircle);
-			webViewLoadingDialog.setCancelable(true);
-			webViewLoadingDialog.setCanceledOnTouchOutside(false);
-			webViewLoadingDialog.setProgressStyle(android.R.style.Widget_ProgressBar_Small);
-			webViewLoadingDialog.show();
-		} else {
-			callback.finish();
-		}
+	public void onPageStarted(WebView view, String url, Bitmap favicon) {
+		showLoading(view);
 	}
 
 	@Override
 	public void onPageFinished(WebView view, String url) {
-		if (webViewLoadingDialog != null) {
-			webViewLoadingDialog.dismiss();
-			webViewLoadingDialog = null;
-		}
+		dismissLoading();
 	}
 
+	// New API (M+) — preferred
+	@Override
+	public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+		// Return false to let the WebView load the URL
+		return false;
+	}
+
+	// Legacy shim for < M
+	@SuppressWarnings("deprecation")
 	@Override
 	public boolean shouldOverrideUrlLoading(WebView view, String url) {
 		return false;
 	}
 
+	// New API (M+) — preferred
+	@Override
+	public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+		dismissLoading();
+		callback.finish();
+	}
+
+	// Legacy shim for < M
+	@SuppressWarnings("deprecation")
 	@Override
 	public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+		dismissLoading();
 		callback.finish();
 	}
+
+	private void showLoading(View anchor) {
+		if (loadingDialog != null) {
+			return;
+		}
+
+		ProgressBar progress = new ProgressBar(anchor.getContext());
+		// make it large enough and accessible
+		int padding = (int) (anchor.getResources().getDisplayMetrics().density * 24);
+		progress.setPadding(padding, padding, padding, padding);
+		ViewCompat.setImportantForAccessibility(progress, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES);
+
+		loadingDialog = new AlertDialog.Builder(anchor.getContext())
+				.setView(progress)
+				.setCancelable(true)
+				.create();
+		loadingDialog.setCanceledOnTouchOutside(false);
+		loadingDialog.show();
+	}
+
+	private void dismissLoading() {
+		if (loadingDialog != null) {
+			loadingDialog.dismiss();
+			loadingDialog = null;
+		}
+	}
 }
diff --git a/app/build.gradle b/app/build.gradle
index 2c7e76738b..3181abf605 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,13 +26,10 @@ ext {
     appName = '@string/pocketpaint_app_name'
 }
 
-// When -Pindependent was provided on the gradle command the APP name is changed.
-// This allows to have multiple Paintroid versions installed in parallel for testing purposes.
-// Furthermore these installations do not interfere with the actual Paintroid app.
 if (project.hasProperty('independent')) {
     def today = new Date()
-    appId += '.independent_' + today.format('YYYYMMdd_HHmm')
-    appName = property('independent') ?: 'Paint ' + today.format('MMdd HH:mm')
+    appId += ".independent_${today.format('YYYYMMdd_HHmm')}"
+    appName = property('independent') ?: "Paint ${today.format('MMdd HH:mm')}"
 }
 
 if (!project.hasProperty("signingKeystore")) {
@@ -41,55 +38,71 @@ if (!project.hasProperty("signingKeystore")) {
 
 android {
     compileSdkVersion rootProject.ext.androidCompileSdkVersion
+
     defaultConfig {
-        applicationId appId
+        applicationId = appId
         minSdkVersion rootProject.ext.androidMinSdkVersion
         //noinspection OldTargetApi
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode rootProject.ext.androidVersionCode
-        versionName rootProject.ext.androidVersionName
+        versionCode = rootProject.ext.androidVersionCode
+        versionName = rootProject.ext.androidVersionName
         manifestPlaceholders += [appName: appName]
-        setProperty("archivesBaseName", "paintroid")
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     signingConfigs {
         signedRelease {
-            storeFile file(project.property("signingKeystore"))
-            storePassword ""
-            keyAlias ""
-            keyPassword ""
+            storeFile = file(project.property("signingKeystore"))
+            storePassword = ""
+            keyAlias = ""
+            keyPassword = ""
         }
     }
 
-    if (project.hasProperty("signingKeystore") && project.hasProperty("signingKeystorePassword") &&
-            project.hasProperty("signingKeyAlias") && project.hasProperty("signingKeyPassword")) {
-        android.signingConfigs.signedRelease.storePassword = project.property("signingKeystorePassword")
-        android.signingConfigs.signedRelease.keyAlias = project.property("signingKeyAlias")
-        android.signingConfigs.signedRelease.keyPassword = project.property("signingKeyPassword")
+    if (project.hasProperty("signingKeystore") &&
+            project.hasProperty("signingKeystorePassword") &&
+            project.hasProperty("signingKeyAlias") &&
+            project.hasProperty("signingKeyPassword")) {
+
+        signingConfigs.signedRelease.storePassword = project.property("signingKeystorePassword")
+        signingConfigs.signedRelease.keyAlias = project.property("signingKeyAlias")
+        signingConfigs.signedRelease.keyPassword = project.property("signingKeyPassword")
     }
 
     buildTypes {
+        debug {
+            //minifyEnabled true
+            //proguardFiles(getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro')
+        }
         release {
             minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+            proguardFiles(getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro')
         }
-        signedRelease.initWith(buildTypes.release)
         signedRelease {
-            signingConfig signingConfigs.signedRelease
+            initWith(release)
+            signingConfig = signingConfigs.signedRelease
         }
+
     }
 
     publishing {
-        singleVariant('release') {
+        singleVariant("release") {
             withSourcesJar()
         }
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = false
+        }
+    }
+
+    namespace = "org.catrobat.paintroid.app"
 }
 
 tasks.withType(Detekt).configureEach {
@@ -100,6 +113,5 @@ tasks.withType(Detekt).configureEach {
 
 dependencies {
     implementation project(':Paintroid')
-
     implementation 'com.android.support:support-core-utils:28.0.0'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index a1ba9ddb40..97b8d88247 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,17 @@
 # If you keep the line number information, uncomment this to
 # resetToOrigin the original source file name.
 -renamesourcefileattribute SourceFile
+
+# Auto-generated rules to suppress warnings
+-dontwarn java.beans.BeanInfo
+-dontwarn java.beans.IntrospectionException
+-dontwarn java.beans.Introspector
+-dontwarn java.beans.PropertyDescriptor
+-dontwarn sun.nio.ch.DirectBuffer
+
+# Your custom keep rules for Kryo
+-keep class com.esotericsoftware.kryo.** { *; }
+-keep class com.esotericsoftware.kryo.serializers.** { *; }
+-keepclassmembers class com.esotericsoftware.kryo.serializers.DefaultArraySerializers$* {
+    public <init>();
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ffe27c5a3..7433fc4065 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,14 +18,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.catrobat.paintroid.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="${appName}"
-        android:extractNativeLibs="false"
         tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
 
         <provider
diff --git a/build.gradle b/build.gradle
index 5b1e4b098c..f18575d7dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,36 +19,35 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.24'
     repositories {
-        mavenCentral()
         google()
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://jitpack.io' }
+        mavenCentral()
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven { url = uri("https://jitpack.io") }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath 'com.hiya:jacoco-android:0.2'
         classpath 'com.github.Catrobat:Gradle:1.6.2'
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:3.1.0'
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.20.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 plugins {
-    id "io.gitlab.arturbosch.detekt" version "1.20.0"
+    id "com.android.application" version '8.13.0' apply false
+    id "com.android.library"     version '8.13.0' apply false
+    id "org.jetbrains.kotlin.android" version "1.9.24" apply false
+    id "io.gitlab.arturbosch.detekt" version "1.23.6" apply false
+    id "com.getkeepsafe.dexcount"     version "4.0.0" apply false
 }
 
 ext {
-    androidCompileSdkVersion = 34
+    androidCompileSdkVersion = 35
+    androidTargetSdkVersion = 35
     androidMinSdkVersion = 21
-    androidTargetSdkVersion = 34
 
     androidSupportLibraryVersion = '28.0.0'
 
-    androidVersionCode = 53
-    androidVersionName = '2.13.0'
+    androidVersionCode = 54
+    androidVersionName = '2.14.0'
 }
 
 if(project.hasProperty("snapshot")) {
diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle
index e1f8ea1e11..9e45d12ea2 100644
--- a/colorpicker/build.gradle
+++ b/colorpicker/build.gradle
@@ -21,32 +21,30 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion rootProject.ext.androidCompileSdkVersion
+    namespace = "org.catrobat.paintroid.colorpicker"
+    compileSdk = rootProject.ext.androidCompileSdkVersion
 
     defaultConfig {
-        minSdkVersion rootProject.ext.androidMinSdkVersion
-        targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        versionCode rootProject.ext.androidVersionCode
-        versionName rootProject.ext.androidVersionName
+        minSdk = rootProject.ext.androidMinSdkVersion
+        targetSdk = rootProject.ext.androidTargetSdkVersion
+        testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = "17"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-        signedRelease {
-        }
+        signedRelease { }
     }
 }
 
diff --git a/colorpicker/proguard-rules.pro b/colorpicker/proguard-rules.pro
index f1b424510d..fb2e6583ba 100644
--- a/colorpicker/proguard-rules.pro
+++ b/colorpicker/proguard-rules.pro
@@ -19,3 +19,17 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+# Auto-generated rules to suppress warnings
+-dontwarn java.beans.BeanInfo
+-dontwarn java.beans.IntrospectionException
+-dontwarn java.beans.Introspector
+-dontwarn java.beans.PropertyDescriptor
+-dontwarn sun.nio.ch.DirectBuffer
+
+# Your custom keep rules for Kryo
+-keep class com.esotericsoftware.kryo.** { *; }
+-keep class com.esotericsoftware.kryo.serializers.** { *; }
+-keepclassmembers class com.esotericsoftware.kryo.serializers.DefaultArraySerializers$* {
+    public <init>();
+}
\ No newline at end of file
diff --git a/colorpicker/src/main/AndroidManifest.xml b/colorpicker/src/main/AndroidManifest.xml
index 3d255bd988..a0df649263 100644
--- a/colorpicker/src/main/AndroidManifest.xml
+++ b/colorpicker/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.catrobat.paintroid.colorpicker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/colorpicker/src/main/java/org/catrobat/paintroid/colorpicker/ColorHistory.kt b/colorpicker/src/main/java/org/catrobat/paintroid/colorpicker/ColorHistory.kt
index d7202362d3..645f0538c9 100644
--- a/colorpicker/src/main/java/org/catrobat/paintroid/colorpicker/ColorHistory.kt
+++ b/colorpicker/src/main/java/org/catrobat/paintroid/colorpicker/ColorHistory.kt
@@ -16,7 +16,7 @@ class ColorHistory : Serializable {
         }
 
         if (colorHistory.size > COLOR_HISTORY_SIZE) {
-            colorHistory.removeFirst()
+            colorHistory.removeAt(0)
         }
     }
 }
diff --git a/docker/Dockerfile.jenkins b/docker/Dockerfile.jenkins
index 5435e5f0b4..ffa3cdd641 100644
--- a/docker/Dockerfile.jenkins
+++ b/docker/Dockerfile.jenkins
@@ -4,7 +4,7 @@ FROM debian:bullseye
 # Adapt the paramters below to change the dependencies.
 #
 
-ARG ANDROID_API_LEVEL=28
+ARG ANDROID_API_LEVEL=34
 ARG ANDROID_BUILD_TOOLS_LEVEL=30.0.3
 ARG ANDROID_NDK_VERSION=21.1.6352462
 ARG ANDROID_CLI_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip"
@@ -49,7 +49,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN apt-get update
 RUN apt-get install -y python2
 RUN apt-get install -y --no-install-recommends \
-        openjdk-11-jdk-headless \
+        openjdk-17-jdk-headless \
         #ruby-full \
         rubygems \
         ruby-dev \
diff --git a/gradle.properties b/gradle.properties
index 5e9758afa7..d3b6b36fc0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-XX:MaxPermSize=1024m -Xmx4096m
-android.disableAutomaticComponentCreation=true
\ No newline at end of file
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eb250c9aae..71dc7bceb6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+
diff --git a/settings.gradle b/settings.gradle
index ee2027bde3..d3768a63db 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,4 +17,25 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-include ':Paintroid', ':app', ':colorpicker'
+// settings.gradle (Groovy)
+
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
+    repositories {
+        google()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+rootProject.name = "Paintroid"
+
+include(":Paintroid", ":app", ":colorpicker")