diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 3e9f997d..79276238 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/app/src/test/resources/robolectric.properties" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gradle.properties" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 6fef0f41..1944d1ef 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="AndroidLintVectorPath" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintVectorPath" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="JavaDoc" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="TOP_LEVEL_CLASS_OPTIONS">
         <value>
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/livestream/ui/detail/ChannelDetailActivity.java b/app/src/main/java/de/christinecoenen/code/zapp/app/livestream/ui/detail/ChannelDetailActivity.java
index aaaefd0e..b03520ad 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/livestream/ui/detail/ChannelDetailActivity.java
+++ b/app/src/main/java/de/christinecoenen/code/zapp/app/livestream/ui/detail/ChannelDetailActivity.java
@@ -1,5 +1,6 @@
 package de.christinecoenen.code.zapp.app.livestream.ui.detail;
 
+import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -190,6 +191,7 @@ public class ChannelDetailActivity extends FullscreenActivity implements StreamP
 		}
 	}
 
+	@SuppressLint("SourceLockedOrientationActivity")
 	@Override
 	protected void onResume() {
 		super.onResume();
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/detail/MediathekDetailFragment.java b/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/detail/MediathekDetailFragment.java
index 49fcca0e..4057be29 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/detail/MediathekDetailFragment.java
+++ b/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/detail/MediathekDetailFragment.java
@@ -242,7 +242,7 @@ public class MediathekDetailFragment extends Fragment {
 			Toast.makeText(getContext(), R.string.error_mediathek_no_download_manager, Toast.LENGTH_LONG).show();
 		} else if (settingsRepository.getDownloadOverWifiOnly() && connectivityManager.isActiveNetworkMetered()) {
 			Snackbar snackbar = Snackbar
-				.make(Objects.requireNonNull(getView()), R.string.error_mediathek_download_over_wifi_only, Snackbar.LENGTH_LONG);
+				.make(requireView(), R.string.error_mediathek_download_over_wifi_only, Snackbar.LENGTH_LONG);
 			snackbar.setAction(R.string.activity_settings_title, v -> startActivity(SettingsActivity.getStartIntent(getContext())));
 			snackbar.show();
 		} else {
@@ -250,7 +250,7 @@ public class MediathekDetailFragment extends Fragment {
 
 			String infoString = getString(R.string.fragment_mediathek_download_started, show.getTitle());
 			Snackbar snackbar = Snackbar
-				.make(Objects.requireNonNull(getView()), infoString, Snackbar.LENGTH_LONG);
+				.make(requireView(), infoString, Snackbar.LENGTH_LONG);
 			snackbar.setAction(R.string.action_cancel, v -> downloadManager.remove(downloadId));
 			snackbar.show();
 		}
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/detail/MediathekPlayerActivity.java b/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/detail/MediathekPlayerActivity.java
index 3fce7e5a..c6e056d5 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/detail/MediathekPlayerActivity.java
+++ b/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/detail/MediathekPlayerActivity.java
@@ -1,5 +1,6 @@
 package de.christinecoenen.code.zapp.app.mediathek.ui.detail;
 
+import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -149,6 +150,7 @@ public class MediathekPlayerActivity extends AppCompatActivity implements
 		}
 	}
 
+	@SuppressLint("SourceLockedOrientationActivity")
 	@Override
 	protected void onResume() {
 		super.onResume();
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/ChannelSelectionHelpDialog.java b/app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/ChannelSelectionHelpDialog.java
index 95e4428c..73c6e626 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/ChannelSelectionHelpDialog.java
+++ b/app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/ChannelSelectionHelpDialog.java
@@ -18,7 +18,7 @@ public class ChannelSelectionHelpDialog extends DialogFragment {
 	@NonNull
 	@Override
 	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-		return new AlertDialog.Builder(Objects.requireNonNull(getActivity()))
+		return new AlertDialog.Builder(requireActivity())
 			.setTitle(R.string.activity_channel_selection_title)
 			.setMessage(R.string.activity_channel_selection_help_text)
 			.setPositiveButton(android.R.string.ok, null)
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/SettingsFragment.java b/app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/SettingsFragment.java
index 3cd240fa..561fd2fa 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/SettingsFragment.java
+++ b/app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/SettingsFragment.java
@@ -83,7 +83,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 		if (preference instanceof DeleteSearchQueriesPreference) {
 			DialogFragment dialogFragment = DeleteSearchQueriesPreferenceDialog.newInstance(preference.getKey());
 			dialogFragment.setTargetFragment(this, 0);
-			dialogFragment.show(Objects.requireNonNull(getFragmentManager()), null);
+			dialogFragment.show(Objects.requireNonNull(getParentFragmentManager()), null);
 			return;
 		}
 
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/utils/view/ClickableViewPager.java b/app/src/main/java/de/christinecoenen/code/zapp/utils/view/ClickableViewPager.java
index 0849d05b..852e1613 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/utils/view/ClickableViewPager.java
+++ b/app/src/main/java/de/christinecoenen/code/zapp/utils/view/ClickableViewPager.java
@@ -1,5 +1,6 @@
 package de.christinecoenen.code.zapp.utils.view;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
@@ -35,6 +36,7 @@ public class ClickableViewPager extends ViewPager {
 		});
 	}
 
+	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
 		gestureDetector.onTouchEvent(event);
