diff --git a/app/build.gradle b/app/build.gradle
index 526879ab..efa0d848 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,7 +88,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "androidx.viewpager2:viewpager2:1.0.0"
+    implementation "androidx.viewpager2:viewpager2:1.1.0"
+
 
     api 'joda-time:joda-time:2.10.13'
     api 'com.github.tibbi:RecyclerView-FastScroller:e7d3e150c4'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e579c40f..3b4573a6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:localeConfig="@xml/locales_config"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme.Base">
         <activity android:name=".activities.MainActivity"
             android:exported="true">
             <intent-filter>
@@ -31,7 +31,7 @@
         <activity
             android:name=".activities.SplashActivity"
             android:exported="false"
-            android:theme="@style/SplashTheme" />
+           />
 
         <activity-alias
             android:name=".activities.SplashActivity.Orange"
@@ -170,26 +170,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".fragments.AboutFragment"
-            android:label="@string/app.about.title"
-            android:parentActivityName=".fragments.MainFragment" />
-        <activity
-            android:name=".fragments.WikimediaScribeFragment"
-            android:label="@string/app.about.wikimedia"
-            android:parentActivityName=".fragments.MainFragment" />
-        <activity
-            android:name=".fragments.PrivacyPolicyFragment"
-            android:label="@string/app.about.privacyPolicy"
-            android:parentActivityName=".activities.MainActivity" />
-        <activity
-            android:name=".fragments.ThirdPartyFragment"
-            android:label="@string/app.about.thirdParty"
-            android:parentActivityName=".activities.MainActivity" />
-        <activity
-            android:name=".activities.LanguageSettings"
-            android:label="Language Settings"
-            android:parentActivityName=".fragments.MainFragment" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/be/scri/activities/MainActivity.kt b/app/src/main/java/be/scri/activities/MainActivity.kt
index fe1b8026..9c57e196 100644
--- a/app/src/main/java/be/scri/activities/MainActivity.kt
+++ b/app/src/main/java/be/scri/activities/MainActivity.kt
@@ -1,12 +1,17 @@
 package be.scri.activities
 
+
 import android.os.Bundle
 import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
 import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.bottomnavigation.BottomNavigationView
 import be.scri.R
 import be.scri.adapters.ViewPagerAdapter
 import be.scri.databinding.ActivityMainBinding
