diff --git a/screenshots/gplay/debug/com.nextcloud.client.ActivitiesActivityIT_openDrawer_dark_blue.png b/screenshots/gplay/debug/com.nextcloud.client.ActivitiesActivityIT_openDrawer_dark_blue.png
new file mode 100644
index 0000000000..b09144c337
Binary files /dev/null and b/screenshots/gplay/debug/com.nextcloud.client.ActivitiesActivityIT_openDrawer_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_drawer_dark_blue.png b/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_drawer_dark_blue.png
new file mode 100644
index 0000000000..7a45a98eaa
Binary files /dev/null and b/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_drawer_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_open_dark_blue.png b/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_open_dark_blue.png
new file mode 100644
index 0000000000..2b88632267
Binary files /dev/null and b/screenshots/gplay/debug/com.nextcloud.client.FileDisplayActivityScreenshotIT_open_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.nextcloud.client.FirstRunActivityIT_open_dark_blue.png b/screenshots/gplay/debug/com.nextcloud.client.FirstRunActivityIT_open_dark_blue.png
new file mode 100644
index 0000000000..7f795da694
Binary files /dev/null and b/screenshots/gplay/debug/com.nextcloud.client.FirstRunActivityIT_open_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.nextcloud.client.SettingsActivityIT_open_dark_blue.png b/screenshots/gplay/debug/com.nextcloud.client.SettingsActivityIT_open_dark_blue.png
new file mode 100644
index 0000000000..b3e3ddacdc
Binary files /dev/null and b/screenshots/gplay/debug/com.nextcloud.client.SettingsActivityIT_open_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.nextcloud.client.SyncedFoldersActivityIT_openDrawer_dark_blue.png b/screenshots/gplay/debug/com.nextcloud.client.SyncedFoldersActivityIT_openDrawer_dark_blue.png
new file mode 100644
index 0000000000..00eafce602
Binary files /dev/null and b/screenshots/gplay/debug/com.nextcloud.client.SyncedFoldersActivityIT_openDrawer_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog_dark_blue.png b/screenshots/gplay/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog_dark_blue.png
new file mode 100644
index 0000000000..05106d3dd2
Binary files /dev/null and b/screenshots/gplay/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.nextcloud.client.UploadListActivityActivityIT_openDrawer_dark_blue.png b/screenshots/gplay/debug/com.nextcloud.client.UploadListActivityActivityIT_openDrawer_dark_blue.png
new file mode 100644
index 0000000000..23c1cb7e94
Binary files /dev/null and b/screenshots/gplay/debug/com.nextcloud.client.UploadListActivityActivityIT_openDrawer_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepBoth_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepBoth_dark_blue.png
new file mode 100644
index 0000000000..3090a59237
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepBoth_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepExisting_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepExisting_dark_blue.png
new file mode 100644
index 0000000000..9daa42c55e
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepExisting_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepNew_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepNew_dark_blue.png
new file mode 100644
index 0000000000..b9472fa6f1
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepNew_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_screenshotTextFiles_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_screenshotTextFiles_dark_blue.png
new file mode 100644
index 0000000000..b6b59c7522
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_screenshotTextFiles_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.ContactsPreferenceActivityIT_openContactsPreference_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ContactsPreferenceActivityIT_openContactsPreference_dark_blue.png
new file mode 100644
index 0000000000..b8ff43524f
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ContactsPreferenceActivityIT_openContactsPreference_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.ContactsPreferenceActivityIT_openVCF_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ContactsPreferenceActivityIT_openVCF_dark_blue.png
new file mode 100644
index 0000000000..83a2d783f0
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ContactsPreferenceActivityIT_openVCF_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.ManageAccountsActivityIT_open_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ManageAccountsActivityIT_open_dark_blue.png
new file mode 100644
index 0000000000..f32835cdd9
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ManageAccountsActivityIT_open_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.ManageAccountsActivityIT_userInfoDetail_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ManageAccountsActivityIT_userInfoDetail_dark_blue.png
new file mode 100644
index 0000000000..a7253e3c6d
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.ManageAccountsActivityIT_userInfoDetail_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_empty_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_empty_dark_blue.png
new file mode 100644
index 0000000000..c294557310
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_empty_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_error_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_error_dark_blue.png
new file mode 100644
index 0000000000..b690249fe5
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_error_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_loading.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_loading.png
index 80376c9145..34ed66b992 100644
Binary files a/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_loading.png and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_loading.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_showNotifications_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_showNotifications_dark_blue.png
new file mode 100644
index 0000000000..6486b6e11a
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.activity.NotificationsActivityIT_showNotifications_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_dark_blue.png
new file mode 100644
index 0000000000..b8f8d989c0
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testAccountChooserDialog_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testLoadingDialog_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testLoadingDialog_dark_blue.png
new file mode 100644
index 0000000000..a05c4b43a6
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testLoadingDialog_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testNewFolderDialog_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testNewFolderDialog_dark_blue.png
new file mode 100644
index 0000000000..c8885e594f
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testNewFolderDialog_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFileDialog_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFileDialog_dark_blue.png
new file mode 100644
index 0000000000..996d430e17
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFileDialog_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFilesDialog_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFilesDialog_dark_blue.png
new file mode 100644
index 0000000000..5e81324e51
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFilesDialog_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFolderDialog_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFolderDialog_dark_blue.png
new file mode 100644
index 0000000000..2b7e033470
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFolderDialog_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFoldersDialog_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFoldersDialog_dark_blue.png
new file mode 100644
index 0000000000..5e81324e51
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFoldersDialog_dark_blue.png differ
diff --git a/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRenameFileDialog_dark_blue.png b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRenameFileDialog_dark_blue.png
new file mode 100644
index 0000000000..ccd0996304
Binary files /dev/null and b/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRenameFileDialog_dark_blue.png differ
diff --git a/scripts/androidScreenshotTest b/scripts/androidScreenshotTest
index f91b8e1cd6..f8d75467fd 100755
--- a/scripts/androidScreenshotTest
+++ b/scripts/androidScreenshotTest
@@ -4,7 +4,7 @@ if [ $# -lt 2 ]; then
     echo "1: record: true/false
 2: class name
 3: method name
-4: darkMode / \"all\" to run all screenshot combinations
+4: darkMode: dark/light / \"all\" to run all screenshot combinations
 5: color"
 
     exit
diff --git a/scripts/checkIfRunDrone.sh b/scripts/checkIfRunDrone.sh
index 7f61962349..a507614808 100755
--- a/scripts/checkIfRunDrone.sh
+++ b/scripts/checkIfRunDrone.sh
@@ -6,7 +6,7 @@ if [ -z $3 ] ; then
 fi
 
 export BRANCH=$(scripts/analysis/getBranchBase.sh $1 $2 $3 | sed s'/"//'g)
-if [ $(git diff --name-only origin/$BRANCH | grep -cE "^src|build.gradle") -eq 0 ] ; then
+if [ $(git diff --name-only origin/$BRANCH | grep -cE "^src|^screenshots|build.gradle") -eq 0 ] ; then
     echo "No source files changed"
     exit 1
 else
diff --git a/scripts/runAllScreenshotCombinations b/scripts/runAllScreenshotCombinations
index 01206011f8..716642148c 100755
--- a/scripts/runAllScreenshotCombinations
+++ b/scripts/runAllScreenshotCombinations
@@ -30,11 +30,11 @@ do
             exit
         fi
     else
-        ./gradlew gplayDebugExecuteScreenshotTests \
+        ./gradlew --console plain gplayDebugExecuteScreenshotTests \
         $record \
         -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest \
         -Pandroid.testInstrumentationRunnerArguments.COLOR="$color" \
-        -Pandroid.testInstrumentationRunnerArguments.DARKMODE="$darkMode" \
+        -Pandroid.testInstrumentationRunnerArguments.DARKMODE="$darkMode" </dev/null > /dev/null \
         && scripts/deleteOutdatedComments.sh "$1-$darkMode-$color" "Screenshot" "$DRONE_PULL_REQUEST" \
         "$GIT_USERNAME" "$GIT_TOKEN" \
         || scripts/uploadReport.sh "$LOG_USERNAME" "$LOG_PASSWORD" "$DRONE_BUILD_NUMBER" \
diff --git a/scripts/screenshotCombinations b/scripts/screenshotCombinations
index 1f697d792b..56da7945d8 100644
--- a/scripts/screenshotCombinations
+++ b/scripts/screenshotCombinations
@@ -1 +1,2 @@
 light blue
+dark blue
diff --git a/src/main/res/layout/notifications_layout.xml b/src/main/res/layout/notifications_layout.xml
index 9a633fd439..f895af0a43 100644
--- a/src/main/res/layout/notifications_layout.xml
+++ b/src/main/res/layout/notifications_layout.xml
@@ -57,6 +57,7 @@
                     android:scrollbarStyle="outsideOverlay"
                     android:scrollbars="vertical"
                     android:visibility="visible"
+                    android:background="@color/bg_default"
                     tools:listitem="@layout/notification_list_item" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -76,7 +77,7 @@
 
     <include
         layout="@layout/drawer"
-        android:layout_width="240dp"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"/>