diff --git a/app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt b/app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt
index 72b12f4f0..b089165d8 100644
--- a/app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt
@@ -42,10 +42,7 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>() {
         super.onViewCreated(view, savedInstanceState)
 
         // Toolbar
-        binding.layoutToolbarAction.txtTitle.text = getString(R.string.title_about)
-        binding.layoutToolbarAction.imgActionPrimary.setOnClickListener {
-            findNavController().navigateUp()
-        }
+        binding.toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
 
         // About Details
         binding.imgIcon.load(R.mipmap.ic_launcher)
diff --git a/app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt b/app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt
index c7308dc62..adca32e45 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/AccountFragment.kt
@@ -47,10 +47,7 @@ class AccountFragment : BaseFragment<FragmentAccountBinding>() {
         super.onViewCreated(view, savedInstanceState)
 
         // Toolbar
-        binding.layoutToolbarAction.txtTitle.text = getString(R.string.title_account_manager)
-        binding.layoutToolbarAction.imgActionPrimary.setOnClickListener {
-            findNavController().navigateUp()
-        }
+        binding.toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
 
         // Chips
         view.context.apply {
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt
index 14b6cae3a..b59d350e6 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt
@@ -60,9 +60,7 @@ class DetailsMoreFragment : BaseFragment<FragmentDetailsMoreBinding>() {
         }
 
         // Toolbar
-        binding.layoutToolbarActionMore.toolbar.setOnClickListener {
-            findNavController().navigateUp()
-        }
+        binding.toolbar.setOnClickListener { findNavController().navigateUp() }
 
         inflateDescription(args.app)
         inflateFiles(args.app)
@@ -95,7 +93,7 @@ class DetailsMoreFragment : BaseFragment<FragmentDetailsMoreBinding>() {
     }
 
     private fun inflateDescription(app: App) {
-        binding.layoutToolbarActionMore.txtTitle.text = app.displayName
+        binding.toolbar.title = app.displayName
         binding.txtDescription.text = HtmlCompat.fromHtml(
             app.description,
             HtmlCompat.FROM_HTML_MODE_COMPACT
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt
index 38b288c11..613ea9281 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt
@@ -58,11 +58,9 @@ class DetailsReviewFragment : BaseFragment<FragmentDetailsReviewBinding>() {
         }
 
         // Toolbar
-        binding.layoutToolbarActionReview.apply {
-            txtTitle.text = args.displayName
-            toolbar.setOnClickListener {
-                findNavController().navigateUp()
-            }
+        binding.toolbar.apply {
+            title = args.displayName
+            setNavigationOnClickListener { findNavController().navigateUp() }
         }
 
         viewModel.liveData.observe(viewLifecycleOwner) {
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt
index 68adef3dd..96bcc60e8 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt
@@ -50,10 +50,9 @@ class DevProfileFragment : BaseFragment<FragmentDevProfileBinding>(),
         val developerCarouselController = DeveloperCarouselController(this)
 
         // Toolbar
-        binding.layoutToolbarAction.apply {
-            txtTitle.text =
-                if (args.title.isNullOrBlank()) getString(R.string.details_dev_profile) else args.title
-            toolbar.setOnClickListener { findNavController().navigateUp() }
+        binding.toolbar.apply {
+            title = if (args.title.isNullOrBlank()) getString(R.string.details_dev_profile) else args.title
+            setNavigationOnClickListener { findNavController().navigateUp() }
         }
 
         // RecyclerView
@@ -78,7 +77,7 @@ class DevProfileFragment : BaseFragment<FragmentDevProfileBinding>(),
 
                 is ViewState.Success<*> -> {
                     (it.data as DevStream).apply {
-                        binding.layoutToolbarAction.txtTitle.text = title
+                        binding.toolbar.title = title
                         binding.txtDevName.text = title
                         binding.txtDevDescription.text = description
                         binding.imgIcon.load(imgUrl)
diff --git a/app/src/main/res/layout-land/fragment_about.xml b/app/src/main/res/layout-land/fragment_about.xml
index 802a769d8..3f97cc0f5 100644
--- a/app/src/main/res/layout-land/fragment_about.xml
+++ b/app/src/main/res/layout-land/fragment_about.xml
@@ -27,9 +27,14 @@
     android:orientation="vertical"
     tools:context=".view.ui.about.AboutFragment">
 
-    <include
-        android:id="@+id/layout_toolbar_action"
-        layout="@layout/view_toolbar_action" />
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:navigationIcon="@drawable/ic_arrow_back"
+        app:title="@string/title_about" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-land/fragment_account.xml b/app/src/main/res/layout-land/fragment_account.xml
index 62a241864..bb0e42a82 100644
--- a/app/src/main/res/layout-land/fragment_account.xml
+++ b/app/src/main/res/layout-land/fragment_account.xml
@@ -27,9 +27,14 @@
     android:orientation="vertical"
     tools:context=".view.ui.account.AccountFragment">
 
-    <include
-        android:id="@+id/layout_toolbar_action"
-        layout="@layout/view_toolbar_action" />
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:navigationIcon="@drawable/ic_arrow_back"
+        app:title="@string/title_account_manager" />
 
     <HorizontalScrollView
         android:id="@+id/chip_layout"
@@ -140,4 +145,4 @@
                 app:btnStateText="@string/action_logout" />
         </RelativeLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 1fe5d5100..e00babed5 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -26,9 +26,14 @@
     android:weightSum="3"
     tools:context=".view.ui.about.AboutFragment">
 
-    <include
-        android:id="@+id/layout_toolbar_action"
-        layout="@layout/view_toolbar_action" />
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:navigationIcon="@drawable/ic_arrow_back"
+        app:title="@string/title_about" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index f6422f69b..ec1e2a6f3 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -28,9 +28,14 @@
     android:weightSum="2"
     tools:context=".view.ui.account.AccountFragment">
 
-    <include
-        android:id="@+id/layout_toolbar_action"
-        layout="@layout/view_toolbar_action" />
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:navigationIcon="@drawable/ic_arrow_back"
+        app:title="@string/title_account_manager" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -131,4 +136,4 @@
             app:btnStateIcon="@drawable/ic_logout"
             app:btnStateText="@string/action_logout" />
     </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_details_more.xml b/app/src/main/res/layout/fragment_details_more.xml
index 448205ced..2519b71bc 100644
--- a/app/src/main/res/layout/fragment_details_more.xml
+++ b/app/src/main/res/layout/fragment_details_more.xml
@@ -25,9 +25,13 @@
     android:orientation="vertical"
     tools:context=".view.ui.details.DetailsMoreFragment">
 
-    <include
-        android:id="@+id/layout_toolbar_action_more"
-        layout="@layout/view_toolbar_action" />
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -100,4 +104,4 @@
                 tools:listitem="@layout/view_file" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_details_review.xml b/app/src/main/res/layout/fragment_details_review.xml
index 4390aa1d9..75f4ba8ce 100644
--- a/app/src/main/res/layout/fragment_details_review.xml
+++ b/app/src/main/res/layout/fragment_details_review.xml
@@ -25,9 +25,13 @@
     android:orientation="vertical"
     tools:context=".view.ui.details.DetailsReviewFragment">
 
-    <include
-        android:id="@+id/layout_toolbar_action_review"
-        layout="@layout/view_toolbar_action" />
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <HorizontalScrollView
         android:id="@+id/sort_view"
@@ -124,4 +128,4 @@
         app:itemSpacing="@dimen/margin_normal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/view_review" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_dev_profile.xml b/app/src/main/res/layout/fragment_dev_profile.xml
index 790772d62..5a79228c6 100644
--- a/app/src/main/res/layout/fragment_dev_profile.xml
+++ b/app/src/main/res/layout/fragment_dev_profile.xml
@@ -27,10 +27,13 @@
     android:showDividers="middle"
     tools:context=".view.ui.details.DevProfileFragment">
 
-    <include
-        android:id="@+id/layout_toolbar_action"
-        layout="@layout/view_toolbar_action" />
-
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <ViewFlipper
         android:id="@+id/view_flipper"
@@ -98,4 +101,4 @@
                 android:layout_centerInParent="true" />
         </RelativeLayout>
     </ViewFlipper>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/view_toolbar_action.xml b/app/src/main/res/layout/view_toolbar_action.xml
deleted file mode 100644
index a06aceeb1..000000000
--- a/app/src/main/res/layout/view_toolbar_action.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Aurora Store
-  ~  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
-  ~
-  ~  Aurora Store is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 2 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  Aurora Store is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="?actionBarSize"
-    android:paddingStart="@dimen/padding_medium"
-    android:paddingEnd="@dimen/padding_medium">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/img_action_primary"
-        android:layout_width="@dimen/icon_size_default"
-        android:layout_height="@dimen/icon_size_default"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/margin_small"
-        android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/action_back"
-        app:srcCompat="@drawable/ic_arrow_back"
-        app:tint="?colorControlNormal" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/txt_title"
-        style="@style/AuroraTextStyle.Subtitle.Alt"
-        android:layout_width="match_parent"
-        android:layout_height="42dp"
-        android:layout_centerVertical="true"
-        android:layout_toEndOf="@id/img_action_primary"
-        android:gravity="center_vertical"
-        android:paddingStart="@dimen/padding_large"
-        android:paddingEnd="@dimen/padding_normal"
-        android:singleLine="true"
-        tools:text="Title" />
-</RelativeLayout>