diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index a3035f0a12da..20e061c09e3a 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -1,8 +1,9 @@
+
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import java.io.FileInputStream
-import java.util.*
 import org.gradle.configurationcache.extensions.capitalized
+import java.io.FileInputStream
+import java.util.Properties
 
 plugins {
     id(Dependencies.Plugin.androidApplicationId)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/FilterFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/FilterFragment.kt
index f3a5d4a4a8cb..1403f7546820 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/FilterFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/FilterFragment.kt
@@ -22,8 +22,8 @@ class FilterFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_filter, container, false).apply {
-            findViewById<ComposeView>(R.id.filter_layout).setContent {
+        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
+            findViewById<ComposeView>(R.id.compose_view).setContent {
                 AppTheme {
                     val state = vm.uiState.collectAsState().value
                     FilterScreen(
diff --git a/android/app/src/main/res/layout/fragment_compose.xml b/android/app/src/main/res/layout/fragment_compose.xml
index 9d04d78cbdfc..7fc54a6cd22d 100644
--- a/android/app/src/main/res/layout/fragment_compose.xml
+++ b/android/app/src/main/res/layout/fragment_compose.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/select_location_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/android/app/src/main/res/layout/fragment_filter.xml b/android/app/src/main/res/layout/fragment_filter.xml
deleted file mode 100644
index 38259ef127c9..000000000000
--- a/android/app/src/main/res/layout/fragment_filter.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/filter_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/filter_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</FrameLayout>