diff --git a/common/src/main/res/drawable/ic_forward_30.xml b/common/src/main/res/drawable/ic_forward_30.xml
index 693fc5aa..64388edd 100644
--- a/common/src/main/res/drawable/ic_forward_30.xml
+++ b/common/src/main/res/drawable/ic_forward_30.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?android:attr/textColorPrimaryInverse"
+    android:tint="#FFFFFF"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/common/src/main/res/drawable/ic_replay_30.xml b/common/src/main/res/drawable/ic_replay_30.xml
index 122630a7..8899c28c 100644
--- a/common/src/main/res/drawable/ic_replay_30.xml
+++ b/common/src/main/res/drawable/ic_replay_30.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?android:attr/textColorPrimaryInverse"
+    android:tint="#FFFFFF"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/touch/src/main/AndroidManifest.xml b/touch/src/main/AndroidManifest.xml
index 92fd48ec..1aab941a 100644
--- a/touch/src/main/AndroidManifest.xml
+++ b/touch/src/main/AndroidManifest.xml
@@ -3,13 +3,11 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="de.nicidienase.chaosflix.touch"
           tools:ignore="MissingLeanbackLauncher">
-
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-
     <application
         android:name="de.nicidienase.chaosflix.ChaosflixApplication"
         android:allowBackup="true"
@@ -36,18 +34,15 @@
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
-
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable"/>
         </activity>
-
         <activity
             android:name=".playback.PlayerActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:launchMode="singleTop"
-            android:parentActivityName=".eventdetails.EventDetailsActivity"/>
-
+            android:parentActivityName=".NavigationActivity"/>
         <activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
         <activity android:name=".favoritesimport.FavoritesImportActivity" >
             <intent-filter>
@@ -56,7 +51,5 @@
                 <data android:mimeType="text/json" />
             </intent-filter>
         </activity>
-
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/touch/src/main/res/layout/activity_browse.xml b/touch/src/main/res/layout/activity_browse.xml
deleted file mode 100644
index e6f2b892..00000000
--- a/touch/src/main/res/layout/activity_browse.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<androidx.drawerlayout.widget.DrawerLayout
-		android:id="@+id/drawer_layout"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent">
-
-		<FrameLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:orientation="vertical">
-
-			<FrameLayout
-				android:id="@+id/fragment_container"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-		</FrameLayout>
-
-		<com.google.android.material.navigation.NavigationView
-			android:id="@+id/navigation_view"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:layout_gravity="start"
-			app:headerLayout="@layout/nav_header"
-			app:menu="@menu/navigation_menu"/>
-
-	</androidx.drawerlayout.widget.DrawerLayout>
-
-</layout>
\ No newline at end of file
diff --git a/touch/src/main/res/layout/activity_eventdetails.xml b/touch/src/main/res/layout/activity_eventdetails.xml
deleted file mode 100644
index e153dd33..00000000
--- a/touch/src/main/res/layout/activity_eventdetails.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			 android:id="@+id/fragment_container"
-			 android:layout_width="match_parent"
-			 android:layout_height="match_parent"/>
diff --git a/touch/src/main/res/layout/activity_events_list.xml b/touch/src/main/res/layout/activity_events_list.xml
deleted file mode 100644
index 6a54fb74..00000000
--- a/touch/src/main/res/layout/activity_events_list.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			 android:id="@+id/fragment_container"
-			 android:layout_width="match_parent"
-			 android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/touch/src/main/res/layout/activity_settings.xml b/touch/src/main/res/layout/activity_settings.xml
deleted file mode 100644
index fb0d82a4..00000000
--- a/touch/src/main/res/layout/activity_settings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        tools:context="de.nicidienase.chaosflix.touch.NavigationActivity">
-
-        <include
-            android:id="@+id/toolbar_inc"
-            layout="@layout/toolbar"/>
-
-        <FrameLayout
-            android:id="@+id/container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <fragment
-                android:id="@+id/fragment"
-                android:name="de.nicidienase.chaosflix.touch.settings.SettingsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-        </FrameLayout>
-    </LinearLayout>
-
-</layout>
-
diff --git a/touch/src/main/res/layout/nav_header.xml b/touch/src/main/res/layout/nav_header.xml
deleted file mode 100644
index 29f370af..00000000
--- a/touch/src/main/res/layout/nav_header.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			 xmlns:app="http://schemas.android.com/apk/res-auto"
-			 android:layout_width="match_parent"
-			 android:layout_height="150dp"
-			 android:background="@color/primary_dark">
-
-	<ImageView
-		android:id="@+id/imageView2"
-		android:layout_width="100dp"
-		android:layout_height="100dp"
-		android:layout_gravity="center"
-		app:srcCompat="@drawable/icon_primary_background"/>
-</FrameLayout>
\ No newline at end of file
diff --git a/touch/src/main/res/layout/toolbar.xml b/touch/src/main/res/layout/toolbar.xml
index 56054f2c..d6d8fae0 100644
--- a/touch/src/main/res/layout/toolbar.xml
+++ b/touch/src/main/res/layout/toolbar.xml
@@ -13,6 +13,6 @@
 			style="@style/ToolbarStyle"
 			app:layout_scrollFlags="scroll|enterAlways|snap"
 			tools:title="Title"
-			tools:showIn="@layout/activity_browse"/>
+			tools:showIn="@layout/activity_navigation"/>
 	</merge>
 </layout>