diff --git a/app/src/main/res/color/navigation_view_text.xml b/app/src/main/res/color/navigation_view_text.xml
deleted file mode 100644
index a4834e38..00000000
--- a/app/src/main/res/color/navigation_view_text.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?android:attr/textColorPrimary" android:state_checked="true" />
-	<item android:color="?android:attr/textColorSecondary" />
-</selector>
diff --git a/app/src/main/res/color/primary_button_background_tint.xml b/app/src/main/res/color/primary_button_background_tint.xml
deleted file mode 100644
index 277bb91d..00000000
--- a/app/src/main/res/color/primary_button_background_tint.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?android:attr/colorPrimary" android:alpha="0.6" android:state_enabled="false" />
-	<item android:color="?android:attr/colorPrimary" />
-</selector>
diff --git a/app/src/main/res/color/primary_button_text.xml b/app/src/main/res/color/primary_button_text.xml
deleted file mode 100644
index 5124e5fc..00000000
--- a/app/src/main/res/color/primary_button_text.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/text_alwayslight_primary_disabled" android:state_enabled="false" />
-	<item android:color="@color/text_alwayslight_primary" />
-</selector>
diff --git a/app/src/main/res/drawable-night/channel_logo_rb.xml b/app/src/main/res/drawable-night/channel_logo_rb.xml
index 9d4abe90..8c08899a 100644
--- a/app/src/main/res/drawable-night/channel_logo_rb.xml
+++ b/app/src/main/res/drawable-night/channel_logo_rb.xml
@@ -1,8 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="494.014dp"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:width="494.014dp"
     android:height="248.032dp"
     android:viewportWidth="494.014"
-    android:viewportHeight="248.032">
+    android:viewportHeight="248.032"
+	tools:ignore="UnusedResources">
   <path
       android:pathData="M247.562,37.881c-18.338,0 -33.217,14.873 -33.217,33.227c0,16.282 11.711,29.819 27.17,32.67v-32.68h12.107v32.68c15.452,-2.851 27.162,-16.388 27.162,-32.67C280.784,52.754 265.91,37.881 247.562,37.881M247.562,25.777c25.037,0 45.33,20.298 45.33,45.329c0,25.035 -20.293,45.33 -45.33,45.33c-25.028,0 -45.322,-20.295 -45.322,-45.33C202.24,46.075 222.533,25.777 247.562,25.777"
       android:fillColor="#CC030C"/>
