diff --git a/README.md b/README.md
index c682564d6..08a277c8b 100644
--- a/README.md
+++ b/README.md
@@ -120,3 +120,4 @@ And:
 - Menu
 - Navigation View
 - Text Field
+- [Shortcut](doc/shortcut.md)
diff --git a/build.gradle b/build.gradle
index 046bda74a..86231894f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,4 +51,5 @@ ext {
     materialVersion = '1.1.0'
     espressoIntentsVersion = '3.1.0'
     mockKVersion = '1.10.0'
+    coreKTXVersion = '1.3.0'
 }
diff --git a/designsystem/build.gradle b/designsystem/build.gradle
index 84ad96ed9..556eb0b08 100644
--- a/designsystem/build.gradle
+++ b/designsystem/build.gradle
@@ -55,13 +55,14 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "com.google.android.material:material:$rootProject.materialVersion"
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayout"
-
+    implementation "androidx.core:core-ktx:$rootProject.coreKTXVersion"
     testImplementation "junit:junit:$rootProject.junitVersion"
     testImplementation "androidx.test.ext:truth:$rootProject.truthVersion"
     testImplementation "androidx.test:runner:$rootProject.androidXTestVersion"
     testImplementation "androidx.test:core-ktx:$rootProject.testCoreKtxVersion"
     testImplementation "androidx.test.ext:junit:$rootProject.androidxJunitVersion"
     testImplementation "org.robolectric:robolectric:$rootProject.robolectricVersion"