+import com.google.android.material.bottomnavigation.BottomNavigationView
+
 
 class MainActivity : SimpleActivity() {
 
@@ -17,9 +22,24 @@ class MainActivity : SimpleActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        supportActionBar?.displayOptions = androidx.appcompat.app.ActionBar.DISPLAY_SHOW_CUSTOM;
+        supportActionBar?.setDisplayShowCustomEnabled(true);
+        supportActionBar?.setCustomView(R.layout.custom_action_bar_layout);
+        supportActionBar?.elevation = 0F
+        val layoutParams = supportActionBar?.customView?.layoutParams
+        layoutParams?.height = 1000
+        supportActionBar?.customView?.layoutParams = layoutParams
+        setActionBarTitle(R.string.app_launcher_name)
+        val mButton = supportActionBar?.customView?.findViewById<Button>(R.id.button)
+        val mImage = getDrawable(R.drawable.chevron)
+        mButton?.setCompoundDrawablesWithIntrinsicBounds(mImage, null, null, null)
+        mButton?.compoundDrawablePadding = 2
+        mButton?.visibility = View.GONE
+
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+
         viewPager = findViewById(R.id.view_pager)
         bottomNavigationView = findViewById(R.id.bottom_navigation)
 
@@ -33,18 +53,24 @@ class MainActivity : SimpleActivity() {
         viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
                 bottomNavigationView.menu.getItem(position).isChecked = true
-                when(position) {
+                when (position) {
                     0 -> {
-                        supportActionBar?.title = getString(R.string.app_launcher_name)
                         binding.fragmentContainer.visibility = View.GONE
+                        setActionBarTitle(R.string.app_launcher_name)
                     }
+
                     1 -> {
-                        supportActionBar?.title = getString(R.string.app_settings_title)
                         binding.fragmentContainer.visibility = View.GONE
+                        setActionBarTitle(R.string.app_settings_title)
                     }
+
                     2 -> {
-                        supportActionBar?.title = getString(R.string.app_about_title)
                         binding.fragmentContainer.visibility = View.GONE
+                        setActionBarTitle(R.string.app_about_title)
+                    }
+
+                    else -> {
+                        binding.fragmentContainer.visibility = View.VISIBLE
                     }
                 }
             }
@@ -55,30 +81,80 @@ class MainActivity : SimpleActivity() {
             when (menuItem.itemId) {
                 R.id.installation -> {
                     viewPager.setCurrentItem(0, true)
-                    supportActionBar?.title = getString(R.string.app_launcher_name)
                     binding.fragmentContainer.visibility = View.GONE
+                    setActionBarTitle(R.string.app_launcher_name)
                     true
                 }
+
                 R.id.info -> {
                     viewPager.setCurrentItem(2, true)
                     binding.fragmentContainer.visibility = View.GONE
-                    supportActionBar?.title = getString(R.string.app_about_title)
+                    setActionBarTitle(R.string.app_about_title)
                     true
                 }
+
                 R.id.settings -> {
                     viewPager.setCurrentItem(1, true)
                     binding.fragmentContainer.visibility = View.GONE
-                    supportActionBar?.title = getString(R.string.app_settings_title)
+                    setActionBarTitle(R.string.app_settings_title)
                     true
                 }
+
                 else -> {
-                  false
+                    false
                 }
             }
         }
     }
+
     fun showFragmentContainer() {
         binding.fragmentContainer.visibility = View.VISIBLE
     }
 
+    fun setActionBarTitle(title: Int) {
+        supportActionBar?.customView?.findViewById<TextView>(R.id.name)?.text = getString(title)
+    }
+
+    fun setActionBarButtonVisible() {
+        supportActionBar?.customView?.findViewById<Button>(R.id.button)?.visibility = View.VISIBLE
+    }
+
+    fun setActionBarButtonInvisible() {
+        supportActionBar?.customView?.findViewById<Button>(R.id.button)?.visibility = View.GONE
+    }
+
+    fun setActionBarButtonFunction(page: Int, title: Int) {
+        val button = supportActionBar?.customView?.findViewById<Button>(R.id.button)
+        button?.setOnClickListener {
+            val viewpager = findViewById<ViewPager2>(R.id.view_pager)
+            val frameLayout = findViewById<ViewGroup>(R.id.fragment_container)
+            if (viewpager.currentItem == page) {
+
+                frameLayout.visibility = View.GONE
+                viewpager.setCurrentItem(page, true)
+
+            }
+            frameLayout.visibility = View.GONE
+            unsetActionBarLayoutMargin()
+            setActionBarTitle(title)
+            button.visibility = View.GONE
+
+        }
+    }
+    fun setActionBarLayoutMargin() {
+        val textView = supportActionBar?.customView?.findViewById<TextView>(R.id.name)
+        val params = textView?.layoutParams as ViewGroup.MarginLayoutParams
+        params.topMargin = -50
+        params.bottomMargin = 30
+        textView.layoutParams = params
+    }
+    fun unsetActionBarLayoutMargin() {
+        val textView = supportActionBar?.customView?.findViewById<TextView>(R.id.name)
+        val params = textView?.layoutParams as ViewGroup.MarginLayoutParams
+        params.topMargin = 50
+        params.bottomMargin = 0
+        textView.layoutParams = params
+    }
+
+
 }