diff --git a/app/src/main/res/drawable-night/channel_logo_tagesschau24.xml b/app/src/main/res/drawable-night/channel_logo_tagesschau24.xml
index fdd0697a..43f2bfa3 100644
--- a/app/src/main/res/drawable-night/channel_logo_tagesschau24.xml
+++ b/app/src/main/res/drawable-night/channel_logo_tagesschau24.xml
@@ -1,11 +1,25 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:aapt="http://schemas.android.com/aapt"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:width="200dp" android:height="48dp" android:viewportWidth="301.1875" android:viewportHeight="72"
-	tools:keep="@drawable/channel_logo_tagesschau24">
-    <path android:pathData="M266.188 0c-19.33 0-35 15.67-35 35s15.67 35 35 35 35-15.67 35-35-15.67-35-35-35zm0 7c15.464 0 28 12.536 28 28s-12.536 28-28 28-28-12.536-28-28 12.536-28 28-28z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:endColor="#00ffffff" android:endX="250" android:endY="0" android:startColor="#ffffff" android:startX="220" android:startY="35" android:type="linear"/>
-        </aapt:attr>
-    </path>
-    <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M215.281 16.969c-6.077 0-11 4.938-11 11 0 6.098 4.923 11.063 11 11.063 6.075 0 11-4.964 11-11.063 0-6.062-4.925-11-11-11zm-77.906 1.562v30.031h5.25v-9.875c0-3.58 2.106-6.625 4.781-6.625 1.934 0 2.5 1.298 2.5 3.438v13.063h5.25V34.219c0-3.58-1.485-6.531-6.094-6.531-3.169 0-5.525 1.508-6.719 3.813l-0.094-0.031c0.288-1.193 0.375-2.922 0.375-4.156v-8.781h-5.25zm77.906 0.063c5.158 0 9.406 4.202 9.406 9.375 0 5.208-4.248 9.438-9.406 9.438s-9.406-4.23-9.406-9.438c0-5.173 4.248-9.375 9.406-9.375zM9.531 20.469l-3.093 0.875v6.781H2v2.438h4.438v12.281c0 4.239 1.197 6.063 5.313 6.063 1.276 0 2.711-0.159 3.781-0.406v-2.688c-0.823 0.247-1.877 0.375-2.906 0.375-2.428 0-3.094-0.931-3.094-4.594V30.563h6v-2.438h-6v-7.656zm210.219 0.937l-11.094 4v2.719l3.657-1.312v8.281l7.437-2.625V21.406zm35.75 0.875c-1.407 0-2.848 0.141-4.313 0.406-1.465 0.254-2.97 0.629-4.469 1.125v5.656c1.407-0.876 2.735-1.53 3.969-1.969 1.234-0.45 2.368-0.687 3.406-0.688 1.349 0 2.443 0.387 3.25 1.125 0.819 0.738 1.219 1.695 1.219 2.906 0 0.784-0.19 1.555-0.594 2.281-0.404 0.727-1.033 1.458-1.875 2.219l-9.438 8.344v4.875h18.781v-4.875h-11.375l5.531-4.844c2.33-2.041 3.836-3.664 4.563-4.875 0.727-1.222 1.094-2.562 1.094-3.969 0-2.433-0.844-4.327-2.563-5.688-1.707-1.361-4.097-2.031-7.188-2.031zm22.125 0.469l-10.344 15.406v5.719h11.438v4.688h6.312v-4.688h3.657v-4.844h-3.657V22.75h-7.406zm-167.437 4.938c-5.761 0-8.688 2.951-8.688 6.531 0 6.955 8.25 4.879 8.25 8.5 0 1.358-1.296 2.188-3.313 2.188-1.564 0-3.131-0.265-4.406-0.594l-0.125 4.313c1.317 0.206 2.8 0.375 4.281 0.375 5.597 0 9.125-2.717 9.125-6.75 0-6.625-8.375-5.167-8.375-8.5 0-1.276 0.974-2.094 3.031-2.094 1.276 0 2.629 0.202 3.781 0.531l0.157-4.157c-1.235-0.206-2.525-0.344-3.719-0.344zm58 0c-2.634 0-5.255 0.509-7.313 1.25l0.469 4.406c1.728-0.988 4.179-1.594 6.031-1.594 2.963 0 4 1.11 4 3.25v1.094c-6.955 0-11.813 2.603-11.813 7.5 0 3.292 2.14 5.406 5.844 5.406 3.045 0 5.544-1.602 6.531-3.906L172 45.125c-0.165 1.07-0.219 2.244-0.219 3.438h4.969c-0.082-1.687-0.125-3.604-0.125-5.25v-8.531c0-4.444-1.853-7.094-8.438-7.094zM27.469 27.75c-2.757 0-5.128 0.667-7.063 1.531L20.687 32c1.811-1.152 4.275-1.781 6.25-1.781 3.539 0 4.656 1.726 4.656 4.813v1.688c-7.983 0-12.438 2.97-12.438 7.25 0 3.251 2.343 4.969 5.594 4.969 3.498 0 6.137-2.095 7.125-4.688h0.094c-0.206 1.193-0.219 2.749-0.219 4.313h3.031c-0.082-1.811-0.063-4.109-0.063-6.125v-8.031c0-3.868-1.612-6.656-7.25-6.656zm22.375 0c-5.555 0-8.906 3.627-8.906 7.906 0 2.634 1.005 4.744 3.063 5.938-1.44 0.658-2.281 1.913-2.281 3.313 0 1.317 0.787 2.393 2.063 2.969-1.934 0.988-3.531 2.886-3.531 5.438 0 3.909 3.346 6 8.531 6 6.296 0 10.719-3.21 10.719-7.531 0-3.58-2.431-5.75-6.875-5.75h-3.969c-2.551 0-3.719-0.525-3.719-1.719 0-0.741 0.502-1.505 1.531-1.875 0.741 0.165 1.835 0.281 2.781 0.281 5.885 0 8.906-3.325 8.906-7.688 0-1.934-0.775-3.522-1.969-4.469h3.688v-2.438h-6.938c-1.07-0.247-1.942-0.375-3.094-0.375zm22.312 0c-5.679 0-8.969 4.587-8.969 10.719 0 7.16 3.296 10.469 9.469 10.469 2.551 0 4.857-0.437 6.75-1.219l-0.281-2.625c-1.523 0.782-3.798 1.313-5.938 1.313-4.568 0-6.987-2.556-6.781-8.688h13.656c0.082-0.617 0.094-1.161 0.094-1.531 0-4.527-2.362-8.438-8-8.438zm20.25 0c-5.185 0-7.969 2.584-7.969 6 0 7.284 9.938 4.218 9.938 9.156 0 2.14-2.037 3.438-5 3.438-1.605 0-3.277-0.286-4.594-0.656l-0.063 2.844c1.235 0.247 2.79 0.406 4.313 0.406 5.35 0 8.563-2.816 8.563-6.438 0-6.955-10-4.166-10-9.063 0-2.016 1.496-3.25 4.5-3.25 1.399 0 2.861 0.235 4.219 0.688l0.094-2.656c-1.276-0.247-2.724-0.469-4-0.469zm36.563 0c-7.243 0-10.563 4.903-10.563 11.281 0 6.955 3.54 9.906 9.219 9.906 2.181 0 4.195-0.403 5.594-0.938l-0.406-4.5c-1.111 0.576-2.632 0.875-4.031 0.875-3.498 0-4.875-2.377-4.875-5.875 0-3.868 1.698-6.344 5.031-6.344 1.317 0 2.608 0.338 3.719 0.75l0.531-4.563c-1.317-0.37-2.82-0.594-4.219-0.594zm53.406 0.375V42.5c0 3.58 1.485 6.531 6.094 6.531 3.374 0 5.703-1.697 6.938-4.125l0.063 0.063c-0.206 1.07-0.25 2.647-0.25 3.594h4.938V28.125h-5.281V38c0 3.58-2.044 6.625-4.719 6.625-1.975 0-2.563-1.266-2.563-3.406V28.125h-5.219zm96.344 0.094v10.812h-7.313l7.313-10.812zM72 30.094c3.127 0 5.02 2.144 4.938 5.313H66.563c0.494-3.21 2.557-5.313 5.438-5.313zm-22.969 0.062c0.21-0.017 0.435 0 0.656 0 3.374 0 5.375 1.864 5.375 5.156s-2.188 5.125-5.563 5.125c-3.457 0-5.469-1.792-5.469-5.125 0-2.816 1.853-4.906 5-5.156zM31.594 39v0.313c0 3.539-2.379 7.125-6 7.125-2.016 0-3.344-1.179-3.344-3.031 0-1.975 1.649-4.406 9.344-4.406zm139.781 0.531v0.5c0 2.469-1.782 4.938-4.375 4.938-1.523 0-2.406-0.871-2.406-2.188 0-1.646 1.226-3.25 6.781-3.25zM46.25 48.656c0.37 0.041 0.901 0.031 1.313 0.031h4.219c3.127 0 4.656 1.319 4.656 3.5 0 2.716-2.64 4.625-7.125 4.625-3.416 0-5.969-1.398-5.969-4.031 0-1.728 1.137-3.22 2.906-4.125z"/>
+	android:width="200dp"
+	android:height="48dp"
+	android:viewportWidth="301.1875"
+	android:viewportHeight="72"
+	tools:ignore="UnusedResources">
+	<path android:pathData="M266.188 0c-19.33 0-35 15.67-35 35s15.67 35 35 35 35-15.67 35-35-15.67-35-35-35zm0 7c15.464 0 28 12.536 28 28s-12.536 28-28 28-28-12.536-28-28 12.536-28 28-28z">
+		<aapt:attr name="android:fillColor">
+			<gradient
+				android:endColor="#00ffffff"
+				android:endX="250"
+				android:endY="0"
+				android:startColor="#ffffff"
+				android:startX="220"
+				android:startY="35"
+				android:type="linear" />
+		</aapt:attr>
+	</path>
+	<path
+		android:fillColor="#ffffff"
+		android:fillType="evenOdd"
+		android:pathData="M215.281 16.969c-6.077 0-11 4.938-11 11 0 6.098 4.923 11.063 11 11.063 6.075 0 11-4.964 11-11.063 0-6.062-4.925-11-11-11zm-77.906 1.562v30.031h5.25v-9.875c0-3.58 2.106-6.625 4.781-6.625 1.934 0 2.5 1.298 2.5 3.438v13.063h5.25V34.219c0-3.58-1.485-6.531-6.094-6.531-3.169 0-5.525 1.508-6.719 3.813l-0.094-0.031c0.288-1.193 0.375-2.922 0.375-4.156v-8.781h-5.25zm77.906 0.063c5.158 0 9.406 4.202 9.406 9.375 0 5.208-4.248 9.438-9.406 9.438s-9.406-4.23-9.406-9.438c0-5.173 4.248-9.375 9.406-9.375zM9.531 20.469l-3.093 0.875v6.781H2v2.438h4.438v12.281c0 4.239 1.197 6.063 5.313 6.063 1.276 0 2.711-0.159 3.781-0.406v-2.688c-0.823 0.247-1.877 0.375-2.906 0.375-2.428 0-3.094-0.931-3.094-4.594V30.563h6v-2.438h-6v-7.656zm210.219 0.937l-11.094 4v2.719l3.657-1.312v8.281l7.437-2.625V21.406zm35.75 0.875c-1.407 0-2.848 0.141-4.313 0.406-1.465 0.254-2.97 0.629-4.469 1.125v5.656c1.407-0.876 2.735-1.53 3.969-1.969 1.234-0.45 2.368-0.687 3.406-0.688 1.349 0 2.443 0.387 3.25 1.125 0.819 0.738 1.219 1.695 1.219 2.906 0 0.784-0.19 1.555-0.594 2.281-0.404 0.727-1.033 1.458-1.875 2.219l-9.438 8.344v4.875h18.781v-4.875h-11.375l5.531-4.844c2.33-2.041 3.836-3.664 4.563-4.875 0.727-1.222 1.094-2.562 1.094-3.969 0-2.433-0.844-4.327-2.563-5.688-1.707-1.361-4.097-2.031-7.188-2.031zm22.125 0.469l-10.344 15.406v5.719h11.438v4.688h6.312v-4.688h3.657v-4.844h-3.657V22.75h-7.406zm-167.437 4.938c-5.761 0-8.688 2.951-8.688 6.531 0 6.955 8.25 4.879 8.25 8.5 0 1.358-1.296 2.188-3.313 2.188-1.564 0-3.131-0.265-4.406-0.594l-0.125 4.313c1.317 0.206 2.8 0.375 4.281 0.375 5.597 0 9.125-2.717 9.125-6.75 0-6.625-8.375-5.167-8.375-8.5 0-1.276 0.974-2.094 3.031-2.094 1.276 0 2.629 0.202 3.781 0.531l0.157-4.157c-1.235-0.206-2.525-0.344-3.719-0.344zm58 0c-2.634 0-5.255 0.509-7.313 1.25l0.469 4.406c1.728-0.988 4.179-1.594 6.031-1.594 2.963 0 4 1.11 4 3.25v1.094c-6.955 0-11.813 2.603-11.813 7.5 0 3.292 2.14 5.406 5.844 5.406 3.045 0 5.544-1.602 6.531-3.906L172 45.125c-0.165 1.07-0.219 2.244-0.219 3.438h4.969c-0.082-1.687-0.125-3.604-0.125-5.25v-8.531c0-4.444-1.853-7.094-8.438-7.094zM27.469 27.75c-2.757 0-5.128 0.667-7.063 1.531L20.687 32c1.811-1.152 4.275-1.781 6.25-1.781 3.539 0 4.656 1.726 4.656 4.813v1.688c-7.983 0-12.438 2.97-12.438 7.25 0 3.251 2.343 4.969 5.594 4.969 3.498 0 6.137-2.095 7.125-4.688h0.094c-0.206 1.193-0.219 2.749-0.219 4.313h3.031c-0.082-1.811-0.063-4.109-0.063-6.125v-8.031c0-3.868-1.612-6.656-7.25-6.656zm22.375 0c-5.555 0-8.906 3.627-8.906 7.906 0 2.634 1.005 4.744 3.063 5.938-1.44 0.658-2.281 1.913-2.281 3.313 0 1.317 0.787 2.393 2.063 2.969-1.934 0.988-3.531 2.886-3.531 5.438 0 3.909 3.346 6 8.531 6 6.296 0 10.719-3.21 10.719-7.531 0-3.58-2.431-5.75-6.875-5.75h-3.969c-2.551 0-3.719-0.525-3.719-1.719 0-0.741 0.502-1.505 1.531-1.875 0.741 0.165 1.835 0.281 2.781 0.281 5.885 0 8.906-3.325 8.906-7.688 0-1.934-0.775-3.522-1.969-4.469h3.688v-2.438h-6.938c-1.07-0.247-1.942-0.375-3.094-0.375zm22.312 0c-5.679 0-8.969 4.587-8.969 10.719 0 7.16 3.296 10.469 9.469 10.469 2.551 0 4.857-0.437 6.75-1.219l-0.281-2.625c-1.523 0.782-3.798 1.313-5.938 1.313-4.568 0-6.987-2.556-6.781-8.688h13.656c0.082-0.617 0.094-1.161 0.094-1.531 0-4.527-2.362-8.438-8-8.438zm20.25 0c-5.185 0-7.969 2.584-7.969 6 0 7.284 9.938 4.218 9.938 9.156 0 2.14-2.037 3.438-5 3.438-1.605 0-3.277-0.286-4.594-0.656l-0.063 2.844c1.235 0.247 2.79 0.406 4.313 0.406 5.35 0 8.563-2.816 8.563-6.438 0-6.955-10-4.166-10-9.063 0-2.016 1.496-3.25 4.5-3.25 1.399 0 2.861 0.235 4.219 0.688l0.094-2.656c-1.276-0.247-2.724-0.469-4-0.469zm36.563 0c-7.243 0-10.563 4.903-10.563 11.281 0 6.955 3.54 9.906 9.219 9.906 2.181 0 4.195-0.403 5.594-0.938l-0.406-4.5c-1.111 0.576-2.632 0.875-4.031 0.875-3.498 0-4.875-2.377-4.875-5.875 0-3.868 1.698-6.344 5.031-6.344 1.317 0 2.608 0.338 3.719 0.75l0.531-4.563c-1.317-0.37-2.82-0.594-4.219-0.594zm53.406 0.375V42.5c0 3.58 1.485 6.531 6.094 6.531 3.374 0 5.703-1.697 6.938-4.125l0.063 0.063c-0.206 1.07-0.25 2.647-0.25 3.594h4.938V28.125h-5.281V38c0 3.58-2.044 6.625-4.719 6.625-1.975 0-2.563-1.266-2.563-3.406V28.125h-5.219zm96.344 0.094v10.812h-7.313l7.313-10.812zM72 30.094c3.127 0 5.02 2.144 4.938 5.313H66.563c0.494-3.21 2.557-5.313 5.438-5.313zm-22.969 0.062c0.21-0.017 0.435 0 0.656 0 3.374 0 5.375 1.864 5.375 5.156s-2.188 5.125-5.563 5.125c-3.457 0-5.469-1.792-5.469-5.125 0-2.816 1.853-4.906 5-5.156zM31.594 39v0.313c0 3.539-2.379 7.125-6 7.125-2.016 0-3.344-1.179-3.344-3.031 0-1.975 1.649-4.406 9.344-4.406zm139.781 0.531v0.5c0 2.469-1.782 4.938-4.375 4.938-1.523 0-2.406-0.871-2.406-2.188 0-1.646 1.226-3.25 6.781-3.25zM46.25 48.656c0.37 0.041 0.901 0.031 1.313 0.031h4.219c3.127 0 4.656 1.319 4.656 3.5 0 2.716-2.64 4.625-7.125 4.625-3.416 0-5.969-1.398-5.969-4.031 0-1.728 1.137-3.22 2.906-4.125z" />
 </vector>