+    testImplementation "io.mockk:mockk:$rootProject.mockKVersion"
 }
 
 androidExtensions {
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/kotlin/com/natura/android/exceptions/MissingThemeException.kt b/designsystem/src/main/kotlin/com/natura/android/exceptions/MissingThemeException.kt
new file mode 100644
index 000000000..404e4c8d5
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/exceptions/MissingThemeException.kt
@@ -0,0 +1,6 @@
+package com.natura.android.exceptions
+
+import java.lang.IllegalArgumentException
+
+class MissingThemeException :
+    IllegalArgumentException("⚠️ ⚠️ Missing DS Theme. You are using a DS component without setting a DS Theme. You MUST set a DS theme at the component or in a parent view")
diff --git a/designsystem/src/main/kotlin/com/natura/android/extensions/TextFieldExtensions.kt b/designsystem/src/main/kotlin/com/natura/android/extensions/TextFieldExtensions.kt
new file mode 100644
index 000000000..f54147d94
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/extensions/TextFieldExtensions.kt
@@ -0,0 +1,12 @@
+package com.natura.android.extensions
+
+import android.os.Build
+import android.widget.TextView
+
+fun TextView.setAppearance(textAppearance: Int) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+        this.setTextAppearance(context, textAppearance)
+    } else {
+        this.setTextAppearance(textAppearance)
+    }
+}
diff --git a/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt b/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt
new file mode 100644
index 000000000..46031f0e2
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt
@@ -0,0 +1,179 @@
+package com.natura.android.shortcut
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.drawable.GradientDrawable
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.getIntOrThrow
+import androidx.core.content.res.getResourceIdOrThrow
+import androidx.core.content.res.getStringOrThrow
+import androidx.core.graphics.drawable.DrawableCompat
+import com.natura.android.R
+import com.natura.android.exceptions.MissingThemeException
+import com.natura.android.extensions.setAppearance
+
+class Shortcut @JvmOverloads constructor(
+    context: Context,
+    private val attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private var labelAttribute: String? = null
+    private var typeAttribute: Int? = null
+    private var backgroundColorResourceAttribute = 0
+    private var iconColorResourceAttribute = 0
+    private var labelTextAppearanceResourceAttribute = 0
+    private var iconAttribute: Int? = null
+    private var shortcutAttributesArray: TypedArray
+
+    private val labelContainer by lazy { findViewById<TextView>(R.id.shortCutLabel) }
+    private val backgroundContainer by lazy { findViewById<LinearLayout>(R.id.shortcutBackground) }
+    private val iconContainer by lazy { findViewById<ImageView>(R.id.shortCutIcon) }
+
+    init {
+        try {
+            View.inflate(context, R.layout.shortcut, this)
+        } catch (e: Exception) {
+            throw (MissingThemeException())
+        }
+
+        shortcutAttributesArray = context.obtainStyledAttributes(attrs, R.styleable.Shortcut)
+
+        getShortcutAttributes()
+        getAttributesFromTheme()
+        configureShortCutByType(typeAttribute)
+
+        shortcutAttributesArray.recycle()
+    }
+
+    fun setLabel(text: String?) {
+        labelContainer.text = text
+        labelContainer.setAppearance(labelTextAppearanceResourceAttribute)
+    }
+
+    fun getLabel(): CharSequence? {
+        return labelContainer.text
+    }
+
+    fun getType(): Int? = typeAttribute
+
+    fun setIcon(icon: Int?) {
+        icon?.apply {
+            iconContainer.setImageResource(icon)
+            iconContainer.setColorFilter(ContextCompat.getColor(context, iconColorResourceAttribute), android.graphics.PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    fun getIcon(): ImageView {
+        return iconContainer
+    }
+
+    private fun getAttributesFromTheme() {
+        try {
+            if (typeAttribute == CONTAINED) {
+                setContainedTypeAttributes()
+            } else {
+                setOutlinedTypeAttributes()
+            }
+        } catch (e: Exception) {
+            throw (MissingThemeException())
+        }
+    }
+
+    private fun setContainedTypeAttributes() {
+        context
+            .theme
+            .obtainStyledAttributes(
+                attrs,
+                R.styleable.Shortcut,
+                R.attr.shortcutContained,
+                0
+            )
+            .apply {
+                backgroundColorResourceAttribute = this.getResourceIdOrThrow(R.styleable.Shortcut_colorBackground)
+                iconColorResourceAttribute = this.getResourceIdOrThrow(R.styleable.Shortcut_colorIcon)
+                labelTextAppearanceResourceAttribute = this.getResourceIdOrThrow(R.styleable.Shortcut_labelAppearance)
+            }
+    }
+
+    private fun setOutlinedTypeAttributes() {
+        context
+            .theme
+            .obtainStyledAttributes(attrs, R.styleable.Shortcut, R.attr.shortcutOutlined, 0)
+            .apply {
+                backgroundColorResourceAttribute = this.getResourceIdOrThrow(R.styleable.Shortcut_colorBackground)
+                iconColorResourceAttribute = this.getResourceIdOrThrow(R.styleable.Shortcut_colorIcon)
+                labelTextAppearanceResourceAttribute = this.getResourceIdOrThrow(R.styleable.Shortcut_labelAppearance)
+            }
+    }
+
+    private fun getShortcutAttributes() {
+        getLabelAttribute()
+        getIconAttribute()
+        getTypeAttribute()
+    }
+
+    private fun getTypeAttribute() {
+        try {
+            typeAttribute = shortcutAttributesArray.getIntOrThrow(R.styleable.Shortcut_type)
+        } catch (e: Exception) {
+            throw (IllegalArgumentException("⚠️ ⚠️ Missing shortcut required argument. You MUST set the shortcut type(contained or outlined).", e))
+        }
+    }
+
+    private fun getIconAttribute() {
+        try {
+            iconAttribute = shortcutAttributesArray.getResourceIdOrThrow(R.styleable.Shortcut_icon)
+        } catch (e: Exception) {
+            throw (IllegalArgumentException("⚠️ ⚠️ Missing shortcut required argument. You MUST set the shortcut icon(drawable).", e))
+        }
+    }
+
+    private fun getLabelAttribute() {
+        try {
+            labelAttribute = shortcutAttributesArray.getStringOrThrow(R.styleable.Shortcut_textLabel)
+        } catch (e: Exception) {
+            throw (IllegalArgumentException("⚠️ ⚠️ Missing shortcut required argument. You MUST set the shortcut label(string).", e))
+        }
+    }
+
+    private fun configureShortCutByType(type: Int?) {
+        type?.apply {
+            setLabel(labelAttribute)
+            setIcon(iconAttribute)
+
+            when (this) {
+                CONTAINED -> setBackgroundContained()
+                OUTLINED -> setBackgroundOutlined()
+            }
+        }
+    }
+
+    private fun setBackgroundContained() {
+        val background = resources.getDrawable(R.drawable.shortcut_background, null)
+        val backgroundWrap = DrawableCompat.wrap(background).mutate()
+        DrawableCompat.setTint(backgroundWrap, ContextCompat.getColor(context, backgroundColorResourceAttribute))
+
+        backgroundContainer.background = background
+    }
+
+    private fun setBackgroundOutlined() {
+        val background = resources.getDrawable(R.drawable.shortcut_background, null) as GradientDrawable
+        background.setColor(ContextCompat.getColor(context, backgroundColorResourceAttribute))
+        background.setStroke(1, ContextCompat.getColor(context, iconColorResourceAttribute))
+
+        backgroundContainer.background = background
+        backgroundContainer.elevation = 0F
+    }
+
+    companion object {
+        const val OUTLINED = 0
+        const val CONTAINED = 1
+    }
+}
diff --git a/designsystem/src/main/res/drawable/shortcut_background.xml b/designsystem/src/main/res/drawable/shortcut_background.xml
new file mode 100644
index 000000000..52cec36d0
--- /dev/null
+++ b/designsystem/src/main/res/drawable/shortcut_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#FFFFFF"/>
+    <stroke android:color="#333333" android:width="1dp"/>
+</shape>
\ No newline at end of file
diff --git a/designsystem/src/main/res/drawable/shortcut_ripple_background.xml b/designsystem/src/main/res/drawable/shortcut_ripple_background.xml
new file mode 100644
index 000000000..ab07823b7
--- /dev/null
+++ b/designsystem/src/main/res/drawable/shortcut_ripple_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorHighlightOpacity05">
+    <item
+        android:id="@android:id/mask"
+        android:gravity="center">
+        <shape android:shape="oval">
+            <solid android:color="@android:color/white"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
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/layout/shortcut.xml b/designsystem/src/main/res/layout/shortcut.xml
new file mode 100644
index 000000000..e013a58cb
--- /dev/null
+++ b/designsystem/src/main/res/layout/shortcut.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:id="@+id/shortcutMainContainer"
+    android:layout_width="64dp"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="?spacingSmall"
+    android:layout_marginEnd="?spacingSmall"
+    tools:theme="@style/Theme.Natura">
+
+    <LinearLayout
+        android:id="@+id/shortcutRippleBackground"
+        android:layout_width="?sizeMediumX"
+        android:layout_height="?sizeMediumX"
+        android:background="@drawable/shortcut_ripple_background"
+        android:orientation="horizontal"
+        android:elevation="?elevation04"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/shortcutBackground" />
+
+    <LinearLayout
+        android:id="@+id/shortcutBackground"
+        android:layout_width="?sizeMediumX"
+        android:layout_height="?sizeMediumX"
+        android:background="@drawable/shortcut_background"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:elevation="?elevation02"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        tools:backgroundTint="?colorPrimary">
+
+        <ImageView
+            android:id="@+id/shortCutIcon"
+            android:layout_width="?sizeSemi"
+            android:layout_height="?sizeSemi"
+            tools:srcCompat="@drawable/ds_ic_filled_brand_naturarosacea" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/shortCutLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingTiny"
+        android:textAlignment="center"
+        tools:text="Shortcut big label to check the behavior"
+        android:textAppearance="?textAppearanceCaption"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintTop_toBottomOf="@+id/shortcutBackground"
+        app:layout_constraintVertical_bias="0.0" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 f334585c8..4fb2a4c64 100644
--- a/designsystem/src/main/res/values/ds_attrs.xml
+++ b/designsystem/src/main/res/values/ds_attrs.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <declare-styleable name="Shortcut" >
+        <attr name="type" format="enum">
+            <enum name="outlined" value="0"/>
+            <enum name="contained" value="1"/>
+        </attr>
+        <attr name="colorBackground" format="color"/>
+        <attr name="colorIcon" format="color"/>
+        <attr name="labelAppearance" format="reference"/>
+        <attr name="textLabel" format="string"/>
+        <attr name="icon" format="reference"/>
+    </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/ds_base_attrs.xml b/designsystem/src/main/res/values/ds_base_attrs.xml
index a1e6beedb..696fe08f9 100644
--- a/designsystem/src/main/res/values/ds_base_attrs.xml
+++ b/designsystem/src/main/res/values/ds_base_attrs.xml
@@ -26,6 +26,7 @@
 
     <attr name="colorHighEmphasisOpacity06" format="color"/>
     <attr name="colorMediumEmphasisOpacity06" format="color"/>
+    <attr name="colorHighlightOpacity05" format="color"/>
 
     <!-- spacing tokens attributes -->
     <attr name="spacingNone" format="dimension"/>
@@ -108,4 +109,8 @@
 
     <!-- Dialog references -->
     <attr name="dialogStandardTheme" format="reference"/>
+
+    <!-- Shortcut references -->
+    <attr name="shortcutOutlined" format="reference"/>
+    <attr name="shortcutContained" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/designsystem/src/main/res/values/ds_base_themes.xml b/designsystem/src/main/res/values/ds_base_themes.xml
index afff09e31..f90a7303d 100644
--- a/designsystem/src/main/res/values/ds_base_themes.xml
+++ b/designsystem/src/main/res/values/ds_base_themes.xml
@@ -28,6 +28,7 @@
 
         <item name="colorHighEmphasisOpacity06">#51333333</item>
         <item name="colorMediumEmphasisOpacity06">#51777777</item>
+        <item name="colorHighlightOpacity05">#3D000000</item>
 
         <item name="spacingNone">@dimen/ds_spacing_none</item>
         <item name="spacingMicro">@dimen/ds_spacing_micro</item>
@@ -116,6 +117,9 @@
         <item name="toolbarDefaultTheme">@style/Theme.DS.Toolbar</item>
 
         <item name="dialogStandardTheme">@style/Theme.DS.Dialog.Standard</item>
+
+        <item name="shortcutContained">@style/Widget.DS.Shortcut.Contained</item>
+        <item name="shortcutOutlined">@style/Widget.DS.Shortcut.Outlined</item>
     </style>
 
     <style name="Theme.DsBaseDark" parent="Theme.MaterialComponents.DayNight">
@@ -146,6 +150,7 @@
 
         <item name="colorHighEmphasisOpacity06">#51FAFAFA</item>
         <item name="colorMediumEmphasisOpacity06">#51BBBBBB</item>
+        <item name="colorHighlightOpacity05">#3DFFFFFF</item>
 
         <item name="spacingNone">@dimen/ds_spacing_none</item>
         <item name="spacingMicro">@dimen/ds_spacing_micro</item>
@@ -233,5 +238,8 @@
         <item name="toolbarHeight">@dimen/ds_toolbar_height</item>
 
         <item name="dialogStandardTheme">@style/Theme.DS.Dialog.Standard</item>
+
+        <item name="shortcutContained">@style/Widget.DS.Shortcut.Contained</item>
+        <item name="shortcutOutlined">@style/Widget.DS.Shortcut.Outlined</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/designsystem/src/main/res/values/styles.xml b/designsystem/src/main/res/values/styles.xml
index b9b65efb7..4c406845a 100644
--- a/designsystem/src/main/res/values/styles.xml
+++ b/designsystem/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <!-- DIALOG STYLES -->
     <style name="Theme.DS.Dialog.Standard" parent="@style/ThemeOverlay.MaterialComponents.Dialog.Alert">
         <item name="buttonBarPositiveButtonStyle">@style/Theme.DS.Dialog.Standard.MainButton.V23</item>
         <item name="buttonBarNegativeButtonStyle">@style/Theme.DS.Dialog.Standard.SecondaryButton.V23</item>
@@ -23,7 +23,6 @@
         <item name="android:layout_marginStart">?spacingMicro</item>
     </style>
 
-
     <!-- TYPOGRAPHY STYLES -->
     <style name="Heading1" parent="TextAppearance.MaterialComponents.Headline1">
         <item name="fontFamily">@string/font_roboto_regular</item>
@@ -159,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">
@@ -166,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">
@@ -180,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>
@@ -236,4 +242,21 @@
         <item name="android:textColor">@color/button_text_color_selector_dark</item>
         <item name="rippleColor">@color/button_ripple_color_dark</item>
     </style>
+
+    <!-- SHORTCUT STYLES -->
+    <style name="Widget.DS.Shortcut.Contained" parent="Widget.DS.Shortcut">
+        <item name="colorBackground">?colorPrimary</item>
+        <item name="colorIcon">?colorOnPrimary</item>
+    </style>
+
+    <style name="Widget.DS.Shortcut.Outlined" parent="Widget.DS.Shortcut">
+        <item name="colorBackground">?colorSurface</item>
+        <item name="colorIcon">?colorPrimary</item>
+    </style>
+
+    <style name="Widget.DS.Shortcut">
+        <item name="labelAppearance">?textAppearanceCaption</item>
+    </style>
+
+    <style name="Widget.DS"/>
 </resources>
\ No newline at end of file
diff --git a/designsystem/src/test/kotlin/com/natura/android/shortcut/ShortcutFixture.kt b/designsystem/src/test/kotlin/com/natura/android/shortcut/ShortcutFixture.kt
new file mode 100644
index 000000000..0fae96913
--- /dev/null
+++ b/designsystem/src/test/kotlin/com/natura/android/shortcut/ShortcutFixture.kt
@@ -0,0 +1,69 @@
+package com.natura.android.shortcut
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.natura.android.R
+import org.robolectric.Robolectric
+
+internal class ShortcutFixture private constructor(
+    private var type: Int? = null,
+    private var label: String? = null,
+    private var iconPath: String? = null,
+    private var context: Context = ApplicationProvider.getApplicationContext()
+) {
+
+    companion object {
+        private const val OUTLINED = 0
+        private const val CONTAINED = 1
+
+        private const val defaultType = OUTLINED
+        private const val defaultLabel = "shortcut label"
+        private const val defaultIcon = "@drawable/outlined_default_mockup"
+        private var context = ApplicationProvider.getApplicationContext<Context>()
+
+        fun aShortcut(): ShortcutFixture {
+            context.setTheme(R.style.Theme_Natura)
+            return ShortcutFixture(defaultType, defaultLabel, defaultIcon, context)
+        }
+
+        fun aEmptyShortcut(): ShortcutFixture {
+            return ShortcutFixture()
+        }
+    }
+
+    fun withTypeContained(): ShortcutFixture {
+        this.type = CONTAINED
+        return this
+    }
+
+    fun withTypeOutlined(): ShortcutFixture {
+        this.type = OUTLINED
+        return this
+    }
+
+    fun withLabel(label: String): ShortcutFixture {
+        this.label = label
+        return this
+    }
+
+    fun withIcon(icon: String): ShortcutFixture {
+        this.iconPath = icon
+        return this
+    }
+
+    fun withContext(customContext: Context): ShortcutFixture {
+        this.context = customContext
+        return this
+    }
+
+    fun build(): Shortcut {
+        val attributes = Robolectric
+            .buildAttributeSet()
+            .addAttribute(R.attr.type, type.toString())
+            .addAttribute(R.attr.icon, iconPath)
+            .addAttribute(R.attr.textLabel, label)
+            .build()
+
+        return Shortcut(context, attributes)
+    }
+}
diff --git a/designsystem/src/test/kotlin/com/natura/android/shortcut/ShortcutTest.kt b/designsystem/src/test/kotlin/com/natura/android/shortcut/ShortcutTest.kt
new file mode 100644
index 000000000..a478606bf
--- /dev/null
+++ b/designsystem/src/test/kotlin/com/natura/android/shortcut/ShortcutTest.kt
@@ -0,0 +1,146 @@
+package com.natura.android.shortcut
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.natura.android.R
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Shadows.shadowOf
+
+@RunWith(AndroidJUnit4::class)
+class ShortcutTest {
+
+    private lateinit var shortcut: Shortcut
+    private lateinit var context: Context
+
+    @Before
+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext()
+    }
+
+    @Test
+    fun checksIfShortcutOutlinedIconWasSet() {
+        shortcut = buildShortcutOutlined()
+
+        val iconShadow = shadowOf(shortcut.getIcon().drawable)
+
+        assertThat(iconShadow.createdFromResId).isEqualTo(R.drawable.outlined_default_mockup)
+    }
+
+    @Test
+    fun checksIfShortcutContainedIconWasSet() {
+        shortcut = buildShortcutContainedWithRequiredAttributes()
+
+        val iconShadow = shadowOf(shortcut.getIcon().drawable)
+
+        assertThat(iconShadow.createdFromResId).isEqualTo(R.drawable.outlined_default_mockup)
+    }
+
+    @Test
+    fun checksIfShortcutOutlinedLabelWasSet() {
+        shortcut = buildShortcutOutlined()
+
+        val label = shortcut.getLabel()
+
+        assertThat(label).isEqualTo("shortcut label")
+    }
+
+    @Test
+    fun checksIfShortcutIconChangesWhenSetIcon() {
+        shortcut = buildShortcutOutlined()
+
+        shortcut.setIcon(R.drawable.outlined_action_add)
+        val iconShadow = shadowOf(shortcut.getIcon().drawable)
+
+        assertThat(iconShadow.createdFromResId).isEqualTo(R.drawable.outlined_action_add)
+    }
+
+    @Test
+    fun checksIfShortcutContainedLabelWasSet() {
+        shortcut = buildShortcutContainedWithRequiredAttributes()
+
+        val label = shortcut.getLabel()
+
+        assertThat(label).isEqualTo("shortcut label")
+    }
+
+    @Test
+    fun checksIfShortcutLabelChangeWhenSetLabel() {
+        shortcut = buildShortcutContainedWithRequiredAttributes()
+
+        shortcut.setLabel("New label")
+
+        assertThat(shortcut.getLabel()).isEqualTo("New label")
+    }
+
+    @Test
+    fun checksIfShortcutOutlinedTypeWasSet() {
+        shortcut = buildShortcutOutlined()
+
+        val type = shortcut.getType()
+
+        assertThat(type).isEqualTo(0)
+    }
+
+    @Test
+    fun checksIfShortcutContainedTypeWasSet() {
+        shortcut = buildShortcutContainedWithRequiredAttributes()
+
+        val type = shortcut.getType()
+
+        assertThat(type).isEqualTo(1)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun shouldThrowsExceptionWhenBuildingContainedShortCutWithoutAnIcon() {
+        shortcut = ShortcutFixture
+            .aEmptyShortcut()
+            .withLabel("Label")
+            .withTypeContained()
+            .build()
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun shouldThrowsExceptionWhenBuildingOutlinedShortCutWithoutAnIcon() {
+        shortcut = ShortcutFixture
+            .aEmptyShortcut()
+            .withLabel("Label")
+            .withTypeOutlined()
+            .build()
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun shouldThrowsExceptionWhenBuildingContainedShortCutWithoutALabel() {
+        shortcut = ShortcutFixture
+            .aEmptyShortcut()
+            .withTypeContained()
+            .withIcon("@drawable/outlined_default_mockup")
+            .build()
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun shouldThrowsExceptionWhenBuildingOutlinedShortCutWithoutALabel() {
+        shortcut = ShortcutFixture
+            .aEmptyShortcut()
+            .withTypeOutlined()
+            .withIcon("@drawable/outlined_default_mockup")
+            .build()
+    }
+
+    private fun buildShortcutOutlined(): Shortcut {
+        return ShortcutFixture
+            .aShortcut()
+            .withTypeOutlined()
+            .build()
+    }
+
+    private fun buildShortcutContainedWithRequiredAttributes(): Shortcut {
+        return ShortcutFixture
+            .aShortcut()
+            .withTypeContained()
+            .build()
+    }
+}
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/doc/shortcut.md b/doc/shortcut.md
new file mode 100644
index 000000000..5e39d684c
--- /dev/null
+++ b/doc/shortcut.md
@@ -0,0 +1,60 @@
+# Shortcut
+
+## What is it?
+Shortcut is a component that represents a shortcut to some action.
+
+## How to use it?
+Shortcut receives an icon, a label and its type. The shortcut type represents
+it's visual style: contained or outlined.
+
+![Shortcut](shortcut_type.png)
+
+Following there's an example of an shortcut outlined code:
+
+```android
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutOutlined"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/outlined_default_mockup"
+        app:textLabel="Shortcut outlined sample"
+        app:type="outlined" />
+```
+
+Following there's an example of an shortcut contained code:
+
+```android
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutOutlined"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/outlined_default_mockup"
+        app:textLabel="Shortcut contained sample"
+        app:type="contained" />
+```
+
+**A shortcut is a DS component based on DS multibrand themes. It means
+if you want to use a shortcut in your app, you MUST set the DS theme
+on a view parent or in the shortcut component itself. [Check
+more info about how to set DS themes in your app](getting-started.md).**
+
+```android
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutOutlined"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/outlined_default_mockup"
+        app:textLabel="Shortcut sample"
+        app:type="outlined"
+        android:theme="@style/Theme.Natura"/>
+```
+
+### Setting shortcut action
+A shortcut behave similar to a button. So, to add action to it
+just set a shortcut click listenerr:
+
+```kotlin
+    shortcutContained1.setOnClickListener {
+        Toast.makeText(this, "Testing shortcut", Toast.LENGTH_SHORT).show()
+    }
+```
diff --git a/doc/shortcut_type.png b/doc/shortcut_type.png
new file mode 100644
index 000000000..30ff875e4
--- /dev/null
+++ b/doc/shortcut_type.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6519c4fac437fd942535ac08d41f9262fc05837ed912e93099b82b02a25d0cd2
+size 384929
diff --git a/sample/build.gradle b/sample/build.gradle
index b5e2ae074..a2bbb6e6b 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -65,8 +65,7 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$rootProject.androidxJunitVersion"
     testImplementation "androidx.test.espresso:espresso-intents:$rootProject.espressoIntentsVersion"
     testImplementation "io.mockk:mockk:$rootProject.mockKVersion"
-
-
+    testImplementation "androidx.test.ext:truth:$rootProject.truthVersion"
     testImplementation "junit:junit:$rootProject.junitVersion"
     testImplementation "androidx.test.ext:junit:$rootProject.androidxJunitVersion"
     testImplementation "org.robolectric:robolectric:$rootProject.robolectricVersion"
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 3c0a99ae7..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
@@ -133,6 +133,14 @@ class MainActivityFunctionalTests {
         onView(withText("Selection Control")).check(matches(isDisplayed()))
     }
 
+    @Test
+    fun shouldOpenShortcutScreenWhenTapOnItButton() {
+        onView(withId(R.id.shortcutButton)).perform(scrollTo())
+        onView(withId(R.id.shortcutButton)).perform(click())
+
+        onView(withText("Shortcut")).check(matches(isDisplayed()))
+    }
+
     @Test
     fun shouldOpenTextFieldScreenWhenTapOnItButton() {
         onView(withId(R.id.btnTextfield)).perform(scrollTo())
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/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index fa39b83ea..8172ba5cd 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -45,6 +45,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
+
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
@@ -95,6 +96,8 @@
             android:name=".components.ExpansionPanelActivity"
             android:theme="@style/Theme.Natura" />
         <activity android:name=".tokens.ColorsActivity" />
+        <activity
+            android:name=".components.ShortcutActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
index 1ea9e37f3..c223fa54c 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
@@ -80,6 +80,10 @@ class MainActivity : AppCompatActivity() {
             startActivity(Intent(this, SelectionControlActivity::class.java))
         }
 
+        shortcutButton.setOnClickListener {
+            startActivity(Intent(this, ShortcutActivity::class.java))
+        }
+
         btnTextfield.setOnClickListener {
             startActivity(Intent(this, TextFieldActivity::class.java))
         }
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/kotlin/com/natura/android/sample/components/ShortcutActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/ShortcutActivity.kt
new file mode 100644
index 000000000..2f2628d8e
--- /dev/null
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/ShortcutActivity.kt
@@ -0,0 +1,44 @@
+package com.natura.android.sample.components
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import com.natura.android.sample.R
+import com.natura.android.sample.setChosenDefaultTheme
+import com.natura.android.shortcut.Shortcut
+import kotlinx.android.synthetic.main.activity_shortcut.*
+
+class ShortcutActivity : AppCompatActivity() {
+    private var count = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setChosenDefaultTheme()
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_shortcut)
+
+        supportActionBar?.title = "Shortcut"
+        supportActionBar?.setHomeButtonEnabled(true)
+        setClickListener()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        onBackPressed()
+        return true
+    }
+
+    private fun setClickListener() {
+        for (i in 0 until shortcutContainer.childCount) {
+            if (shortcutContainer.getChildAt(i) is Shortcut) {
+                shortcutContainer.getChildAt(i).setOnClickListener {
+                    increaseCount()
+                }
+            }
+        }
+    }
+
+    private fun increaseCount() {
+        count += 1
+        counter.text = "Counter click $count"
+    }
+}
diff --git a/sample/src/main/kotlin/com/natura/android/sample/patterns/LogoActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/patterns/LogoActivity.kt
index 91fa2ba3a..a4b11f6be 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/patterns/LogoActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/patterns/LogoActivity.kt
@@ -1,8 +1,8 @@
 package com.natura.android.sample.patterns
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
 import com.natura.android.sample.R
 import com.natura.android.sample.setChosenDarkTheme
 import com.natura.android.sample.setChosenDefaultTheme
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/activity_logo.xml b/sample/src/main/res/layout/activity_logo.xml
index 45e3a05cd..a9f0e8f4e 100644
--- a/sample/src/main/res/layout/activity_logo.xml
+++ b/sample/src/main/res/layout/activity_logo.xml
@@ -22,7 +22,7 @@
         android:id="@+id/logoVertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="?attr/logoVertical"
+        android:src="?logoVertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,7 +32,7 @@
         android:id="@+id/logoHorizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="?attr/logoHorizontal"
+        android:src="?logoHorizontal"
         app:layout_constraintBottom_toTopOf="@+id/logoVertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index aaecae63b..26975a8c3 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -211,6 +211,18 @@
             android:background="@color/surface"
             android:textColor="@color/highEmphasis" />
 
+        <Button
+            android:id="@+id/shortcutButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Shortcut"
+            android:drawableRight="@drawable/ds_ic_outlined_navigation_arrowleft"
+            android:textAlignment="textStart"
+            android:layout_gravity="start"
+            android:padding="16dp"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
+
         <Button
             android:id="@+id/btnTextfield"
             android:layout_width="match_parent"
diff --git a/sample/src/main/res/layout/activity_shortcut.xml b/sample/src/main/res/layout/activity_shortcut.xml
new file mode 100644
index 000000000..86289a051
--- /dev/null
+++ b/sample/src/main/res/layout/activity_shortcut.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:id="@+id/shortcutContainer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".components.ShortcutActivity">
+
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutContained1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingSmall"
+        app:icon="@drawable/outlined_default_mockup"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/shortcutContained2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:textLabel="Contained/ Primary"
+        app:type="contained" />
+
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutContained2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingSmall"
+        app:icon="@drawable/outlined_default_mockup"
+        app:layout_constraintBottom_toBottomOf="@+id/shortcutContained1"
+        app:layout_constraintEnd_toStartOf="@+id/shortcutContained1"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/shortcutContained3"
+        app:layout_constraintTop_toTopOf="parent"
+        app:textLabel="Contained/ Primary"
+        app:type="contained" />
+
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutContained3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingSmall"
+        app:icon="@drawable/outlined_default_mockup"
+        app:layout_constraintBottom_toBottomOf="@+id/shortcutContained2"
+        app:layout_constraintEnd_toStartOf="@+id/shortcutContained2"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/shortcutContained4"
+        app:layout_constraintTop_toTopOf="parent"
+        app:textLabel="Contained/ Primary"
+        app:type="contained" />
+
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutContained4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingSmall"
+        app:icon="@drawable/outlined_default_mockup"
+        app:layout_constraintBottom_toBottomOf="@+id/shortcutContained3"
+        app:layout_constraintEnd_toStartOf="@+id/shortcutContained3"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:textLabel="Contained/ Primary"
+        app:type="contained" />
+
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutOutlined1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingSmall"
+        app:icon="@drawable/outlined_default_mockup"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/shortcutOutlined2"
+        app:layout_constraintTop_toBottomOf="@+id/shortcutContained1"
+        app:textLabel="Outlined/ Primary"
+        app:type="outlined" />
+
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutOutlined2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingSmall"
+        app:icon="@drawable/outlined_default_mockup"
+        app:layout_constraintBottom_toBottomOf="@+id/shortcutOutlined1"
+        app:layout_constraintEnd_toStartOf="@+id/shortcutOutlined1"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/shortcutOutlined3"
+        app:layout_constraintTop_toBottomOf="@+id/shortcutContained2"
+        app:textLabel="Outlined/ Primary"
+        app:type="outlined" />
+
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutOutlined3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingSmall"
+        app:icon="@drawable/outlined_default_mockup"
+        app:layout_constraintBottom_toBottomOf="@+id/shortcutOutlined2"
+        app:layout_constraintEnd_toStartOf="@+id/shortcutOutlined2"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/shortcutOutlined4"
+        app:layout_constraintTop_toBottomOf="@+id/shortcutContained3"
+        app:textLabel="Outlined/ Primary"
+        app:type="outlined" />
+
+    <com.natura.android.shortcut.Shortcut
+        android:id="@+id/shortcutOutlined4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingSmall"
+        app:icon="@drawable/outlined_default_mockup"
+        app:layout_constraintBottom_toBottomOf="@+id/shortcutOutlined3"
+        app:layout_constraintEnd_toStartOf="@+id/shortcutOutlined3"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/shortcutContained4"
+        app:textLabel="Outlined/ Primary"
+        app:type="outlined" />
+
+    <TextView
+        android:id="@+id/counter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:text="Counter click 0"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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
diff --git a/sample/src/test/kotlin/com/natura/android/sample/MainActivityTest.kt b/sample/src/test/kotlin/com/natura/android/sample/MainActivityTest.kt
index 5da499953..6b56bdfe1 100644
--- a/sample/src/test/kotlin/com/natura/android/sample/MainActivityTest.kt
+++ b/sample/src/test/kotlin/com/natura/android/sample/MainActivityTest.kt
@@ -239,14 +239,14 @@ class MainActivityTest {
     }
 
     @Test
-    fun checksOpacityButtonClickStartsSpacingScreen() {
-        val button = mainActivity.findViewById<Button>(R.id.opacityTokensButton)
+    fun checksShortcutyButtonClickStartsShortcutScreen() {
+        val button = mainActivity.findViewById<Button>(R.id.shortcutButton)
 
         button.performClick()
         val startedIntent = shadowActivity.peekNextStartedActivity()
         val shadowIntent = shadowOf(startedIntent)
 
-        assertEquals(OpacityActivity::class.java, shadowIntent.intentClass)
+        assertEquals(ShortcutActivity::class.java, shadowIntent.intentClass)
     }
 
     @Test
diff --git a/sample/src/test/kotlin/com/natura/android/sample/components/ShortcutActivityTest.kt b/sample/src/test/kotlin/com/natura/android/sample/components/ShortcutActivityTest.kt
new file mode 100644
index 000000000..4c7095123
--- /dev/null
+++ b/sample/src/test/kotlin/com/natura/android/sample/components/ShortcutActivityTest.kt
@@ -0,0 +1,43 @@
+package com.natura.android.sample.components
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth
+import kotlinx.android.synthetic.main.activity_shortcut.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ShortcutActivityTest {
+    lateinit var shortcutActivityScenario: ActivityScenario<ShortcutActivity>
+
+    @Before
+    fun setUp() {
+        shortcutActivityScenario = ActivityScenario.launch(ShortcutActivity::class.java)
+    }
+
+    @Test
+    fun incrementCounterWhenTapAtContainedShortcut() {
+        shortcutActivityScenario.onActivity { shortcutActivity ->
+            val shortcutContained = shortcutActivity.shortcutContained1
+            val counter = shortcutActivity.counter
+
+            shortcutContained.performClick()
+
+            Truth.assertThat(counter.text).isEqualTo("Counter click 1")
+        }
+    }
+
+    @Test
+    fun incrementCounterWhenTapAtOutlinedShortcut() {
+        shortcutActivityScenario.onActivity { shortcutActivity ->
+            val shortcutOutlined = shortcutActivity.shortcutOutlined1
+            val counter = shortcutActivity.counter
+
+            shortcutOutlined.performClick()
+
+            Truth.assertThat(counter.text).isEqualTo("Counter click 1")
+        }
+    }
+}