diff --git a/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt b/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
index 2b9cb2d4..9346edcd 100644
--- a/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.PowerManager
 import android.view.Menu
-import android.view.MenuItem
 import android.view.inputmethod.InputMethodManager
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -13,11 +12,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.navigateUp
-import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.google.android.material.appbar.MaterialToolbar
 import com.looker.droidify.BuildConfig
 import com.looker.droidify.ContextWrapperX
 import com.looker.droidify.MainApplication
@@ -30,7 +25,6 @@ import com.looker.droidify.service.SyncService
 import com.looker.droidify.ui.fragments.MainNavFragmentX
 import com.looker.droidify.ui.fragments.Source
 import com.looker.droidify.ui.viewmodels.MainActivityViewModelX
-import com.looker.droidify.utility.extension.android.Android
 import com.looker.droidify.utility.extension.text.nullIfEmpty
 import com.looker.droidify.utility.showBatteryOptimizationDialog
 import kotlinx.coroutines.launch
@@ -50,8 +44,6 @@ class MainActivityX : AppCompatActivity() {
     }
 
     lateinit var binding: ActivityMainXBinding
-    lateinit var toolbar: MaterialToolbar
-    lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var navController: NavController
     private val viewModel: MainActivityViewModelX by viewModels()
     private lateinit var powerManager: PowerManager
@@ -83,19 +75,12 @@ class MainActivityX : AppCompatActivity() {
 
         setContentView(binding.root)
         binding.lifecycleOwner = this
-        toolbar = binding.toolbar
-
-        setSupportActionBar(toolbar)
 
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.fragment_content) as NavHostFragment
         navController = navHostFragment.navController
         binding.bottomNavigation.setupWithNavController(navController)
 
-        appBarConfiguration = AppBarConfiguration(
-            setOf(R.id.exploreTab, R.id.latestTab, R.id.installedTab)
-        )
-        setupActionBarWithNavController(navController, appBarConfiguration)
         binding.bottomNavigation.selectedItemId = currentTab
 
         powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