diff --git a/app/src/main/java/be/scri/extensions/Activity.kt b/app/src/main/java/be/scri/extensions/Activity.kt
index 56bfe7c5..376677d3 100644
--- a/app/src/main/java/be/scri/extensions/Activity.kt
+++ b/app/src/main/java/be/scri/extensions/Activity.kt
@@ -83,7 +83,7 @@ fun Activity.appLaunched(appId: String) {
         checkAppIconColor()
     } else if (!baseConfig.wasOrangeIconChecked) {
         baseConfig.wasOrangeIconChecked = true
-        val primaryColor = resources.getColor(R.color.color_primary)
+        val primaryColor = resources.getColor(R.color.you_background_color)
         if (baseConfig.appIconColor != primaryColor) {
             getAppIconColors().forEachIndexed { index, color ->
                 toggleAppIconColor(appId, index, color, false)
diff --git a/app/src/main/java/be/scri/fragments/AboutFragment.kt b/app/src/main/java/be/scri/fragments/AboutFragment.kt
index 57e63929..08a0bc9c 100644
--- a/app/src/main/java/be/scri/fragments/AboutFragment.kt
+++ b/app/src/main/java/be/scri/fragments/AboutFragment.kt
@@ -37,12 +37,14 @@ class AboutFragment : Fragment() {
             getParentFragmentManager().popBackStack()
         }
         callback.isEnabled = true
+        (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_title)
+        (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
+        (requireActivity() as MainActivity).setActionBarButtonInvisible()
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_settings_title)
         setupRecyclerViews()
     }
 
diff --git a/app/src/main/java/be/scri/fragments/LanguageSettingsFragment.kt b/app/src/main/java/be/scri/fragments/LanguageSettingsFragment.kt
index 652f12f2..5a708376 100644
--- a/app/src/main/java/be/scri/fragments/LanguageSettingsFragment.kt
+++ b/app/src/main/java/be/scri/fragments/LanguageSettingsFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
@@ -24,10 +25,15 @@ class LanguageSettingsFragment : Fragment() {
         super.onCreate(savedInstanceState)
         val viewpager = requireActivity().findViewById<ViewPager2>(R.id.view_pager)
         val frameLayout = requireActivity().findViewById<ViewGroup>(R.id.fragment_container)
+        (requireActivity() as MainActivity).setActionBarButtonFunction(3,R.string.app_settings_title)
         val callback = requireActivity().onBackPressedDispatcher.addCallback(this) {
             viewpager.setCurrentItem(3, true);
             (requireActivity() as MainActivity).supportActionBar?.setDisplayHomeAsUpEnabled(false);
+            (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
         }
+        (requireActivity() as MainActivity).setActionBarLayoutMargin()
+        (requireActivity() as MainActivity).supportActionBar?.customView?.findViewById<Button>(R.id.button)?.text = getString(R.string.app_settings_title)
+
         callback.isEnabled = true
 
     }
@@ -40,9 +46,11 @@ class LanguageSettingsFragment : Fragment() {
             override fun handleOnBackPressed() {
                 val viewpager = requireActivity().findViewById<ViewPager2>(R.id.view_pager)
                 val frameLayout = requireActivity().findViewById<ViewGroup>(R.id.fragment_container)
+                (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
                 if (viewpager.currentItem == 3) {
                     viewpager.setCurrentItem(3, true)
                     frameLayout.visibility = View.GONE
+                    (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
                 } else {
                     if (parentFragmentManager.backStackEntryCount > 0) {
                         parentFragmentManager.popBackStack()
@@ -62,10 +70,13 @@ class LanguageSettingsFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val language = arguments?.getString("LANGUAGE_EXTRA") ?: return
-        (requireActivity() as MainActivity).supportActionBar?.title = language
+        val titleInt = getLanguageStringFromi18n(language)
+        (requireActivity() as MainActivity).setActionBarTitle(titleInt)
         (requireActivity() as MainActivity).showFragmentContainer()
-
+        (requireActivity() as MainActivity).setActionBarButtonVisible()
+        (requireActivity() as MainActivity).setActionBarButtonFunction(3,R.string.app_settings_title)
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            (requireActivity() as MainActivity).setActionBarButtonInvisible()
             parentFragmentManager.beginTransaction()
                 .replace(R.id.fragment_container, SettingsFragment())
                 .addToBackStack(null)
@@ -110,4 +121,16 @@ class LanguageSettingsFragment : Fragment() {
         _binding = null
     }
 
+    fun getLanguageStringFromi18n(language: String): Int {
+        when (language) {
+            "German" -> return R.string._global_german
+            "French" -> return R.string._global_french
+            "Spanish" -> return R.string._global_spanish
+            "Italian" -> return R.string._global_italian
+            "Russian" -> return R.string._global_russian
+            "Portuguese" -> return R.string._global_portuguese
+            "Swedish" -> return R.string._global_swedish
+            else -> return R.string._global_english
+        }
+    }
 }
diff --git a/app/src/main/java/be/scri/fragments/MainFragment.kt b/app/src/main/java/be/scri/fragments/MainFragment.kt
index f13d8369..f7e96f81 100644
--- a/app/src/main/java/be/scri/fragments/MainFragment.kt
+++ b/app/src/main/java/be/scri/fragments/MainFragment.kt
@@ -14,6 +14,7 @@ import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.Fragment
 import be.scri.R
+import be.scri.activities.MainActivity
 import be.scri.databinding.FragmentMainBinding
 import be.scri.dialogs.ConfirmationAdvancedDialog
 
@@ -47,6 +48,7 @@ class MainFragment : Fragment() {
         val callback = requireActivity().onBackPressedDispatcher.addCallback(this) {
             getParentFragmentManager().popBackStack()
         }
+        (requireActivity() as MainActivity).setActionBarButtonInvisible()
         callback.isEnabled = true
         return binding.root
     }
diff --git a/app/src/main/java/be/scri/fragments/PrivacyPolicyFragment.kt b/app/src/main/java/be/scri/fragments/PrivacyPolicyFragment.kt
index 9fae4195..7e1dc182 100644
--- a/app/src/main/java/be/scri/fragments/PrivacyPolicyFragment.kt
+++ b/app/src/main/java/be/scri/fragments/PrivacyPolicyFragment.kt
@@ -5,8 +5,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
+import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import be.scri.R
@@ -21,11 +24,25 @@ class PrivacyPolicyFragment : Fragment(){
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         val viewpager = requireActivity().findViewById<ViewPager2>(R.id.view_pager)
         val frameLayout = requireActivity().findViewById<ViewGroup>(R.id.fragment_container)
         val callback = requireActivity().onBackPressedDispatcher.addCallback(this) {
             viewpager.setCurrentItem(2, true);
+            (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
+        }
+        (requireActivity() as MainActivity).setActionBarButtonVisible()
+        (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_privacyPolicy)
+        (requireActivity() as MainActivity).setActionBarLayoutMargin()
+        val textView = (requireActivity() as MainActivity).supportActionBar?.customView?.findViewById<TextView>(R.id.name)
+        (requireActivity() as MainActivity).supportActionBar?.customView?.findViewById<Button>(R.id.button)?.text = getString(R.string.app_about_title)
+
+        textView?.let{
+            val params = it.layoutParams as ViewGroup.MarginLayoutParams
+            params.topMargin = -50
+            it.layoutParams = params
         }
+
         callback.isEnabled = true
 
 
@@ -35,12 +52,17 @@ class PrivacyPolicyFragment : Fragment(){
         savedInstanceState: Bundle?
     ): View? {
         binding = FragmentPrivacyPolicyBinding.inflate(inflater, container, false)
-        (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_about_privacyPolicy)
         (requireActivity() as MainActivity).showFragmentContainer()
+        (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_privacyPolicy)
+        (requireActivity() as MainActivity).setActionBarButtonFunction(2,R.string.app_about_title)
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 val viewpager = requireActivity().findViewById<ViewPager2>(R.id.view_pager)
                 val frameLayout = requireActivity().findViewById<ViewGroup>(R.id.fragment_container)
+                (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_title)
+                val textView = (requireActivity() as MainActivity).supportActionBar?.customView?.findViewById<TextView>(R.id.name)
+                (requireActivity() as MainActivity).setActionBarButtonInvisible()
+                (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
                 if (viewpager.currentItem == 2) {
                     viewpager.setCurrentItem(2, true)
                     frameLayout.visibility = View.GONE
@@ -53,7 +75,6 @@ class PrivacyPolicyFragment : Fragment(){
                     }
                 }
 
-                (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_about_title)
             }
         })
         return binding.root
diff --git a/app/src/main/java/be/scri/fragments/SettingsFragment.kt b/app/src/main/java/be/scri/fragments/SettingsFragment.kt
index c95ac473..89897576 100644
--- a/app/src/main/java/be/scri/fragments/SettingsFragment.kt
+++ b/app/src/main/java/be/scri/fragments/SettingsFragment.kt
@@ -32,7 +32,11 @@ class SettingsFragment : Fragment() {
         val callback = requireActivity().onBackPressedDispatcher.addCallback(this) {
             getParentFragmentManager().popBackStack()
         }
+        (requireActivity() as MainActivity).setActionBarTitle(R.string.app_settings_title)
+        (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
+        (requireActivity() as MainActivity).setActionBarButtonInvisible()
         callback.isEnabled = true
+        (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_settings_title)
         return binding.root
     }
 
@@ -40,7 +44,6 @@ class SettingsFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         setupRecycleView()
         setupRecyclerView2()
-        (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_settings_title)
         val imm = requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         val enabledInputMethods = imm.enabledInputMethodList
         for (inputMethod in enabledInputMethods) {
@@ -140,10 +143,9 @@ class SettingsFragment : Fragment() {
             }
         }
         val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction()
-        fragmentTransaction.replace(R.id.fragment_container, fragment)
-        fragmentTransaction.addToBackStack(null)
+        fragmentTransaction.replace(R.id.fragment_container, fragment, "LanguageFragment")
+        fragmentTransaction.addToBackStack("LanguageFragment")
         fragmentTransaction.commit()
-        (requireActivity() as AppCompatActivity).supportActionBar?.title = getString(R.string.app_about_wikimedia)
     }
 
 
diff --git a/app/src/main/java/be/scri/fragments/ThirdPartyFragment.kt b/app/src/main/java/be/scri/fragments/ThirdPartyFragment.kt
index a7a0cdd8..7e12d49a 100644
--- a/app/src/main/java/be/scri/fragments/ThirdPartyFragment.kt
+++ b/app/src/main/java/be/scri/fragments/ThirdPartyFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
@@ -26,7 +27,13 @@ class ThirdPartyFragment : Fragment() {
         val frameLayout = requireActivity().findViewById<ViewGroup>(R.id.fragment_container)
         val callback = requireActivity().onBackPressedDispatcher.addCallback(this) {
             viewpager.setCurrentItem(2, true);
+            (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
         }
+        (requireActivity() as MainActivity).setActionBarButtonFunction(2,R.string.app_about_title)
+        (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_thirdParty)
+        (requireActivity() as MainActivity).setActionBarButtonVisible()
+        (requireActivity() as MainActivity).setActionBarLayoutMargin()
+        (requireActivity() as MainActivity).supportActionBar?.customView?.findViewById<Button>(R.id.button)?.text = getString(R.string.app_about_title)
         callback.isEnabled = true
 
 
@@ -36,12 +43,16 @@ class ThirdPartyFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         binding = FragmentThirdPartyBinding.inflate(inflater, container, false)
-        (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_about_thirdParty)
         (requireActivity() as MainActivity).showFragmentContainer()
+        (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_thirdParty)
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 val viewpager = requireActivity().findViewById<ViewPager2>(R.id.view_pager)
                 val frameLayout = requireActivity().findViewById<ViewGroup>(R.id.fragment_container)
+                (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_title)
+                (requireActivity() as MainActivity).setActionBarButtonInvisible()
+                (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
+
                 if (viewpager.currentItem == 2) {
                     viewpager.setCurrentItem(2, true)
                     frameLayout.visibility = View.GONE
@@ -54,7 +65,6 @@ class ThirdPartyFragment : Fragment() {
                     }
                 }
 
-                (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_about_title)
             }
         })
         return binding.root
diff --git a/app/src/main/java/be/scri/fragments/WikimediaScribeFragment.kt b/app/src/main/java/be/scri/fragments/WikimediaScribeFragment.kt
index 26eefde1..99ec7374 100644
--- a/app/src/main/java/be/scri/fragments/WikimediaScribeFragment.kt
+++ b/app/src/main/java/be/scri/fragments/WikimediaScribeFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
@@ -26,7 +27,13 @@ class WikimediaScribeFragment : Fragment(){
         val frameLayout = requireActivity().findViewById<ViewGroup>(R.id.fragment_container)
         val callback = requireActivity().onBackPressedDispatcher.addCallback(this) {
             viewpager.setCurrentItem(2, true);
+            (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
         }
+        (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_wikimedia)
+        (requireActivity() as MainActivity).setActionBarButtonVisible()
+        (requireActivity() as MainActivity).setActionBarButtonFunction(2,R.string.app_about_title)
+        (requireActivity() as MainActivity).setActionBarLayoutMargin()
+        (requireActivity() as MainActivity).supportActionBar?.customView?.findViewById<Button>(R.id.button)?.text = getString(R.string.app_about_title)
         callback.isEnabled = true
 
 
@@ -36,12 +43,14 @@ class WikimediaScribeFragment : Fragment(){
         savedInstanceState: Bundle?
     ): View? {
         binding = FragmentWikimediaScribeBinding.inflate(inflater, container, false)
-        (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_about_wikimedia)
         (requireActivity() as MainActivity).showFragmentContainer()
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 val viewpager = requireActivity().findViewById<ViewPager2>(R.id.view_pager)
                 val frameLayout = requireActivity().findViewById<ViewGroup>(R.id.fragment_container)
+                (requireActivity() as MainActivity).setActionBarTitle(R.string.app_about_title)
+                (requireActivity() as MainActivity).setActionBarButtonInvisible()
+                (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
                 if (viewpager.currentItem == 2) {
                     viewpager.setCurrentItem(2, true)
                     frameLayout.visibility = View.GONE
@@ -54,7 +63,6 @@ class WikimediaScribeFragment : Fragment(){
                     }
                 }
 
-                (requireActivity() as MainActivity).supportActionBar?.title = getString(R.string.app_about_title)
             }
         })
         return binding.root
diff --git a/app/src/main/res/drawable/chevron.xml b/app/src/main/res/drawable/chevron.xml
new file mode 100644
index 00000000..bdfdae84
--- /dev/null
+++ b/app/src/main/res/drawable/chevron.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M42.577,53.827C42.403,54.002 42.196,54.141 41.968,54.235C41.74,54.33 41.496,54.378 41.25,54.378C41.003,54.378 40.759,54.33 40.531,54.235C40.303,54.141 40.096,54.002 39.922,53.827L17.422,31.327C17.247,31.153 17.109,30.946 17.014,30.719C16.92,30.491 16.871,30.247 16.871,30C16.871,29.753 16.92,29.509 17.014,29.281C17.109,29.054 17.247,28.847 17.422,28.673L39.922,6.173C40.274,5.82 40.752,5.623 41.25,5.623C41.748,5.623 42.225,5.82 42.577,6.173C42.929,6.525 43.127,7.002 43.127,7.5C43.127,7.998 42.929,8.475 42.577,8.828L21.401,30L42.577,51.173C42.752,51.347 42.89,51.554 42.985,51.781C43.079,52.009 43.128,52.253 43.128,52.5C43.128,52.747 43.079,52.991 42.985,53.219C42.89,53.446 42.752,53.653 42.577,53.827Z"
+      android:fillColor="@color/app_text_color"
+      android:fillAlpha="0.95"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_group_circle_bg.xml b/app/src/main/res/drawable/ic_group_circle_bg.xml
index 635453b1..bc833436 100644
--- a/app/src/main/res/drawable/ic_group_circle_bg.xml
+++ b/app/src/main/res/drawable/ic_group_circle_bg.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/attendee_circular_background">
         <shape android:shape="oval">
-            <solid android:color="@color/color_primary"/>
+            <solid android:color="@color/you_background_color"/>
         </shape>
     </item>
     <item android:bottom="@dimen/medium_margin" android:drawable="@drawable/ic_people_vector" android:left="@dimen/medium_margin" android:right="@dimen/medium_margin" android:top="@dimen/medium_margin"/>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b21e1e1d..3714001f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    android:theme="@style/Theme.AppCompat.Light.NoActionBar"
     android:layout_height="match_parent">
-
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/bottom_navigation"
+        app:layout_anchor="@+id/view_pager"
+        app:layout_anchorGravity="center" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
         app:itemBackground="@color/nav_bar_color"
         app:itemIconTint="@drawable/nav_bar_selector"
         app:itemTextColor="@drawable/nav_bar_selector"
         app:menu="@menu/menu_navigation_bottom" />
-    <FrameLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/bottom_navigation" />
-</RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/custom_action_bar_layout.xml b/app/src/main/res/layout/custom_action_bar_layout.xml
new file mode 100644
index 00000000..a4de3886
--- /dev/null
+++ b/app/src/main/res/layout/custom_action_bar_layout.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="top"
+    android:background="@color/you_background_color">
+
+    <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="start|top">
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:textAllCaps="false"
+        android:textColor="@color/app_text_color"
+        android:layout_height="wrap_content"
+        android:paddingBottom="7dp"
+        android:layout_marginStart="-6dp"
+        android:text="@string/app.about.title"
+        android:layout_gravity="top|start"
+        android:drawablePadding="2dp"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginTop="10dp"
+        android:layout_gravity="top|start"
+        android:paddingBottom="-2dp"
+        android:paddingTop="2dp"
+        android:layout_weight="2"
+        android:text="@string/app_launcher_name"
+        android:textColor="@color/app_text_color"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+
+    </LinearLayout>
+</androidx.appcompat.widget.Toolbar>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 28b42082..66b1f39f 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     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/about_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_margin="15dp"
     android:background="@color/you_background_color">
-
-
         <LinearLayout
             android:id="@+id/linearLayout"
             android:layout_width="match_parent"
@@ -16,18 +13,16 @@
             android:paddingBottom="10dp"
             android:orientation="vertical"
             android:padding="10dp">
-
             <TextView
                 android:id="@+id/tvTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
+                android:paddingTop="10dp"
                 android:text="@string/app.about.community"
                 android:textColor="@color/text_color"
                 android:textSize="20sp"
                 android:textStyle="bold" />
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycleView2"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_language_settings.xml b/app/src/main/res/layout/fragment_language_settings.xml
index 1513bcc7..79f683d7 100644
--- a/app/src/main/res/layout/fragment_language_settings.xml
+++ b/app/src/main/res/layout/fragment_language_settings.xml
@@ -7,27 +7,28 @@
     android:layout_height="match_parent"
     android:background="@color/you_background_color">
 
-
     <TextView
         android:id="@+id/languageSettingsTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/app.settings.functionality"
+        android:layout_marginStart="12dp"
         android:textColor="@color/app_text_color"
-        android:textSize="20dp"
+        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.054"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.039" />
+        app:layout_constraintVertical_bias="0.022" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="100dp"
+        android:layout_marginTop="50dp"
+        android:padding="12dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_privacy_policy.xml b/app/src/main/res/layout/fragment_privacy_policy.xml
index fed627a3..75366ff3 100644
--- a/app/src/main/res/layout/fragment_privacy_policy.xml
+++ b/app/src/main/res/layout/fragment_privacy_policy.xml
@@ -10,12 +10,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="5dp">
+            android:padding="10dp">
             <TextView
                 android:id="@+id/textView"
                 android:layout_width="303dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="20dp"
                 android:text="@string/app.about.privacyPolicy.caption"
                 android:layout_marginEnd="16dp"
                 android:textColor="@color/app_text_color"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index c34055f6..b4dfc5bf 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -13,14 +13,15 @@
             android:id="@+id/settings_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:padding="10dp"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/languageTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="20dp"
-                android:paddingTop="30dp"
+                android:paddingTop="10dp"
+                android:paddingStart="12dp"
                 android:paddingEnd="10dp"
                 android:paddingBottom="10dp"
                 android:text="@string/app.settings.appSettings"
@@ -32,15 +33,15 @@
                 android:id="@+id/recyclerViewSettings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="10dp" />
+               />
 
             <TextView
                 android:id="@+id/selectLanguage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="20dp"
                 android:paddingTop="10dp"
-                android:paddingEnd="10dp"
+                android:paddingEnd="12dp"
+                android:paddingStart="10dp"
                 android:paddingBottom="10dp"
                 android:text="@string/app.settings.installedKeyboards"
                 android:textColor="@color/app_text_color"
@@ -65,7 +66,7 @@
                     android:id="@+id/recyclerView2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="10dp" />
+                    />
             </RelativeLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_third_party.xml b/app/src/main/res/layout/fragment_third_party.xml
index e2d3899d..b945c4f1 100644
--- a/app/src/main/res/layout/fragment_third_party.xml
+++ b/app/src/main/res/layout/fragment_third_party.xml
@@ -11,12 +11,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="5dp">
+            android:padding="10dp">
             <TextView
                 android:id="@+id/textView"
                 android:layout_width="303dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="20dp"
                 android:text="@string/app.about.thirdParty.caption"
                 android:layout_marginEnd="16dp"
                 android:textColor="@color/app_text_color"
diff --git a/app/src/main/res/layout/fragment_wikimedia_scribe.xml b/app/src/main/res/layout/fragment_wikimedia_scribe.xml
index 3fcc75e4..446d80bd 100644
--- a/app/src/main/res/layout/fragment_wikimedia_scribe.xml
+++ b/app/src/main/res/layout/fragment_wikimedia_scribe.xml
@@ -6,21 +6,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background_color">
-
-
-
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="5dp">
-
+            android:padding="10dp">
             <TextView
                 android:id="@+id/textView"
                 android:layout_width="303dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="19dp"
                 android:text="@string/app.about.wikimedia.caption"
                 android:layout_marginEnd="16dp"
                 android:textColor="@color/app_text_color"
diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
index 2320bfcd..af74b9e2 100644
--- a/app/src/main/res/values-night-v31/colors.xml
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -5,7 +5,7 @@
     <color name="app_text_color">@color/dark_text_color</color>
     <color name="nav_bar_color">#000</color>">
     <color name="nav_bar_focus_color">#FFF</color>
-    <color name="nav_bar_selected_color">@color/dark_scribe_blue</color>
+    <color name="nav_bar_selected_color">@color/you_background_color</color>
     <color name = "you_border_color">#FFFFFFFF</color>
     <color name="background_color">#235270</color>">
     <color name="text_color">#FFF</color>
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 018291cd..a51f2feb 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -5,7 +5,7 @@
     <color name="app_text_color">@color/light_text_color</color>
     <color name="nav_bar_color">#FFFFFFFF</color>">
     <color name="nav_bar_focus_color">#000</color>
-    <color name="nav_bar_selected_color">@color/light_scribe_blue</color>
+    <color name="nav_bar_selected_color">@color/you_background_color</color>
     <color name = "you_border_color">#FFFFFFFF</color>
     <color name = "background_color">#5EB5E8</color>">
     <color name="text_color">#000</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b2371a65..a49f80e6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -51,9 +51,9 @@
     <color name="dark_annotation_orange">#90FE9448</color>
 
     <!-- Commons colors -->
-    <color name="color_primary">@color/light_scribe_blue</color>
-    <color name="color_primary_dark">@color/light_scribe_blue</color>
-    <color name="color_accent">@color/light_scribe_blue</color>
+    <color name="color_primary">@color/you_background_color</color>
+    <color name="color_primary_dark">@color/you_background_color</color>
+    <color name="color_accent">@color/you_background_color</color>
 
     <color name="pressed_item_foreground">#08000000</color>
     <color name="activated_item_foreground">#44888888</color>