diff --git a/app/src/main/res/drawable/channel_logo_rb.xml b/app/src/main/res/drawable/channel_logo_rb.xml
index 9e834503..62b7297e 100644
--- a/app/src/main/res/drawable/channel_logo_rb.xml
+++ b/app/src/main/res/drawable/channel_logo_rb.xml
@@ -1,8 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="494.014dp"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:width="494.014dp"
     android:height="248.032dp"
     android:viewportWidth="494.014"
-    android:viewportHeight="248.032">
+    android:viewportHeight="248.032"
+	tools:ignore="UnusedResources">
   <path
       android:pathData="M247.562,37.881c-18.338,0 -33.217,14.873 -33.217,33.227c0,16.282 11.711,29.819 27.17,32.67v-32.68h12.107v32.68c15.452,-2.851 27.162,-16.388 27.162,-32.67C280.784,52.754 265.91,37.881 247.562,37.881M247.562,25.777c25.037,0 45.33,20.298 45.33,45.329c0,25.035 -20.293,45.33 -45.33,45.33c-25.028,0 -45.322,-20.295 -45.322,-45.33C202.24,46.075 222.533,25.777 247.562,25.777"
       android:fillColor="#CC030C"/>
diff --git a/app/src/main/res/drawable/channel_logo_tagesschau24.xml b/app/src/main/res/drawable/channel_logo_tagesschau24.xml
index c08333ed..10769363 100644
--- a/app/src/main/res/drawable/channel_logo_tagesschau24.xml
+++ b/app/src/main/res/drawable/channel_logo_tagesschau24.xml
@@ -1,11 +1,25 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:aapt="http://schemas.android.com/aapt"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:width="200dp" android:height="48dp" android:viewportWidth="301.1875" android:viewportHeight="72"
-	tools:keep="@drawable/channel_logo_tagesschau24">
-    <path android:pathData="M266.188 0c-19.33 0-35 15.67-35 35s15.67 35 35 35 35-15.67 35-35-15.67-35-35-35zm0 7c15.464 0 28 12.536 28 28s-12.536 28-28 28-28-12.536-28-28 12.536-28 28-28z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:endColor="#00001a4b" android:endX="250" android:endY="0" android:startColor="#001a4b" android:startX="220" android:startY="35" android:type="linear"/>
-        </aapt:attr>
-    </path>
-    <path android:fillColor="#001a4b" android:fillType="evenOdd" android:pathData="M215.281 16.969c-6.077 0-11 4.938-11 11 0 6.098 4.923 11.063 11 11.063 6.075 0 11-4.964 11-11.063 0-6.062-4.925-11-11-11zm-77.906 1.562v30.031h5.25v-9.875c0-3.58 2.106-6.625 4.781-6.625 1.934 0 2.5 1.298 2.5 3.438v13.063h5.25V34.219c0-3.58-1.485-6.531-6.094-6.531-3.169 0-5.525 1.508-6.719 3.813l-0.094-0.031c0.288-1.193 0.375-2.922 0.375-4.156v-8.781h-5.25zm77.906 0.063c5.158 0 9.406 4.202 9.406 9.375 0 5.208-4.248 9.438-9.406 9.438s-9.406-4.23-9.406-9.438c0-5.173 4.248-9.375 9.406-9.375zM9.531 20.469l-3.093 0.875v6.781H2v2.438h4.438v12.281c0 4.239 1.197 6.063 5.313 6.063 1.276 0 2.711-0.159 3.781-0.406v-2.688c-0.823 0.247-1.877 0.375-2.906 0.375-2.428 0-3.094-0.931-3.094-4.594V30.563h6v-2.438h-6v-7.656zm210.219 0.937l-11.094 4v2.719l3.657-1.312v8.281l7.437-2.625V21.406zm35.75 0.875c-1.407 0-2.848 0.141-4.313 0.406-1.465 0.254-2.97 0.629-4.469 1.125v5.656c1.407-0.876 2.735-1.53 3.969-1.969 1.234-0.45 2.368-0.687 3.406-0.688 1.349 0 2.443 0.387 3.25 1.125 0.819 0.738 1.219 1.695 1.219 2.906 0 0.784-0.19 1.555-0.594 2.281-0.404 0.727-1.033 1.458-1.875 2.219l-9.438 8.344v4.875h18.781v-4.875h-11.375l5.531-4.844c2.33-2.041 3.836-3.664 4.563-4.875 0.727-1.222 1.094-2.562 1.094-3.969 0-2.433-0.844-4.327-2.563-5.688-1.707-1.361-4.097-2.031-7.188-2.031zm22.125 0.469l-10.344 15.406v5.719h11.438v4.688h6.312v-4.688h3.657v-4.844h-3.657V22.75h-7.406zm-167.437 4.938c-5.761 0-8.688 2.951-8.688 6.531 0 6.955 8.25 4.879 8.25 8.5 0 1.358-1.296 2.188-3.313 2.188-1.564 0-3.131-0.265-4.406-0.594l-0.125 4.313c1.317 0.206 2.8 0.375 4.281 0.375 5.597 0 9.125-2.717 9.125-6.75 0-6.625-8.375-5.167-8.375-8.5 0-1.276 0.974-2.094 3.031-2.094 1.276 0 2.629 0.202 3.781 0.531l0.157-4.157c-1.235-0.206-2.525-0.344-3.719-0.344zm58 0c-2.634 0-5.255 0.509-7.313 1.25l0.469 4.406c1.728-0.988 4.179-1.594 6.031-1.594 2.963 0 4 1.11 4 3.25v1.094c-6.955 0-11.813 2.603-11.813 7.5 0 3.292 2.14 5.406 5.844 5.406 3.045 0 5.544-1.602 6.531-3.906L172 45.125c-0.165 1.07-0.219 2.244-0.219 3.438h4.969c-0.082-1.687-0.125-3.604-0.125-5.25v-8.531c0-4.444-1.853-7.094-8.438-7.094zM27.469 27.75c-2.757 0-5.128 0.667-7.063 1.531L20.687 32c1.811-1.152 4.275-1.781 6.25-1.781 3.539 0 4.656 1.726 4.656 4.813v1.688c-7.983 0-12.438 2.97-12.438 7.25 0 3.251 2.343 4.969 5.594 4.969 3.498 0 6.137-2.095 7.125-4.688h0.094c-0.206 1.193-0.219 2.749-0.219 4.313h3.031c-0.082-1.811-0.063-4.109-0.063-6.125v-8.031c0-3.868-1.612-6.656-7.25-6.656zm22.375 0c-5.555 0-8.906 3.627-8.906 7.906 0 2.634 1.005 4.744 3.063 5.938-1.44 0.658-2.281 1.913-2.281 3.313 0 1.317 0.787 2.393 2.063 2.969-1.934 0.988-3.531 2.886-3.531 5.438 0 3.909 3.346 6 8.531 6 6.296 0 10.719-3.21 10.719-7.531 0-3.58-2.431-5.75-6.875-5.75h-3.969c-2.551 0-3.719-0.525-3.719-1.719 0-0.741 0.502-1.505 1.531-1.875 0.741 0.165 1.835 0.281 2.781 0.281 5.885 0 8.906-3.325 8.906-7.688 0-1.934-0.775-3.522-1.969-4.469h3.688v-2.438h-6.938c-1.07-0.247-1.942-0.375-3.094-0.375zm22.312 0c-5.679 0-8.969 4.587-8.969 10.719 0 7.16 3.296 10.469 9.469 10.469 2.551 0 4.857-0.437 6.75-1.219l-0.281-2.625c-1.523 0.782-3.798 1.313-5.938 1.313-4.568 0-6.987-2.556-6.781-8.688h13.656c0.082-0.617 0.094-1.161 0.094-1.531 0-4.527-2.362-8.438-8-8.438zm20.25 0c-5.185 0-7.969 2.584-7.969 6 0 7.284 9.938 4.218 9.938 9.156 0 2.14-2.037 3.438-5 3.438-1.605 0-3.277-0.286-4.594-0.656l-0.063 2.844c1.235 0.247 2.79 0.406 4.313 0.406 5.35 0 8.563-2.816 8.563-6.438 0-6.955-10-4.166-10-9.063 0-2.016 1.496-3.25 4.5-3.25 1.399 0 2.861 0.235 4.219 0.688l0.094-2.656c-1.276-0.247-2.724-0.469-4-0.469zm36.563 0c-7.243 0-10.563 4.903-10.563 11.281 0 6.955 3.54 9.906 9.219 9.906 2.181 0 4.195-0.403 5.594-0.938l-0.406-4.5c-1.111 0.576-2.632 0.875-4.031 0.875-3.498 0-4.875-2.377-4.875-5.875 0-3.868 1.698-6.344 5.031-6.344 1.317 0 2.608 0.338 3.719 0.75l0.531-4.563c-1.317-0.37-2.82-0.594-4.219-0.594zm53.406 0.375V42.5c0 3.58 1.485 6.531 6.094 6.531 3.374 0 5.703-1.697 6.938-4.125l0.063 0.063c-0.206 1.07-0.25 2.647-0.25 3.594h4.938V28.125h-5.281V38c0 3.58-2.044 6.625-4.719 6.625-1.975 0-2.563-1.266-2.563-3.406V28.125h-5.219zm96.344 0.094v10.812h-7.313l7.313-10.812zM72 30.094c3.127 0 5.02 2.144 4.938 5.313H66.563c0.494-3.21 2.557-5.313 5.438-5.313zm-22.969 0.062c0.21-0.017 0.435 0 0.656 0 3.374 0 5.375 1.864 5.375 5.156s-2.188 5.125-5.563 5.125c-3.457 0-5.469-1.792-5.469-5.125 0-2.816 1.853-4.906 5-5.156zM31.594 39v0.313c0 3.539-2.379 7.125-6 7.125-2.016 0-3.344-1.179-3.344-3.031 0-1.975 1.649-4.406 9.344-4.406zm139.781 0.531v0.5c0 2.469-1.782 4.938-4.375 4.938-1.523 0-2.406-0.871-2.406-2.188 0-1.646 1.226-3.25 6.781-3.25zM46.25 48.656c0.37 0.041 0.901 0.031 1.313 0.031h4.219c3.127 0 4.656 1.319 4.656 3.5 0 2.716-2.64 4.625-7.125 4.625-3.416 0-5.969-1.398-5.969-4.031 0-1.728 1.137-3.22 2.906-4.125z"/>
+	android:width="200dp"
+	android:height="48dp"
+	android:viewportWidth="301.1875"
+	android:viewportHeight="72"
+	tools:ignore="UnusedResources">
+	<path android:pathData="M266.188 0c-19.33 0-35 15.67-35 35s15.67 35 35 35 35-15.67 35-35-15.67-35-35-35zm0 7c15.464 0 28 12.536 28 28s-12.536 28-28 28-28-12.536-28-28 12.536-28 28-28z">
+		<aapt:attr name="android:fillColor">
+			<gradient
+				android:endColor="#00001a4b"
+				android:endX="250"
+				android:endY="0"
+				android:startColor="#001a4b"
+				android:startX="220"
+				android:startY="35"
+				android:type="linear" />
+		</aapt:attr>
+	</path>
+	<path
+		android:fillColor="#001a4b"
+		android:fillType="evenOdd"
+		android:pathData="M215.281 16.969c-6.077 0-11 4.938-11 11 0 6.098 4.923 11.063 11 11.063 6.075 0 11-4.964 11-11.063 0-6.062-4.925-11-11-11zm-77.906 1.562v30.031h5.25v-9.875c0-3.58 2.106-6.625 4.781-6.625 1.934 0 2.5 1.298 2.5 3.438v13.063h5.25V34.219c0-3.58-1.485-6.531-6.094-6.531-3.169 0-5.525 1.508-6.719 3.813l-0.094-0.031c0.288-1.193 0.375-2.922 0.375-4.156v-8.781h-5.25zm77.906 0.063c5.158 0 9.406 4.202 9.406 9.375 0 5.208-4.248 9.438-9.406 9.438s-9.406-4.23-9.406-9.438c0-5.173 4.248-9.375 9.406-9.375zM9.531 20.469l-3.093 0.875v6.781H2v2.438h4.438v12.281c0 4.239 1.197 6.063 5.313 6.063 1.276 0 2.711-0.159 3.781-0.406v-2.688c-0.823 0.247-1.877 0.375-2.906 0.375-2.428 0-3.094-0.931-3.094-4.594V30.563h6v-2.438h-6v-7.656zm210.219 0.937l-11.094 4v2.719l3.657-1.312v8.281l7.437-2.625V21.406zm35.75 0.875c-1.407 0-2.848 0.141-4.313 0.406-1.465 0.254-2.97 0.629-4.469 1.125v5.656c1.407-0.876 2.735-1.53 3.969-1.969 1.234-0.45 2.368-0.687 3.406-0.688 1.349 0 2.443 0.387 3.25 1.125 0.819 0.738 1.219 1.695 1.219 2.906 0 0.784-0.19 1.555-0.594 2.281-0.404 0.727-1.033 1.458-1.875 2.219l-9.438 8.344v4.875h18.781v-4.875h-11.375l5.531-4.844c2.33-2.041 3.836-3.664 4.563-4.875 0.727-1.222 1.094-2.562 1.094-3.969 0-2.433-0.844-4.327-2.563-5.688-1.707-1.361-4.097-2.031-7.188-2.031zm22.125 0.469l-10.344 15.406v5.719h11.438v4.688h6.312v-4.688h3.657v-4.844h-3.657V22.75h-7.406zm-167.437 4.938c-5.761 0-8.688 2.951-8.688 6.531 0 6.955 8.25 4.879 8.25 8.5 0 1.358-1.296 2.188-3.313 2.188-1.564 0-3.131-0.265-4.406-0.594l-0.125 4.313c1.317 0.206 2.8 0.375 4.281 0.375 5.597 0 9.125-2.717 9.125-6.75 0-6.625-8.375-5.167-8.375-8.5 0-1.276 0.974-2.094 3.031-2.094 1.276 0 2.629 0.202 3.781 0.531l0.157-4.157c-1.235-0.206-2.525-0.344-3.719-0.344zm58 0c-2.634 0-5.255 0.509-7.313 1.25l0.469 4.406c1.728-0.988 4.179-1.594 6.031-1.594 2.963 0 4 1.11 4 3.25v1.094c-6.955 0-11.813 2.603-11.813 7.5 0 3.292 2.14 5.406 5.844 5.406 3.045 0 5.544-1.602 6.531-3.906L172 45.125c-0.165 1.07-0.219 2.244-0.219 3.438h4.969c-0.082-1.687-0.125-3.604-0.125-5.25v-8.531c0-4.444-1.853-7.094-8.438-7.094zM27.469 27.75c-2.757 0-5.128 0.667-7.063 1.531L20.687 32c1.811-1.152 4.275-1.781 6.25-1.781 3.539 0 4.656 1.726 4.656 4.813v1.688c-7.983 0-12.438 2.97-12.438 7.25 0 3.251 2.343 4.969 5.594 4.969 3.498 0 6.137-2.095 7.125-4.688h0.094c-0.206 1.193-0.219 2.749-0.219 4.313h3.031c-0.082-1.811-0.063-4.109-0.063-6.125v-8.031c0-3.868-1.612-6.656-7.25-6.656zm22.375 0c-5.555 0-8.906 3.627-8.906 7.906 0 2.634 1.005 4.744 3.063 5.938-1.44 0.658-2.281 1.913-2.281 3.313 0 1.317 0.787 2.393 2.063 2.969-1.934 0.988-3.531 2.886-3.531 5.438 0 3.909 3.346 6 8.531 6 6.296 0 10.719-3.21 10.719-7.531 0-3.58-2.431-5.75-6.875-5.75h-3.969c-2.551 0-3.719-0.525-3.719-1.719 0-0.741 0.502-1.505 1.531-1.875 0.741 0.165 1.835 0.281 2.781 0.281 5.885 0 8.906-3.325 8.906-7.688 0-1.934-0.775-3.522-1.969-4.469h3.688v-2.438h-6.938c-1.07-0.247-1.942-0.375-3.094-0.375zm22.312 0c-5.679 0-8.969 4.587-8.969 10.719 0 7.16 3.296 10.469 9.469 10.469 2.551 0 4.857-0.437 6.75-1.219l-0.281-2.625c-1.523 0.782-3.798 1.313-5.938 1.313-4.568 0-6.987-2.556-6.781-8.688h13.656c0.082-0.617 0.094-1.161 0.094-1.531 0-4.527-2.362-8.438-8-8.438zm20.25 0c-5.185 0-7.969 2.584-7.969 6 0 7.284 9.938 4.218 9.938 9.156 0 2.14-2.037 3.438-5 3.438-1.605 0-3.277-0.286-4.594-0.656l-0.063 2.844c1.235 0.247 2.79 0.406 4.313 0.406 5.35 0 8.563-2.816 8.563-6.438 0-6.955-10-4.166-10-9.063 0-2.016 1.496-3.25 4.5-3.25 1.399 0 2.861 0.235 4.219 0.688l0.094-2.656c-1.276-0.247-2.724-0.469-4-0.469zm36.563 0c-7.243 0-10.563 4.903-10.563 11.281 0 6.955 3.54 9.906 9.219 9.906 2.181 0 4.195-0.403 5.594-0.938l-0.406-4.5c-1.111 0.576-2.632 0.875-4.031 0.875-3.498 0-4.875-2.377-4.875-5.875 0-3.868 1.698-6.344 5.031-6.344 1.317 0 2.608 0.338 3.719 0.75l0.531-4.563c-1.317-0.37-2.82-0.594-4.219-0.594zm53.406 0.375V42.5c0 3.58 1.485 6.531 6.094 6.531 3.374 0 5.703-1.697 6.938-4.125l0.063 0.063c-0.206 1.07-0.25 2.647-0.25 3.594h4.938V28.125h-5.281V38c0 3.58-2.044 6.625-4.719 6.625-1.975 0-2.563-1.266-2.563-3.406V28.125h-5.219zm96.344 0.094v10.812h-7.313l7.313-10.812zM72 30.094c3.127 0 5.02 2.144 4.938 5.313H66.563c0.494-3.21 2.557-5.313 5.438-5.313zm-22.969 0.062c0.21-0.017 0.435 0 0.656 0 3.374 0 5.375 1.864 5.375 5.156s-2.188 5.125-5.563 5.125c-3.457 0-5.469-1.792-5.469-5.125 0-2.816 1.853-4.906 5-5.156zM31.594 39v0.313c0 3.539-2.379 7.125-6 7.125-2.016 0-3.344-1.179-3.344-3.031 0-1.975 1.649-4.406 9.344-4.406zm139.781 0.531v0.5c0 2.469-1.782 4.938-4.375 4.938-1.523 0-2.406-0.871-2.406-2.188 0-1.646 1.226-3.25 6.781-3.25zM46.25 48.656c0.37 0.041 0.901 0.031 1.313 0.031h4.219c3.127 0 4.656 1.319 4.656 3.5 0 2.716-2.64 4.625-7.125 4.625-3.416 0-5.969-1.398-5.969-4.031 0-1.728 1.137-3.22 2.906-4.125z" />
 </vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 7353dbd1..00000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index d2d63be8..602473bf 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -7,6 +7,4 @@
 	<color name="colorBackground">#212121</color>
 
 	<color name="black_overlay">#66000000</color>
-
-	<color name="text_alwayslight_primary_disabled">#B8B8B8</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 61336bfc..e6d7a5c3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,5 +11,4 @@
 	<color name="text_alwayslight_primary">#ffffff</color>
 	<color name="text_alwayslight_secondary">#CBFFFFFF</color>
 	<color name="text_alwayslight_tertiary">#ACFFFFFF</color>
-	<color name="text_alwayslight_primary_disabled">#ffffff</color>
 </resources>
diff --git a/app/src/test/resources/robolectric.properties b/app/src/test/resources/robolectric.properties
index a62ed5b7..9b6a9f68 100644
--- a/app/src/test/resources/robolectric.properties
+++ b/app/src/test/resources/robolectric.properties
@@ -1,3 +1,4 @@
 # to use java 8 instead of 9
 # see: https://stackoverflow.com/questions/56821193/does-robolectric-require-java-9
-sdk=28
\ No newline at end of file
+# suppress inspection "UnusedProperty"
+sdk=28