@@ -106,10 +91,6 @@ class MainActivityX : AppCompatActivity() {
 
     override fun onStart() {
         super.onStart()
-        if (Android.sdk(28) && !Android.Device.isHuaweiEmui) {
-            toolbar.menu.setGroupDividerEnabled(true)
-        }
-        toolbar.isFocusableInTouchMode = true
 
         supportFragmentManager.addFragmentOnAttachListener { _, _ ->
             hideKeyboard()
@@ -126,7 +107,7 @@ class MainActivityX : AppCompatActivity() {
     }
 
     override fun onSupportNavigateUp(): Boolean {
-        return navController.navigateUp(appBarConfiguration)
+        return navController.navigateUp()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -140,14 +121,6 @@ class MainActivityX : AppCompatActivity() {
             ?.hideSoftInputFromWindow((currentFocus ?: window.decorView).windowToken, 0)
     }
 
-    fun syncManual(item: MenuItem) {
-        syncConnection.binder?.sync(SyncService.SyncRequest.MANUAL)
-    }
-
-    fun navigateSettings(item: MenuItem) {
-        navigateSettings()
-    }
-
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         handleIntent(intent)
@@ -221,10 +194,6 @@ class MainActivityX : AppCompatActivity() {
         // TODO
     }
 
-    private fun navigateSettings() = startActivity(
-        Intent(applicationContext, PrefsActivityX::class.java)
-    )
-
     private fun updateUpdateNotificationBlocker(activeSource: Source) {
         val blockerFragment = if (activeSource == Source.UPDATES) {
             supportFragmentManager.fragments.asSequence().mapNotNull { it as? MainNavFragmentX }
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt
index 92b4150f..e7852573 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.SearchView
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Column
@@ -26,7 +25,6 @@ import com.looker.droidify.ui.compose.ProductsVerticalRecycler
 import com.looker.droidify.ui.compose.theme.AppTheme
 import com.looker.droidify.ui.compose.utils.SelectableChipRow
 import com.looker.droidify.utility.isDarkTheme
-import com.looker.droidify.widget.FocusSearchView
 
 class ExploreFragment : MainNavFragmentX() {
 
@@ -59,25 +57,6 @@ class ExploreFragment : MainNavFragmentX() {
         viewModel.categories.observe(viewLifecycleOwner) {
             redrawPage(viewModel.primaryProducts.value, it)
         }
-        mainActivityX.menuSetup.observe(viewLifecycleOwner) {
-            if (it != null) {
-                val searchView =
-                    mainActivityX.toolbar.menu.findItem(R.id.toolbar_search).actionView as FocusSearchView
-                searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                    override fun onQueryTextSubmit(query: String): Boolean {
-                        if (isResumed && query != viewModel.searchQuery.value)
-                            viewModel.setSearchQuery(query)
-                        return true
-                    }
-
-                    override fun onQueryTextChange(newText: String): Boolean {
-                        if (isResumed && newText != viewModel.searchQuery.value)
-                            viewModel.setSearchQuery(newText)
-                        return true
-                    }
-                })
-            }
-        }
     }
 
     @OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt
index 58a82c91..b960d497 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.SearchView
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -32,7 +31,6 @@ import com.looker.droidify.ui.compose.ProductsHorizontalRecycler
 import com.looker.droidify.ui.compose.ProductsVerticalRecycler
 import com.looker.droidify.ui.compose.theme.AppTheme
 import com.looker.droidify.utility.isDarkTheme
-import com.looker.droidify.widget.FocusSearchView
 
 class InstalledFragment : MainNavFragmentX() {
 
@@ -65,25 +63,6 @@ class InstalledFragment : MainNavFragmentX() {
         viewModel.secondaryProducts.observe(viewLifecycleOwner) {
             redrawPage(viewModel.primaryProducts.value, it)
         }
-        mainActivityX.menuSetup.observe(viewLifecycleOwner) {
-            if (it != null) {
-                val searchView =
-                    mainActivityX.toolbar.menu.findItem(R.id.toolbar_search).actionView as FocusSearchView
-                searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                    override fun onQueryTextSubmit(query: String): Boolean {
-                        if (isResumed && query != viewModel.searchQuery.value)
-                            viewModel.setSearchQuery(query)
-                        return true
-                    }
-
-                    override fun onQueryTextChange(newText: String): Boolean {
-                        if (isResumed && newText != viewModel.searchQuery.value)
-                            viewModel.setSearchQuery(newText)
-                        return true
-                    }
-                })
-            }
-        }
     }
 
     @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt
index f25b5865..ce70cf0c 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.SearchView
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
@@ -26,7 +25,6 @@ import com.looker.droidify.ui.compose.ProductsHorizontalRecycler
 import com.looker.droidify.ui.compose.ProductsVerticalRecycler
 import com.looker.droidify.ui.compose.theme.AppTheme
 import com.looker.droidify.utility.isDarkTheme
-import com.looker.droidify.widget.FocusSearchView
 
 class LatestFragment : MainNavFragmentX() {
 
@@ -60,25 +58,6 @@ class LatestFragment : MainNavFragmentX() {
         viewModel.secondaryProducts.observe(viewLifecycleOwner) {
             redrawPage(viewModel.primaryProducts.value, it)
         }
-        mainActivityX.menuSetup.observe(viewLifecycleOwner) {
-            if (it != null) {
-                val searchView =
-                    mainActivityX.toolbar.menu.findItem(R.id.toolbar_search).actionView as FocusSearchView
-                searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                    override fun onQueryTextSubmit(query: String): Boolean {
-                        if (isResumed && query != viewModel.searchQuery.value)
-                            viewModel.setSearchQuery(query)
-                        return true
-                    }
-
-                    override fun onQueryTextChange(newText: String): Boolean {
-                        if (isResumed && newText != viewModel.searchQuery.value)
-                            viewModel.setSearchQuery(newText)
-                        return true
-                    }
-                })
-            }
-        }
     }
 
     @OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
diff --git a/src/main/res/layout/activity_main_x.xml b/src/main/res/layout/activity_main_x.xml
index 80f35d53..05b35c55 100644
--- a/src/main/res/layout/activity_main_x.xml
+++ b/src/main/res/layout/activity_main_x.xml
@@ -10,23 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar_layout"
-            style="?attr/appBarLayoutStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toTopOf="@id/fragment_content"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar"
-                style="?attr/toolbarStyle"
-                android:layout_width="match_parent"
-                android:layout_height="?actionBarSize"
-                app:menu="@menu/menu_main"
-                app:title="@string/application_name" />
-        </com.google.android.material.appbar.AppBarLayout>
-
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/fragment_content"
             android:name="androidx.navigation.fragment.NavHostFragment"
@@ -35,7 +18,7 @@
             app:defaultNavHost="true"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
-            app:layout_constraintTop_toBottomOf="@id/appbar_layout"
+            app:layout_constraintTop_toTopOf="parent"
             app:navGraph="@navigation/navigation_graph_main" />
 
         <com.google.android.material.bottomnavigation.BottomNavigationView