diff --git a/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt b/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
index 90d68f52..a1e49247 100644
--- a/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
+++ b/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
@@ -27,14 +27,16 @@ class DonateFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
-        val navController = findNavController()
-        binding.toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
         binding.btnDonate.setOnClickListener {
             (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt b/app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt
index 03b4d442..e0fc2d0f 100644
--- a/app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt
+++ b/app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -28,7 +27,7 @@ class DonateFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_donate, container, false)
         binding.lifecycleOwner = this
         binding.vm = vm
@@ -36,14 +35,7 @@ class DonateFragment : Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
-        (requireActivity() as AppCompatActivity).setSupportActionBar(toolbar)
-
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
+        (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
         binding.productsList.apply {
             adapter = DonationAdapter().apply {
@@ -65,4 +57,12 @@ class DonateFragment : Fragment() {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
         })
     }
+
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt
index fc289965..11a1823b 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt
@@ -1,7 +1,6 @@
 package net.vonforst.evmap.fragment
 
 import android.os.Bundle
-import android.view.View
 import androidx.appcompat.widget.Toolbar
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
@@ -14,13 +13,12 @@ import net.vonforst.evmap.R
 
 
 class AboutFragment : PreferenceFragmentCompat() {
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
+    override fun onResume() {
+        super.onResume()
+        val toolbar = requireView().findViewById(R.id.toolbar) as Toolbar
 
-        val navController = findNavController()
         toolbar.setupWithNavController(
-            navController,
+            findNavController(),
             (requireActivity() as MapsActivity).appBarConfiguration
         )
     }
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
index c0098af6..b99fff27 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
@@ -85,14 +84,6 @@ class ChargepriceFragment : DialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
-
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
         val charger = requireArguments().getParcelable<ChargeLocation>(ARG_CHARGER)!!
         val dataSource = requireArguments().getString(ARG_DATASOURCE)!!
         vm.charger.value = charger
@@ -165,7 +156,7 @@ class ChargepriceFragment : DialogFragment() {
         }
 
         binding.btnSettings.setOnClickListener {
-            navController.navigate(R.id.action_chargeprice_to_settingsFragment)
+            findNavController().navigate(R.id.action_chargeprice_to_settingsFragment)
         }
 
         binding.batteryRange.setLabelFormatter { value: Float ->
@@ -217,6 +208,14 @@ class ChargepriceFragment : DialogFragment() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
+
     companion object {
         const val ARG_CHARGER = "charger"
         const val ARG_DATASOURCE = "datasource"
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt
index 23017679..2855e209 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt
@@ -9,7 +9,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@@ -70,19 +69,15 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
-
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
 
         adapter = FavoritesAdapter(onDelete = {
             delete(it.charger)
         }).apply {
             onClickListener = {
-                navController.navigate(R.id.action_favs_to_map, MapFragment.showCharger(it.charger))
+                findNavController().navigate(
+                    R.id.action_favs_to_map,
+                    MapFragment.showCharger(it.charger)
+                )
             }
         }
         binding.favsList.apply {
@@ -256,4 +251,12 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
             }
         })
     }
+
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt
index 2bd4f058..3bf7eeb0 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt
@@ -3,7 +3,6 @@ package net.vonforst.evmap.fragment
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -42,18 +41,11 @@ class FilterFragment : Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
-        (requireActivity() as AppCompatActivity).setSupportActionBar(toolbar)
-
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
+        (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
         vm.filterProfile.observe(viewLifecycleOwner) {
             if (it != null) {
-                toolbar.title = "${getString(R.string.menu_filter)}: ${it.name}"
+                binding.toolbar.title = "${getString(R.string.menu_filter)}: ${it.name}"
             }
         }
 
@@ -68,7 +60,7 @@ class FilterFragment : Fragment() {
             )
         }
 
-        toolbar.setNavigationOnClickListener {
+        binding.toolbar.setNavigationOnClickListener {
             findNavController().popBackStack()
         }
     }
@@ -110,4 +102,12 @@ class FilterFragment : Fragment() {
             else -> super.onOptionsItemSelected(item)
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/FilterProfilesFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/FilterProfilesFragment.kt
index 1f936fe1..e3652138 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/FilterProfilesFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/FilterProfilesFragment.kt
@@ -8,7 +8,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
@@ -57,15 +56,7 @@ class FilterProfilesFragment : Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
-        (requireActivity() as AppCompatActivity).setSupportActionBar(toolbar)
-
-        val navController = findNavController()
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
+        (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
         touchHelper = ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
             ItemTouchHelper.UP or ItemTouchHelper.DOWN,
@@ -207,11 +198,19 @@ class FilterProfilesFragment : Fragment() {
 
         touchHelper.attachToRecyclerView(binding.filterProfilesList)
 
-        toolbar.setNavigationOnClickListener {
+        binding.toolbar.setNavigationOnClickListener {
             findNavController().popBackStack()
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+    }
+
     fun delete(fp: FilterProfile) {
         val position = vm.filterProfiles.value?.indexOf(fp) ?: return
         // if there is already a profile to delete, delete it now