diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistFragment.kt
index 4de8a972d..b16e8d8a2 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistFragment.kt
@@ -21,6 +21,7 @@ package com.aurora.store.view.ui.commons
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -54,9 +55,10 @@ class BlacklistFragment : BaseFragment<FragmentGenericWithToolbarBinding>() {
         }
 
         // Toolbar
-        binding.layoutToolbarAction.txtTitle.text = getString(R.string.title_blacklist_manager)
-        binding.layoutToolbarAction.imgActionPrimary.setOnClickListener {
-            findNavController().navigateUp()
+        binding.layoutToolbarNative.toolbar.apply {
+            title = getString(R.string.title_blacklist_manager)
+            navigationIcon = ContextCompat.getDrawable(view.context, R.drawable.ic_arrow_back)
+            setNavigationOnClickListener { findNavController().navigateUp() }
         }
     }
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt
index d7d87ad48..bb466bd7c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt
@@ -21,6 +21,7 @@ package com.aurora.store.view.ui.commons
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -29,6 +30,7 @@ import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.contracts.StreamContract
 import com.aurora.gplayapi.utils.CategoryUtil
+import com.aurora.store.R
 import com.aurora.store.data.model.ViewState
 import com.aurora.store.data.model.ViewState.Loading.getDataAs
 import com.aurora.store.databinding.FragmentGenericWithToolbarBinding
@@ -55,9 +57,10 @@ class CategoryBrowseFragment : BaseFragment<FragmentGenericWithToolbarBinding>()
         val genericCarouselController = CategoryCarouselController(this)
 
         // Toolbar
-        binding.layoutToolbarAction.apply {
-            txtTitle.text = args.title
-            imgActionPrimary.setOnClickListener { findNavController().navigateUp() }
+        binding.layoutToolbarNative.toolbar.apply {
+            title = args.title
+            navigationIcon = ContextCompat.getDrawable(view.context, R.drawable.ic_arrow_back)
+            setNavigationOnClickListener { findNavController().navigateUp() }
         }
 
         // RecyclerView
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseFragment.kt
index c9dd317b4..2841e30d3 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseFragment.kt
@@ -21,11 +21,13 @@ package com.aurora.store.view.ui.commons
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.airbnb.epoxy.EpoxyModel
 import com.aurora.gplayapi.data.models.StreamCluster
+import com.aurora.store.R
 import com.aurora.store.databinding.FragmentGenericWithToolbarBinding
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.groups.CarouselHorizontalModel_
@@ -49,11 +51,10 @@ class ExpandedStreamBrowseFragment : BaseFragment<FragmentGenericWithToolbarBind
         super.onViewCreated(view, savedInstanceState)
 
         // Toolbar
-        binding.layoutToolbarAction.apply {
-            txtTitle.text = args.title
-            imgActionPrimary.setOnClickListener {
-                findNavController().navigateUp()
-            }
+        binding.layoutToolbarNative.toolbar.apply {
+            title = args.title
+            navigationIcon = ContextCompat.getDrawable(view.context, R.drawable.ic_arrow_back)
+            setNavigationOnClickListener { findNavController().navigateUp() }
         }
 
         viewModel.liveData.observe(viewLifecycleOwner) {
@@ -70,7 +71,7 @@ class ExpandedStreamBrowseFragment : BaseFragment<FragmentGenericWithToolbarBind
 
     private fun updateTitle(streamCluster: StreamCluster) {
         if (streamCluster.clusterTitle.isNotEmpty())
-            binding.layoutToolbarAction.txtTitle.text = streamCluster.clusterTitle
+            binding.layoutToolbarNative.toolbar.title = streamCluster.clusterTitle
     }
 
     private fun attachRecycler() {
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseFragment.kt
index ba10d4442..397f6d52f 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseFragment.kt
@@ -21,10 +21,12 @@ package com.aurora.store.view.ui.commons
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.aurora.gplayapi.data.models.StreamCluster
+import com.aurora.store.R
 import com.aurora.store.databinding.FragmentGenericWithToolbarBinding
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
@@ -46,11 +48,10 @@ class StreamBrowseFragment : BaseFragment<FragmentGenericWithToolbarBinding>() {
         streamCluster = args.cluster
 
         // Toolbar
-        binding.layoutToolbarAction.apply {
-            txtTitle.text = streamCluster.clusterTitle
-            imgActionPrimary.setOnClickListener {
-                findNavController().navigateUp()
-            }
+        binding.layoutToolbarNative.toolbar.apply {
+            title = streamCluster.clusterTitle
+            navigationIcon = ContextCompat.getDrawable(view.context, R.drawable.ic_arrow_back)
+            setNavigationOnClickListener { findNavController().navigateUp() }
         }
 
         binding.recycler.addOnScrollListener(object :
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusFragment.kt
index d5cec2113..782bf4674 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusFragment.kt
@@ -21,6 +21,7 @@ package com.aurora.store.view.ui.details
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.aurora.Constants
@@ -48,11 +49,10 @@ class DetailsExodusFragment : BaseFragment<FragmentGenericWithToolbarBinding>()
         super.onViewCreated(view, savedInstanceState)
 
         // Toolbar
-        binding.layoutToolbarAction.apply {
-            txtTitle.text = args.displayName
-            toolbar.setOnClickListener {
-                findNavController().navigateUp()
-            }
+        binding.layoutToolbarNative.toolbar.apply {
+            title = args.displayName
+            navigationIcon = ContextCompat.getDrawable(view.context, R.drawable.ic_arrow_back)
+            setNavigationOnClickListener { findNavController().navigateUp() }
         }
 
         updateController(getExodusTrackersFromReport(args.report))
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsFragment.kt
index 1773d32d8..eee29f42b 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsFragment.kt
@@ -21,10 +21,12 @@ package com.aurora.store.view.ui.details
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.aurora.gplayapi.data.models.SearchBundle
+import com.aurora.store.R
 import com.aurora.store.databinding.FragmentGenericWithToolbarBinding
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
@@ -47,11 +49,10 @@ class DevAppsFragment : BaseFragment<FragmentGenericWithToolbarBinding>() {
         }
 
         // Toolbar
-        binding.layoutToolbarAction.apply {
-            txtTitle.text = args.developerName
-            toolbar.setOnClickListener {
-                findNavController().navigateUp()
-            }
+        binding.layoutToolbarNative.toolbar.apply {
+            title = args.developerName
+            navigationIcon = ContextCompat.getDrawable(view.context, R.drawable.ic_arrow_back)
+            setNavigationOnClickListener { findNavController().navigateUp() }
         }
 
         // Recycler View
diff --git a/app/src/main/res/layout/fragment_generic_with_toolbar.xml b/app/src/main/res/layout/fragment_generic_with_toolbar.xml
index 154f2d152..ed2126f86 100644
--- a/app/src/main/res/layout/fragment_generic_with_toolbar.xml
+++ b/app/src/main/res/layout/fragment_generic_with_toolbar.xml
@@ -24,14 +24,14 @@
     android:orientation="vertical">
 
     <include
-        android:id="@+id/layout_toolbar_action"
-        layout="@layout/view_toolbar_action" />
+        android:id="@+id/layout_toolbar_native"
+        layout="@layout/view_toolbar_native" />
 
     <com.airbnb.epoxy.EpoxyRecyclerView
         android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/layout_toolbar_action"
+        android:layout_below="@+id/layout_toolbar_native"
         android:clipToPadding="true"
         android:paddingBottom="@dimen/height_bottom_adj"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"