diff --git a/drawable_resources/icon-android-with-dev-as-layer.svg b/drawable_resources/icon-android-with-dev-as-layer.svg
deleted file mode 100644
index 4f8879d3ec..0000000000
--- a/drawable_resources/icon-android-with-dev-as-layer.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
diff --git a/drawable_resources/icon-background.png b/drawable_resources/icon-background.png
deleted file mode 100644
index c4cc8d7ac1..0000000000
Binary files a/drawable_resources/icon-background.png and /dev/null differ
diff --git a/drawable_resources/icon-background.svg b/drawable_resources/icon-background.svg
index 3ed4da8724..fc99ed29e9 100644
--- a/drawable_resources/icon-background.svg
+++ b/drawable_resources/icon-background.svg
@@ -1,308 +1,4 @@
-
-
-
+
diff --git a/drawable_resources/logo_dev.svg b/drawable_resources/logo_dev.svg
index 838e127b78..e4d64be47e 100644
--- a/drawable_resources/logo_dev.svg
+++ b/drawable_resources/logo_dev.svg
@@ -1,24 +1,15 @@
-
+ id="path817" inkscape:connector-curvature="0" />
diff --git a/src/main/ic_launcher-web.png b/src/main/ic_launcher-web.png
index 460ce7a7b3..dc58ff797a 100644
Binary files a/src/main/ic_launcher-web.png and b/src/main/ic_launcher-web.png differ
diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index d838b29084..b8b4ccde18 100644
--- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -1150,7 +1150,7 @@ public abstract class DrawerActivity extends ToolbarActivity
} else if (backgroundDefault.isTrue() && backgroundPlain.isFalse()) {
// use nc13 background image with themed color
Drawable[] drawables = {new ColorDrawable(primaryColor),
- getResources().getDrawable(R.drawable.background_nc13)};
+ getResources().getDrawable(R.drawable.background)};
LayerDrawable layerDrawable = new LayerDrawable(drawables);
setNavigationHeaderBackground(layerDrawable, navigationHeader);
} else {
@@ -1175,8 +1175,8 @@ public abstract class DrawerActivity extends ToolbarActivity
int backgroundResource;
OwnCloudVersion ownCloudVersion = accountManager.getServerVersion(getAccount());
- if (ownCloudVersion.compareTo(OwnCloudVersion.nextcloud_13) >= 0) {
- backgroundResource = R.drawable.background_nc13;
+ if (ownCloudVersion.compareTo(OwnCloudVersion.nextcloud_18) >= 0) {
+ backgroundResource = R.drawable.background_nc18;
} else {
backgroundResource = R.drawable.background;
}
diff --git a/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java b/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java
index db5e18e2e7..833c9176bd 100644
--- a/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java
@@ -26,7 +26,6 @@
package com.owncloud.android.ui.activity;
import android.accounts.Account;
-import androidx.appcompat.app.AlertDialog;
import android.app.Dialog;
import android.graphics.PorterDuff;
import android.graphics.drawable.ColorDrawable;
@@ -79,6 +78,7 @@ import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
diff --git a/src/main/res/drawable-v24/ic_launcher_background.xml b/src/main/res/drawable-v24/ic_launcher_background.xml
new file mode 100644
index 0000000000..c1ee647893
--- /dev/null
+++ b/src/main/res/drawable-v24/ic_launcher_background.xml
@@ -0,0 +1,27 @@
+
+
+
+
+