diff --git a/designsystem/src/main/kotlin/com/natura/android/appbar/AppBar.kt b/designsystem/src/main/kotlin/com/natura/android/appbar/AppBar.kt
index 59c9e4fa4..a4db7b9fa 100644
--- a/designsystem/src/main/kotlin/com/natura/android/appbar/AppBar.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/appbar/AppBar.kt
@@ -1,101 +1,124 @@
 package com.natura.android.appbar
 
-import android.app.Activity
 import android.content.Context
-import android.graphics.Color
-import android.os.Build
+import android.graphics.drawable.Drawable
 import android.util.AttributeSet
+import android.util.DisplayMetrics
 import android.util.TypedValue
+import android.view.Gravity
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
+import android.widget.ImageView
 import androidx.appcompat.widget.Toolbar
 import com.natura.android.R
-import kotlin.math.sqrt
+import com.natura.android.ext.setVisibilityFromBoolean
+import com.natura.android.badge.BadgeDrawable
 
-// WIP
 class AppBar(context: Context, attrs: AttributeSet) : Toolbar(context, attrs) {
-    var color: Int
+
+    private lateinit var badgeDrawable: BadgeDrawable
+    private var showLogo: Boolean
+    private val logo: ImageView
 
     init {
-        context
-            .theme
-            .obtainStyledAttributes(attrs, R.styleable.AppBar, 0, 0)
-            .apply {
-                try {
-                    color = this.getInt(R.styleable.AppBar_appBarType, 0)
-                } finally {
-                    recycle()
-                }
-            }
-    }
+        logo = createLogo(context, attrs)
 
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        setStatusBarStyle()
+        val typedValue = context.obtainStyledAttributes(attrs, R.styleable.AppBar)
+        showLogo = typedValue.getBoolean(R.styleable.AppBar_showLogo, false)
+        setLogoVisibility()
 
-        this.setBackgroundColor(getThemeColor(getMainColorFromAttrs()))
-        this.setTitleTextColor(getThemeColor(getMainOnColorFromAttrs()))
+        addView(logo)
 
-        if (isOnColorTooLight(getThemeColor(getMainOnColorFromAttrs()))) {
-            setStatusBarIconsLighter()
-        } else {
-            setStatusBarIconsDarker()
+        contentInsetStartWithNavigation = 0
+        elevation = getElevationFromTheme(context)
+
+        typedValue.recycle()
+    }
+
+    private fun setLogoVisibility() {
+        logo.setVisibilityFromBoolean(showLogo)
+
+        if (showLogo) {
+            title = ""
         }
     }
 
-    private fun isOnColorTooLight(color: Int): Boolean {
-        val rgb = intArrayOf(Color.red(color), Color.green(color), Color.blue(color))
-        val brightness = sqrt(rgb[0] * rgb[0] * .241 + (rgb[1] * rgb[1] * .691) + rgb[2] * rgb[2] * .068).toInt()
-        return brightness >= 200
+    fun showLogo() {
+        showLogo = true
+        setLogoVisibility()
     }
 
-    private fun setStatusBarStyle() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+    fun hideLogo() {
+        showLogo = false
+        setLogoVisibility()
+    }
+
+    fun addMenuIconBadge(menuIcon: Drawable, initBadgeValue: Int) {
+        badgeDrawable = BadgeDrawable(context, initBadgeValue, menuIcon)
+    }
 
-            val context = context as Activity
-            val window = context.window
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-            window.statusBarColor = getThemeColor(getMainColorFromAttrs())
+    fun updateBadgeValue(value: Int) {
+        if (this::badgeDrawable.isInitialized) {
+            badgeDrawable.updateBadgeDrawable(value)
         }
     }
 
-    private fun getMainColorFromAttrs(): Int {
-        return when (color) {
-                1 -> R.attr.colorPrimary
-                2 -> R.attr.colorSecondary
-                3 -> android.R.color.transparent
-                else -> R.attr.colorSurface
-            }
+    private fun createLogo(context: Context, attrs: AttributeSet): ImageView {
+        val imageView = ImageView(context)
+        imageView.setImageResource(getLogoResId(context, attrs))
+        val logoWidth = getLogoWidthFromTheme(context)
+        imageView.layoutParams =
+            LayoutParams(logoWidth, ViewGroup.LayoutParams.WRAP_CONTENT, getLogoAlign(context))
+        imageView.visibility = View.GONE
+        return imageView
     }
 
-    private fun getMainOnColorFromAttrs(): Int {
-        return when (color) {
-            1 -> R.attr.colorOnPrimary
-            2 -> R.attr.colorOnSecondary
-            3 -> R.attr.colorOnSurface
-            else -> R.attr.colorOnSurface
+    private fun getLogoAlign(context: Context): Int {
+        return if (getWindowWidthInPx(context) < MINIMUM_SCREEN_SIZE_FOR_CENTRALIZED_LOGO) {
+            Gravity.START
+        } else {
+            Gravity.CENTER
         }
     }
 
-    private fun getThemeColor(colorAttr: Int): Int {
-        val outValue = TypedValue()
-        context.theme.resolveAttribute(colorAttr, outValue, true)
-        return outValue.data
+    private fun getLogoWidthFromTheme(context: Context): Int {
+        val typedValue = TypedValue()
+        if (context.theme.resolveAttribute(R.attr.sizeHugeX, typedValue, true)) {
+            return TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics)
+        }
+
+        return ViewGroup.LayoutParams.WRAP_CONTENT
     }
 
-    private fun setStatusBarIconsDarker() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val context = context as Activity
-            val window = context.window
-            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+    private fun getElevationFromTheme(context: Context): Float {
+        val typedValue = TypedValue()
+        if (context.theme.resolveAttribute(R.attr.elevation02, typedValue, true)) {
+            return TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics).toFloat()
         }
+
+        return 0f
     }
 
-    private fun setStatusBarIconsLighter() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val context = context as Activity
-            val window = context.window
-            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+    private fun getLogoResId(context: Context, attrs: AttributeSet): Int {
+        val typedValue = context.theme
+            .obtainStyledAttributes(attrs, intArrayOf(R.attr.logoHorizontal), 0, 0)
+        return typedValue.getResourceId(0, 0)
+    }
+
+    private fun getWindowWidthInPx(context: Context): Int {
+        return try {
+            val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+            val metrics = DisplayMetrics()
+            windowManager.defaultDisplay.getMetrics(metrics)
+
+            metrics.widthPixels
+        } catch (ex: Exception) {
+            MINIMUM_SCREEN_SIZE_FOR_CENTRALIZED_LOGO
         }
     }
+
+    companion object {
+        private const val MINIMUM_SCREEN_SIZE_FOR_CENTRALIZED_LOGO = 361
+    }
 }
diff --git a/designsystem/src/main/res/layout/custom_app_bar.xml b/designsystem/src/main/res/layout/custom_app_bar.xml
deleted file mode 100644
index 732be60b7..000000000
--- a/designsystem/src/main/res/layout/custom_app_bar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.AppBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolBarTop"
-        android:background="@color/black"
-        android:layout_width="match_parent"
-        android:layout_height="?toolbarHeight"
-        android:theme="?toolbarDefaultTheme"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</com.google.android.material.appbar.AppBarLayout>
diff --git a/designsystem/src/main/res/menu/custom_menu.xml b/designsystem/src/main/res/menu/custom_menu.xml
index fd7771753..b6d541e46 100644
--- a/designsystem/src/main/res/menu/custom_menu.xml
+++ b/designsystem/src/main/res/menu/custom_menu.xml
@@ -13,4 +13,5 @@
         android:icon="@drawable/icon_base_badge"
         android:title="notification"
         app:showAsAction="always" />
+
 </menu>
\ No newline at end of file
diff --git a/designsystem/src/main/res/values/ds_attrs.xml b/designsystem/src/main/res/values/ds_attrs.xml
index 4eb5a521e..4fb2a4c64 100644
--- a/designsystem/src/main/res/values/ds_attrs.xml
+++ b/designsystem/src/main/res/values/ds_attrs.xml
@@ -13,12 +13,7 @@
     </declare-styleable>
 
     <declare-styleable name="AppBar" >
-        <attr name="appBarType" format="enum">
-            <enum name="appBarDefault" value="0"/>
-            <enum name="appBarPrimary" value="1"/>
-            <enum name="appBarSecondary" value="2"/>
-            <enum name="appBarInherit" value="3"/>
-        </attr>
+        <attr name="showLogo" format="boolean"/>
     </declare-styleable>
 
     <declare-styleable name="ds_menu">
diff --git a/designsystem/src/main/res/values/styles.xml b/designsystem/src/main/res/values/styles.xml
index 44093760a..4c406845a 100644
--- a/designsystem/src/main/res/values/styles.xml
+++ b/designsystem/src/main/res/values/styles.xml
@@ -158,6 +158,7 @@
         <item name="android:layout_height">@dimen/ds_toolbar_height</item>
         <item name="navigationIcon">@drawable/outlined_navigation_directionright</item>
         <item name="collapseIcon">@drawable/outlined_navigation_directionright</item>
+        <item name="actionButtonStyle">@style/ActionButton</item>
     </style>
 
     <style name="Theme.DS.Toolbar" parent="ThemeOverlay.MaterialComponents.Toolbar.Primary">
@@ -165,6 +166,7 @@
         <item name="colorControlNormal">?colorOnSurface</item>
         <item name="navigationIcon">@drawable/outlined_navigation_directionright</item>
         <item name="collapseIcon">@drawable/outlined_navigation_directionright</item>
+        <item name="actionButtonStyle">@style/ActionButton</item>
     </style>
 
     <style name="Widget.DS.Toolbar.Primary" parent="Widget.DS.AppBarTop">
@@ -179,6 +181,11 @@
         <item name="titleTextColor">?colorOnSecondary</item>
     </style>
 
+    <style name="ActionButton" parent="@android:style/Widget.ActionButton">
+        <item name="paddingEnd">?spacingTiny</item>
+        <item name="paddingStart">?spacingTiny</item>
+    </style>
+
     <!-- SELECTION CONTROL STYLES -->
     <style name="Widget.DS.RadioButton.V23" parent="Widget.AppCompat.CompoundButton.RadioButton">
         <item name="buttonTint">@color/color_selector_primary_v23</item>
diff --git a/doc/app-bar-top.md b/doc/app-bar-top.md
index 1a9bb91e9..8bef5822e 100644
--- a/doc/app-bar-top.md
+++ b/doc/app-bar-top.md
@@ -1,18 +1,27 @@
 # App Bar Top Component - Default variant
 
 ### What is it?
-App Bar Top is the Android native Action bar with some styles to match Nat DS appereance.
+App Bar Top is the Android native Action bar with some customizations to match Nat DS appearance and integrate with other components, such as badge and logo.
 
 ### Why should I use it?
-This component can help you to show some infos and/or actions on the top of the screen
+This component can help you to show some info and/or actions on the top of the screen
 
 ### When should I use it?
-Every time you want to configure an quick acess to some basic infos or actions
+Every time you want to configure an quick acess to some basic info or actions
 
 ### How to use it?
-If you need to configure just a basic App Bar, with title and some simple actions, just configure at your view the base theme. You can check how to do it [here](getting-started.md).
+Add the app bar component in your xml layout file
+Important! Do not use the default theme, use the NoActionBar variant. You can check more info [Getting Started guide](getting-started.md).
+```android
+      <com.natura.android.appbar.AppBar
+          android:id="@+id/appBar"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:theme="?toolbarDefaultTheme"/>
+```
 After that, the App Bar will be displayed at the top of the screen and in the root view code, you can add some basic actions:
-
 ```android
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,11 +37,41 @@ To configure the back button action:
         onBackPressed()
         return true
     }
-   ```
-
+```
+#### AppBar with centralized brand logo
+To use the app bar with logo component just add the attribute showLogo in the xml file like below:
+```android
+      <com.natura.android.appbar.AppBar
+          android:id="@+id/appBar"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:theme="?toolbarDefaultTheme"
+          app:showLogo="true"/>
+```
+If you prefer you can do it programmatically using the methods below in the root view code:
+```android
+      appBar.showLogo()
+      appBar.hideLogo()
+```
+#### AppBar with badge in action button
+The AppBar component abstract the logic to configure the badge component to work in the action button. 
+Example:
+```android
+      notificationMenuItem = menu?.findItem(R.id.ic_notification)
+      notificationMenuItem?.let {
+          appBar.addMenuIconBadge(it.icon, mCount)
+      }
+```
+To update badge value:
+```android
+      appBar.updateBadgeValue(mCount)
+```
 
-However if you need an more complex App Bar Top, you can use Android Toolbar component with the DS theme applied.
-Important! If you are adding the toolbar component at you xml layou file, DO NOT use the default theme, use the NoActionBar variant. You can check more infos [here](getting-started.md).
+### How create a customized App Bar
+If you need an more customize App Bar Top, you can use Android Toolbar component with the DS theme applied.
+Important! If you are adding the toolbar component at you xml layout file, DO NOT use the default theme, use the NoActionBar variant. You can check more info [Getting Started guide](getting-started.md).
 
 ```android
     <com.google.android.material.appbar.AppBarLayout
diff --git a/sample/src/androidTest/kotlin/com/natura/android/sample/MainActivityFunctionalTests.kt b/sample/src/androidTest/kotlin/com/natura/android/sample/MainActivityFunctionalTests.kt
index c4cc685e2..f7a102c5c 100644
--- a/sample/src/androidTest/kotlin/com/natura/android/sample/MainActivityFunctionalTests.kt
+++ b/sample/src/androidTest/kotlin/com/natura/android/sample/MainActivityFunctionalTests.kt
@@ -97,7 +97,7 @@ class MainActivityFunctionalTests {
         onView(withId(R.id.btnAppbar)).perform(scrollTo())
         onView(withId(R.id.btnAppbar)).perform(click())
 
-        onView(withText("App Bar Top")).check(matches(isDisplayed()))
+        onView(withId(R.id.appBar)).check(matches(isDisplayed()))
     }
 
     @Test
diff --git a/sample/src/androidTest/kotlin/com/natura/android/sample/components/AppBarActivityFunctionalTest.kt b/sample/src/androidTest/kotlin/com/natura/android/sample/components/AppBarActivityFunctionalTest.kt
new file mode 100644
index 000000000..8231e2ff9
--- /dev/null
+++ b/sample/src/androidTest/kotlin/com/natura/android/sample/components/AppBarActivityFunctionalTest.kt
@@ -0,0 +1,39 @@
+package com.natura.android.sample.components
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.natura.android.sample.R
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class AppBarActivityFunctionalTest {
+
+    private lateinit var appBarActivityTest: ActivityScenario<AppBarActivity>
+
+    @Before
+    fun setup() {
+        appBarActivityTest = ActivityScenario.launch(AppBarActivity::class.java)
+    }
+
+    @Test
+    fun addAndIncrementBadge() {
+        onView(withId(R.id.btnIncrement)).perform(click())
+        onView(withId(R.id.btnIncrement)).perform(click())
+
+        onView(withId(R.id.appBar)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun showSearchBar() {
+        onView(withId(R.id.searchMenuBtn)).perform(click())
+
+        onView(withId(R.id.appBar)).check(matches(isDisplayed()))
+    }
+}
diff --git a/sample/src/androidTest/kotlin/com/natura/android/sample/test/AppBarActivityTest.kt b/sample/src/androidTest/kotlin/com/natura/android/sample/test/AppBarActivityTest.kt
index a22103f72..281a272c8 100644
--- a/sample/src/androidTest/kotlin/com/natura/android/sample/test/AppBarActivityTest.kt
+++ b/sample/src/androidTest/kotlin/com/natura/android/sample/test/AppBarActivityTest.kt
@@ -9,8 +9,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@Ignore
 @RunWith(AndroidJUnit4::class)
+@Ignore
 class AppBarActivityTest : ScreenShotActivityTestBase() {
     @get:Rule
     var activityTestRule = ActivityTestRule(AppBarActivity::class.java, false, false)
@@ -23,4 +23,13 @@ class AppBarActivityTest : ScreenShotActivityTestBase() {
         performClick(R.id.searchMenuBtn)
         checkScreenshot(activity, "search_expanded")
     }
+
+    @Test
+    fun test_Snapshot_With_Badge() {
+        val activity = activityTestRule.launchActivity(null)
+
+        checkScreenshot(activity, "app_bar_without_badge")
+        performClick(R.id.btnIncrement)
+        checkScreenshot(activity, "app_bar_with_badge")
+    }
 }
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/AppBarActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/AppBarActivity.kt
index 51de04c3c..f5c48555b 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/components/AppBarActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/AppBarActivity.kt
@@ -8,59 +8,41 @@ import android.view.MenuItem
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
-import com.natura.android.badge.BadgeDrawable
 import com.natura.android.sample.R
 import com.natura.android.sample.setChosenDefaultWithNoActionBarTheme
 import kotlinx.android.synthetic.main.activity_appbar.*
-import kotlinx.android.synthetic.main.custom_app_bar.*
 
 class AppBarActivity : AppCompatActivity() {
 
+    private var mCount = 0
     private var searchMenuItem: MenuItem? = null
-    private var profileMenuItem: MenuItem? = null
-    private var linesMenuItem: MenuItem? = null
     private var notificationMenuItem: MenuItem? = null
 
-    private var mMenu: Menu? = null
-    private var mCount = 0
-    private lateinit var badgeDrawable: BadgeDrawable
-
     override fun onCreate(savedInstanceState: Bundle?) {
         setChosenDefaultWithNoActionBarTheme()
 
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_appbar)
-        setSupportActionBar(toolBarTop)
+        setSupportActionBar(appBar)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.title = "App Bar Top"
 
         btnIncrement.apply {
             setOnClickListener {
                 mCount++
-                textViewExample.text = mCount.toString()
-                badgeDrawable.updateBadgeDrawable(mCount)
+                appBar.updateBadgeValue(mCount)
             }
         }
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-
-        mMenu = menu
-
         menuInflater.inflate(R.menu.appbar_menu, menu)
+
         searchMenuItem = menu?.findItem(R.id.searchMenuBtn)
-        profileMenuItem = menu?.findItem(R.id.profileMenuBtn)
-        linesMenuItem = menu?.findItem(R.id.linesMenuBtn)
         notificationMenuItem = menu?.findItem(R.id.ic_notification)
-
-        menu?.findItem(R.id.ic_notification)?.let { menuItem ->
-            badgeDrawable = BadgeDrawable(
-                this,
-                mCount,
-                menuItem.icon
-            )
+        notificationMenuItem?.let {
+            appBar.addMenuIconBadge(it.icon, mCount)
         }
 
         (searchMenuItem?.actionView as? SearchView)?.let {
@@ -85,8 +67,7 @@ class AppBarActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when (item?.itemId) {
             R.id.searchMenuBtn -> updateToolbarMode(false)
-            R.id.linesMenuBtn -> Toast.makeText(this, "lines menu clicked", Toast.LENGTH_SHORT).show()
-            R.id.profileMenuBtn -> Toast.makeText(this, "profile menu clicked", Toast.LENGTH_SHORT).show()
+            R.id.ic_notification -> Toast.makeText(this, "notifications menu clicked", Toast.LENGTH_SHORT).show()
             else -> onBackPressed()
         }
 
@@ -105,8 +86,6 @@ class AppBarActivity : AppCompatActivity() {
 
     private fun updateToolbarMode(menuMode: Boolean) {
         searchMenuItem?.isVisible = menuMode
-        profileMenuItem?.isVisible = menuMode
-        linesMenuItem?.isVisible = menuMode
         notificationMenuItem?.isVisible = menuMode
     }
 }
diff --git a/sample/src/main/res/layout/activity_appbar.xml b/sample/src/main/res/layout/activity_appbar.xml
index a11e6d109..014f51a97 100644
--- a/sample/src/main/res/layout/activity_appbar.xml
+++ b/sample/src/main/res/layout/activity_appbar.xml
@@ -1,31 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
     android:layout_height="match_parent">
 
-  <include android:id="@+id/icToolbar"
-      layout="@layout/custom_app_bar"/>
+  <com.natura.android.appbar.AppBar
+      android:id="@+id/appBar"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:theme="?toolbarDefaultTheme"
+      app:showLogo="true"/>
 
-    <TextView
-        android:id="@+id/textViewExample"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="This is the App Bar Top - Default variant"
-        android:textAppearance="?textAppearanceBody2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:textSize="@dimen/ds_text_footer_size"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.25" />
-
-    <Button
-        android:id="@+id/btnIncrement"
-        android:layout_margin="30dp"
-        android:text="increment notification"
-        app:layout_constraintTop_toBottomOf="@id/textViewExample"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+  <Button
+      android:id="@+id/btnIncrement"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_margin="@dimen/ds_spacing_semi"
+      android:text="increment notification"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintVertical_bias="0.18" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sample/src/main/res/layout/custom_app_bar.xml b/sample/src/main/res/layout/custom_app_bar.xml
deleted file mode 100644
index b6e8fc0fa..000000000
--- a/sample/src/main/res/layout/custom_app_bar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.AppBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolBarTop"
-        android:layout_width="match_parent"
-        android:layout_height="?toolbarHeight"
-        android:theme="?toolbarDefaultTheme"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-    </androidx.appcompat.widget.Toolbar>
-</com.google.android.material.appbar.AppBarLayout>
diff --git a/sample/src/main/res/menu/appbar_menu.xml b/sample/src/main/res/menu/appbar_menu.xml
index 7ca8ef111..dc61b52a7 100644
--- a/sample/src/main/res/menu/appbar_menu.xml
+++ b/sample/src/main/res/menu/appbar_menu.xml
@@ -4,27 +4,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/linesMenuBtn"
-        android:title="Lines"
-        android:icon="@drawable/outlined_default_mockup"
-        app:showAsAction="always|collapseActionView" />
-
-    <item
-        android:id="@+id/profileMenuBtn"
-        android:title="Profile"
-        android:icon="@drawable/outlined_default_mockup"
-        app:showAsAction="always|collapseActionView" />
+        android:id="@+id/searchMenuBtn"
+        android:title="Search"
+        android:icon="@drawable/ds_ic_outlined_action_search"
+        app:showAsAction="always|collapseActionView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />
 
     <item
         android:id="@+id/ic_notification"
         android:icon="@drawable/icon_base_badge"
         android:title="notifications"
         app:showAsAction="always" />
-
-    <item
-        android:id="@+id/searchMenuBtn"
-        android:title="Search"
-        android:icon="@drawable/ds_ic_outlined_action_search"
-        app:showAsAction="always|collapseActionView"
-        app:actionViewClass="androidx.appcompat.widget.SearchView" />
 </menu>
\ No newline at end of file