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 a4db7b9fa..56d08fb38 100644
--- a/designsystem/src/main/kotlin/com/natura/android/appbar/AppBar.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/appbar/AppBar.kt
@@ -12,7 +12,7 @@ import android.view.WindowManager
 import android.widget.ImageView
 import androidx.appcompat.widget.Toolbar
 import com.natura.android.R
-import com.natura.android.ext.setVisibilityFromBoolean
+import com.natura.android.extensions.setVisibilityFromBoolean
 import com.natura.android.badge.BadgeDrawable
 
 class AppBar(context: Context, attrs: AttributeSet) : Toolbar(context, attrs) {
diff --git a/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt b/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt
index 9d15b5b9c..94ade1d5b 100644
--- a/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt
@@ -26,7 +26,7 @@ class BadgeDrawable(
     private fun setBadge() {
         val icon = parent as LayerDrawable
         icon.mutate()
-        icon.setDrawableByLayerId(R.id.ic_badge_placeholder, this)
+        icon.setDrawableByLayerId(R.id.badge_placeholder, this)
     }
 
     override fun draw(canvas: Canvas) {
@@ -57,9 +57,7 @@ class BadgeDrawable(
         }
     }
 
-    private fun drawBadgeWithText(
-        canvas: Canvas
-    ) {
+    private fun drawBadgeWithText(canvas: Canvas) {
         defineTextBounds(count.toString())
         definePositionToDrawBadge(canvas)
     }
@@ -68,24 +66,16 @@ class BadgeDrawable(
         mTextPaint.getTextBounds(text, 0, count.toString().length, mTxtRect)
     }
 
-    private fun definePositionToDrawBadge(
-        canvas: Canvas
-    ) {
+    private fun definePositionToDrawBadge(canvas: Canvas) {
         val bounds = bounds
-
-        val badgeWith = when {
-            count > 99 -> getDimenFromTheme(R.attr.sizeSemi)
-            count > 9 -> getDimenFromTheme(R.attr.sizeStandard)
-            else -> getDimenFromTheme(R.attr.sizeSmall)
-        }
+        val badgeWith = mTxtRect.width() + getDimenFromTheme(R.attr.spacingTiny).toInt()
 
         context.resources.getDrawable(R.drawable.badge_rounded_rectangle, context.theme).apply {
             setBounds(
-                bounds.right - badgeWith.toInt(),
+                bounds.right - badgeWith,
                 bounds.top,
                 bounds.right,
-                getDimenFromTheme(R.attr.sizeSmall).toInt()
-            )
+                mTxtRect.height() + getDimenFromTheme(R.attr.spacingMicro).toInt())
             draw(canvas)
 
             drawText(
diff --git a/designsystem/src/main/kotlin/com/natura/android/extensions/TypedValue.kt b/designsystem/src/main/kotlin/com/natura/android/extensions/TypedValue.kt
new file mode 100644
index 000000000..5d0a4afe6
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/extensions/TypedValue.kt
@@ -0,0 +1,15 @@
+package com.natura.android.extensions
+
+import android.util.TypedValue
+
+/**
+ * Get an alpha value converted to base 255. Its in interesting use
+ * this method when you want to access a opacity token defined at
+ * theme and use it programmatically to set alpha on a component
+ * that receives a value between 0 and 255 inclusive, with 0 being
+ * transparent and 255 being opaque
+ * @return an int with the corresponding alpha value
+ */
+fun TypedValue.getAlphaAsBase255(): Int {
+    return (this.float * 255).toInt()
+}
diff --git a/designsystem/src/main/kotlin/com/natura/android/ext/View.kt b/designsystem/src/main/kotlin/com/natura/android/extensions/View.kt
similarity index 82%
rename from designsystem/src/main/kotlin/com/natura/android/ext/View.kt
rename to designsystem/src/main/kotlin/com/natura/android/extensions/View.kt
index adb761e65..5a9225dc7 100644
--- a/designsystem/src/main/kotlin/com/natura/android/ext/View.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/extensions/View.kt
@@ -1,4 +1,4 @@
-package com.natura.android.ext
+package com.natura.android.extensions
 
 import android.view.View
 
diff --git a/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt b/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt
new file mode 100644
index 000000000..a9abf8963
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt
@@ -0,0 +1,186 @@
+package com.natura.android.iconButton
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ImageView
+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 com.natura.android.R
+import com.natura.android.badge.BadgeDrawable
+import com.natura.android.exceptions.MissingThemeException
+import com.natura.android.resources.getColorTokenFromTheme
+import com.natura.android.resources.getIconResourceIdFromName
+
+class IconButton @JvmOverloads constructor(
+    context: Context,
+    private val attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private var iconButtonAttributesArray: TypedArray
+
+    private var iconColorResourceAttribute = 0
+    private var rippleDrawableResourceAttribute = 0
+
+    private var iconNameAttribute: String? = null
+    private var colorAttribute: Int? = null
+    private var notifyAttribute: Int = 0
+    private var enabledAttribute: Boolean = false
+
+    private val iconButton by lazy { findViewById<ImageView>(R.id.iconButtonIcon) }
+    private val iconButtonContainer by lazy { findViewById<ConstraintLayout>(R.id.iconButtonContainer) }
+    private val badgeContainer by lazy { findViewById<ImageView>(R.id.iconButtonBadgeContainer) }
+
+    init {
+        try {
+            View.inflate(context, R.layout.icon_button, this)
+        } catch (e: Exception) {
+            throw (MissingThemeException())
+        }
+
+        iconButtonAttributesArray = context.obtainStyledAttributes(attrs, R.styleable.IconButton)
+
+        getAttributes()
+        getAppereanceAttributesFromTheme()
+
+        configureAppearance()
+        configureNotification()
+        configureEnabled()
+
+        iconButtonAttributesArray.recycle()
+    }
+
+    private fun configureEnabled() {
+        isEnabled = enabledAttribute
+    }
+
+    private fun configureNotification() {
+        if (notifyAttribute > 0) {
+            badgeContainer.visibility = View.VISIBLE
+            BadgeDrawable(context, notifyAttribute, badgeContainer.drawable)
+        }
+    }
+
+    override fun setEnabled(enabled: Boolean) {
+        iconButton.isEnabled = enabled
+        if (!enabled) {
+            setDisabledColor()
+        }
+        super.setEnabled(enabled)
+    }
+
+    private fun setDisabledColor() {
+        iconButton.setColorFilter(getColorTokenFromTheme(context, R.attr.colorMediumEmphasis), android.graphics.PorterDuff.Mode.SRC_IN)
+    }
+
+    fun setIcon(icon: String?) {
+        icon?.apply {
+            val iconDrawableId = getIconResourceIdFromName(context, icon)
+            iconButton.setImageResource(iconDrawableId)
+        }
+    }
+
+    fun getIcon(): ImageView {
+        return iconButton
+    }
+
+    fun getBadge(): ImageView {
+        return badgeContainer
+    }
+
+    fun getColor(): Int? {
+        return colorAttribute
+    }
+
+    private fun getAttributes() {
+        getIconName()
+        getColorAttribute()
+        getEnabledAttribute()
+        getNotify()
+    }
+
+    private fun getNotify() {
+        notifyAttribute = iconButtonAttributesArray.getInteger(R.styleable.IconButton_notify, 0)
+    }
+
+    private fun getIconName() {
+        try {
+            iconNameAttribute = iconButtonAttributesArray.getStringOrThrow(R.styleable.IconButton_iconName)
+        } catch (e: Exception) {
+            throw (IllegalArgumentException("⚠️ ⚠️ Missing iconName required argument. You MUST set the icon name.", e))
+        }
+    }
+
+    private fun getColorAttribute() {
+        try {
+            colorAttribute = iconButtonAttributesArray.getIntOrThrow(R.styleable.IconButton_buttonColor)
+        } catch (e: Exception) {
+            throw (IllegalArgumentException("⚠️ ⚠️ Missing iconButton required argument. You MUST set the iconButton color.", e))
+        }
+    }
+
+    private fun getEnabledAttribute() {
+        enabledAttribute = iconButtonAttributesArray.getBoolean(R.styleable.IconButton_android_enabled, true)
+    }
+
+    private fun getAppereanceAttributesFromTheme() {
+        try {
+            when (colorAttribute) {
+                PRIMARY -> {
+                    setColorAttribute(R.attr.iconButtonPrimary)
+                    setDrawableRippleAttribute(R.attr.iconButtonPrimary)
+                }
+                DEFAULT -> {
+                    setColorAttribute(R.attr.iconButtonDefault)
+                    setDrawableRippleAttribute(R.attr.iconButtonDefault)
+                }
+            }
+        } catch (e: Exception) {
+            throw (MissingThemeException())
+        }
+    }
+
+    private fun setDrawableRippleAttribute(iconButtonStyleFromTheme: Int) {
+        context
+            .theme
+            .obtainStyledAttributes(
+                attrs,
+                R.styleable.IconButton,
+                iconButtonStyleFromTheme,
+                0
+            )
+            .apply {
+                rippleDrawableResourceAttribute = this.getResourceIdOrThrow(R.styleable.IconButton_rippleDrawable)
+            }
+    }
+
+    private fun setColorAttribute(attribute: Int) {
+        context
+            .theme
+            .obtainStyledAttributes(
+                attrs,
+                R.styleable.IconButton,
+                attribute,
+                0
+            )
+            .apply {
+                iconColorResourceAttribute = this.getResourceIdOrThrow(R.styleable.IconButton_iconColor)
+            }
+    }
+
+    private fun configureAppearance() {
+        setIcon(iconNameAttribute)
+        iconButton.setColorFilter(ContextCompat.getColor(context, iconColorResourceAttribute), android.graphics.PorterDuff.Mode.SRC_IN)
+        iconButtonContainer.background = resources.getDrawable(rippleDrawableResourceAttribute, context.theme)
+    }
+
+    companion object {
+        const val DEFAULT = 0
+        const val PRIMARY = 1
+    }
+}
diff --git a/designsystem/src/main/kotlin/com/natura/android/menu/MenuView.kt b/designsystem/src/main/kotlin/com/natura/android/menu/MenuView.kt
index beaa46ea9..f6b8b9597 100644
--- a/designsystem/src/main/kotlin/com/natura/android/menu/MenuView.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/menu/MenuView.kt
@@ -11,7 +11,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import com.natura.android.R
-import com.natura.android.ext.setVisibilityFromBoolean
+import com.natura.android.extensions.setVisibilityFromBoolean
 import com.natura.android.tag.Tag
 
 @SuppressLint("CustomViewStyleable")
diff --git a/designsystem/src/main/kotlin/com/natura/android/resources/Resources.kt b/designsystem/src/main/kotlin/com/natura/android/resources/Resources.kt
new file mode 100644
index 000000000..3c269b5d9
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/resources/Resources.kt
@@ -0,0 +1,18 @@
+package com.natura.android.resources
+
+import android.content.Context
+import com.natura.android.R
+import com.natura.android.resources.ResourcesConstants.DRAWABLE_NOT_FOUND
+
+fun getIconResourceIdFromName(context: Context, iconName: String): Int {
+    var drawableId = context.resources.getIdentifier(iconName.replace("-", "_"), "drawable", context.packageName)
+
+    if (drawableId == DRAWABLE_NOT_FOUND) {
+        drawableId = R.drawable.default_icon_outlined_default_mockup
+    }
+    return drawableId
+}
+
+object ResourcesConstants {
+    const val DRAWABLE_NOT_FOUND = 0
+}
diff --git a/designsystem/src/main/kotlin/com/natura/android/resources/Theme.kt b/designsystem/src/main/kotlin/com/natura/android/resources/Theme.kt
new file mode 100644
index 000000000..ece42921e
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/resources/Theme.kt
@@ -0,0 +1,16 @@
+package com.natura.android.resources
+
+import android.content.Context
+import android.util.TypedValue
+
+fun getColorTokenFromTheme(context: Context, attrColorId: Int): Int {
+    val value = TypedValue()
+    context.theme.resolveAttribute(attrColorId, value, true)
+    return value.data
+}
+
+fun getDimenFromTheme(context: Context, attributeName: Int): Float {
+    val typedValue = TypedValue()
+    context.theme.resolveAttribute(attributeName, typedValue, true)
+    return typedValue.getDimension(context.resources.displayMetrics)
+}
diff --git a/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt b/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt
index f6b8836e0..438bb35e6 100644
--- a/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt
@@ -16,6 +16,7 @@ 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.resources.getIconResourceIdFromName
 import com.natura.android.extensions.setAppearance
 
 class Shortcut @JvmOverloads constructor(
@@ -65,22 +66,13 @@ class Shortcut @JvmOverloads constructor(
 
     fun setIcon(icon: String?) {
         icon?.apply {
-            val drawableId = context.resources.getIdentifier(icon.replace("-", "_"), "drawable", context.packageName)
-
-            if (drawableId == ICON_NOT_FOUND) {
-                configDefaultIconIfEmpty()
-            } else {
-                iconContainer.setImageResource(drawableId)
-            }
+            val drawableId = getIconResourceIdFromName(context, icon)
 
+            iconContainer.setImageResource(drawableId)
             iconContainer.setColorFilter(ContextCompat.getColor(context, iconColorResourceAttribute), android.graphics.PorterDuff.Mode.SRC_IN)
         }
     }
 
-    private fun configDefaultIconIfEmpty() {
-        iconContainer.setImageResource(R.drawable.default_icon_outlined_default_mockup)
-    }
-
     fun getIcon(): ImageView {
         return iconContainer
     }
@@ -184,7 +176,6 @@ class Shortcut @JvmOverloads constructor(
     }
 
     companion object {
-        const val ICON_NOT_FOUND = 0
         const val OUTLINED = 0
         const val CONTAINED = 1
     }
diff --git a/designsystem/src/main/res/drawable/default_icon_outlined_navigation_arrowleft.xml b/designsystem/src/main/res/drawable/default_icon_outlined_navigation_arrowleft.xml
new file mode 100644
index 000000000..5dc476c62
--- /dev/null
+++ b/designsystem/src/main/res/drawable/default_icon_outlined_navigation_arrowleft.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.65 17.25A0.46 0.46 0 0 1 9.3 17.1a0.48 0.48 0 0 1 0-0.7l4.35-4.41l-4.35-4.4A0.5 0.5 0 1 1 10 6.9l4.72 4.72c0.09 0.1 0.14 0.22 0.14 0.35a0.64 0.64 0 0 1-0.14 0.4L10 17.09a0.48 0.48 0 0 1-0.35 0.17z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/icon_base_badge.xml b/designsystem/src/main/res/drawable/icon_base_badge.xml
index 281783ae0..42352cb97 100644
--- a/designsystem/src/main/res/drawable/icon_base_badge.xml
+++ b/designsystem/src/main/res/drawable/icon_base_badge.xml
@@ -6,7 +6,6 @@
         android:gravity="right" />
 
     <item
-        android:id="@+id/ic_badge_placeholder"
+        android:id="@+id/badge_placeholder"
         android:drawable="@android:color/transparent" />
-
 </layer-list>
\ No newline at end of file
diff --git a/designsystem/src/main/res/drawable/icon_button_base_badge.xml b/designsystem/src/main/res/drawable/icon_button_base_badge.xml
new file mode 100644
index 000000000..83aa92de8
--- /dev/null
+++ b/designsystem/src/main/res/drawable/icon_button_base_badge.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/badge_placeholder"
+        android:drawable="@android:color/transparent" />
+</layer-list>
\ No newline at end of file
diff --git a/designsystem/src/main/res/drawable/iconbutton_ripple_background_default.xml b/designsystem/src/main/res/drawable/iconbutton_ripple_background_default.xml
new file mode 100644
index 000000000..ab07823b7
--- /dev/null
+++ b/designsystem/src/main/res/drawable/iconbutton_ripple_background_default.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/drawable/iconbutton_ripple_background_primary.xml b/designsystem/src/main/res/drawable/iconbutton_ripple_background_primary.xml
new file mode 100644
index 000000000..1159aad73
--- /dev/null
+++ b/designsystem/src/main/res/drawable/iconbutton_ripple_background_primary.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorPrimary">
+    <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/icon_button.xml b/designsystem/src/main/res/layout/icon_button.xml
new file mode 100644
index 000000000..6a26c5807
--- /dev/null
+++ b/designsystem/src/main/res/layout/icon_button.xml
@@ -0,0 +1,42 @@
+<?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"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/iconButtonContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:padding="?spacingMicro"
+        tools:theme="@style/Theme.Natura">
+
+        <ImageView
+            android:id="@+id/iconButtonIcon"
+            android:layout_width="?sizeStandard"
+            android:layout_height="?sizeStandard"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="false"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:src="@drawable/default_icon_outlined_default_mockup"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    <ImageView
+        android:id="@+id/iconButtonBadgeContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="invisible"
+        android:src="@drawable/icon_button_base_badge"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 7af86eb2b..17039dce3 100644
--- a/designsystem/src/main/res/values/ds_attrs.xml
+++ b/designsystem/src/main/res/values/ds_attrs.xml
@@ -90,4 +90,16 @@
         <attr name="title" format="string" />
     </declare-styleable>
 
+    <declare-styleable name="IconButton">
+        <attr name="android:enabled" />
+        <attr name="iconName" />
+        <attr name="buttonColor" format="enum">
+            <enum name="defaultColor" value="0"/>
+            <enum name="primaryColor" value="1"/>
+        </attr>
+        <attr name="notify" format="integer"/>
+        <attr name="iconColor" format="reference"/>
+        <attr name="rippleDrawable" format="reference"/>
+    </declare-styleable>
+
 </resources>
diff --git a/designsystem/src/main/res/values/ds_base_attrs.xml b/designsystem/src/main/res/values/ds_base_attrs.xml
index 4962ba9de..9fcb2af30 100644
--- a/designsystem/src/main/res/values/ds_base_attrs.xml
+++ b/designsystem/src/main/res/values/ds_base_attrs.xml
@@ -112,6 +112,9 @@
     <attr name="outlinedButtonLarge" format="reference"/>
     <attr name="textButtonLarge" format="reference"/>
 
+    <attr name="iconButtonDefault" format="reference"/>
+    <attr name="iconButtonPrimary" format="reference"/>
+
     <!-- App Bar Style references -->
     <attr name="toolbarHeight" format="dimension"/>
     <attr name="toolbarDefaultTheme" format="reference"/>
diff --git a/designsystem/src/main/res/values/ds_base_themes.xml b/designsystem/src/main/res/values/ds_base_themes.xml
index 863217718..aa4ebe515 100644
--- a/designsystem/src/main/res/values/ds_base_themes.xml
+++ b/designsystem/src/main/res/values/ds_base_themes.xml
@@ -129,6 +129,9 @@
         <item name="outlinedButtonLarge">@style/Widget.DS.ButtonLarge.Outlined.V23</item>
         <item name="textButtonLarge">@style/Widget.DS.ButtonLarge.TextButton.V23</item>
 
+        <item name="iconButtonPrimary">@style/Widget.DS.IconButton.Primary</item>
+        <item name="iconButtonDefault">@style/Widget.DS.IconButton.Default</item>
+
         <item name="toolbarStyle">@style/Widget.DS.AppBarTop</item>
         <item name="toolbarHeight">@dimen/ds_toolbar_height</item>
         <item name="toolbarDefaultTheme">@style/Theme.DS.Toolbar</item>
@@ -270,6 +273,9 @@
         <item name="outlinedButtonLarge">@style/Widget.DS.ButtonLarge.Outlined.V23</item>
         <item name="textButtonLarge">@style/Widget.DS.ButtonLarge.TextButton.V23</item>
 
+        <item name="iconButtonPrimary">@style/Widget.DS.IconButton.Primary</item>
+        <item name="iconButtonDefault">@style/Widget.DS.IconButton.Default</item>
+
         <item name="toolbarStyle">@style/Widget.DS.AppBarTop</item>
         <item name="toolbarDefaultTheme">@style/Theme.DS.Toolbar</item>
         <item name="toolbarHeight">@dimen/ds_toolbar_height</item>
diff --git a/designsystem/src/main/res/values/styles.xml b/designsystem/src/main/res/values/styles.xml
index a0f5b2987..206cc2c14 100644
--- a/designsystem/src/main/res/values/styles.xml
+++ b/designsystem/src/main/res/values/styles.xml
@@ -341,6 +341,28 @@
         <item name="android:minHeight">?sizeMedium</item>
     </style>
 
+
+    <!-- ICON BUTTON STYLES -->
+
+    <style name="Widget.DS.IconButton" parent="Widget.MaterialComponents.Button">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
+
+    <style name="Widget.DS.IconButton.Disabled" parent="Widget.DS.IconButton">
+        <item name="iconColor">?colorMediumEmphasis</item>
+    </style>
+
+    <style name="Widget.DS.IconButton.Primary" parent="Widget.DS.IconButton">
+        <item name="iconColor">?colorPrimary</item>
+        <item name="rippleDrawable">@drawable/iconbutton_ripple_background_primary</item>
+    </style>
+
+    <style name="Widget.DS.IconButton.Default" parent="Widget.DS.IconButton">
+        <item name="iconColor">?colorHighEmphasis</item>
+        <item name="rippleDrawable">@drawable/iconbutton_ripple_background_default</item>
+    </style>
+
     <!-- SHORTCUT STYLES -->
     <style name="Widget.DS.Shortcut.Contained" parent="Widget.DS.Shortcut">
         <item name="colorBackground">?colorPrimary</item>
diff --git a/designsystem/src/test/kotlin/com/natura/android/iconButton/IconButtonFixture.kt b/designsystem/src/test/kotlin/com/natura/android/iconButton/IconButtonFixture.kt
new file mode 100644
index 000000000..7110339d1
--- /dev/null
+++ b/designsystem/src/test/kotlin/com/natura/android/iconButton/IconButtonFixture.kt
@@ -0,0 +1,71 @@
+package com.natura.android.iconButton
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.natura.android.R
+import org.robolectric.Robolectric
+
+internal class IconButtonFixture private constructor(
+    private var buttonColor: Int? = null,
+    private var enabled: Boolean? = true,
+    private var iconPath: String? = null,
+    private var notify: Int = 0,
+    private var context: Context = ApplicationProvider.getApplicationContext()
+) {
+    companion object {
+        private const val DEFAULT = 0
+        private const val PRIMARY = 1
+
+        private const val buttonColor = DEFAULT
+        private const val enabled = true
+        private const val icon = "outlined_default_mockup"
+        private const val notify = 0
+        private var context = ApplicationProvider.getApplicationContext<Context>()
+
+        fun aIconButton(): IconButtonFixture {
+            context.setTheme(R.style.Theme_Natura)
+            return IconButtonFixture(buttonColor, enabled, icon, notify, context)
+        }
+
+        fun aEmptyIconButton(): IconButtonFixture {
+            return IconButtonFixture()
+        }
+    }
+
+    fun withColorDefault(): IconButtonFixture {
+        this.buttonColor = DEFAULT
+        return this
+    }
+
+    fun withColorPrimary(): IconButtonFixture {
+        this.buttonColor = PRIMARY
+        return this
+    }
+
+    fun withDisabled(): IconButtonFixture {
+        this.enabled = false
+        return this
+    }
+
+    fun withIcon(icon: String): IconButtonFixture {
+        this.iconPath = icon
+        return this
+    }
+
+    fun withNotification(value: Int): IconButtonFixture {
+        this.notify = value
+        return this
+    }
+
+    fun build(): IconButton {
+        val attributes = Robolectric
+            .buildAttributeSet()
+            .addAttribute(R.attr.buttonColor, buttonColor?.toString() ?: 0.toString())
+            .addAttribute(R.attr.iconName, iconPath)
+            .addAttribute(R.attr.notify, notify.toString())
+            .addAttribute(android.R.attr.enabled, enabled.toString())
+            .build()
+
+        return IconButton(context, attributes)
+    }
+}
diff --git a/designsystem/src/test/kotlin/com/natura/android/iconButton/IconButtonTest.kt b/designsystem/src/test/kotlin/com/natura/android/iconButton/IconButtonTest.kt
new file mode 100644
index 000000000..4daad5def
--- /dev/null
+++ b/designsystem/src/test/kotlin/com/natura/android/iconButton/IconButtonTest.kt
@@ -0,0 +1,137 @@
+package com.natura.android.iconButton
+
+import android.view.View
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth
+import com.natura.android.R
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Shadows
+import org.robolectric.annotation.Config
+@Config(sdk = [28])
+@RunWith(AndroidJUnit4::class)
+class IconButtonTest {
+
+    @Test
+    fun checksIfIconButtonPrimaryColorIconWasSet() {
+        val iconButton = buildIconButtonPrimary()
+
+        val iconShadow = Shadows.shadowOf(iconButton.getIcon().drawable)
+
+        Truth.assertThat(iconShadow.createdFromResId).isEqualTo(R.drawable.default_icon_outlined_default_mockup)
+    }
+
+    @Test
+    fun checksIfIconButtonDefaultColorIconWasSet() {
+        val iconButton = buildIconButtonDefault()
+
+        val iconShadow = Shadows.shadowOf(iconButton.getIcon().drawable)
+
+        Truth.assertThat(iconShadow.createdFromResId).isEqualTo(R.drawable.default_icon_outlined_default_mockup)
+    }
+
+    @Test
+    fun checksIfIconButtonIconChangesWhenSetIcon() {
+        val iconButton = buildIconButtonDefault()
+
+        iconButton.setIcon("outlined_action_add")
+        val iconShadow = Shadows.shadowOf(iconButton.getIcon().drawable)
+
+        Truth.assertThat(iconShadow.createdFromResId).isEqualTo(R.drawable.default_icon_outlined_default_mockup)
+    }
+
+    @Test
+    fun checksIfIconButtonPrimaryColorWasSet() {
+        val iconButton = buildIconButtonPrimary()
+
+        val color = iconButton.getColor()
+
+        Truth.assertThat(color).isEqualTo(PRIMARY)
+    }
+
+    @Test
+    fun checksIfIconButtonDefaultColorWasSet() {
+        val iconButton = buildIconButtonDefault()
+
+        val color = iconButton.getColor()
+
+        Truth.assertThat(color).isEqualTo(DEFAULT)
+    }
+
+    @Test
+    fun `Given disabled flag is false, when IconButton is created, isEnabled attribute is false`() {
+        val iconButton = buildIconButtonDisabled()
+
+        val enabled = iconButton.isEnabled
+
+        Truth.assertThat(enabled).isEqualTo(false)
+    }
+
+    @Test
+    fun `Given notify attribute is bigger than 0, when IconButton is created, then badge should be visible`() {
+        val iconButton = buildIconButtonWithNotification()
+
+        val badge = iconButton.getBadge()
+
+        Truth.assertThat(badge.visibility).isEqualTo(View.VISIBLE)
+    }
+
+    @Test
+    fun `Given notify attribute is 0, when IconButton is created, then badge should NOT be visible`() {
+        val iconButton = buildIconButtonPrimary()
+
+        val badge = iconButton.getBadge()
+
+        Truth.assertThat(badge.visibility).isEqualTo(View.INVISIBLE)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun shouldThrowsExceptionWhenBuildingIconButtonWithoutAnIcon() {
+        IconButtonFixture
+            .aEmptyIconButton()
+            .withColorPrimary()
+            .build()
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun shouldThrowsExceptionWhenBuildingIconButtonCutWithoutAColor() {
+        IconButtonFixture
+            .aEmptyIconButton()
+            .withIcon("default_icon_outlined_default_mockup")
+            .build()
+    }
+
+    private fun buildIconButtonWithNotification(): IconButton {
+        return IconButtonFixture
+            .aIconButton()
+            .withNotification(4)
+            .build()
+    }
+
+    private fun buildIconButtonPrimary(): IconButton {
+        return IconButtonFixture
+            .aIconButton()
+            .withColorPrimary()
+            .build()
+    }
+
+    private fun buildIconButtonDefault(): IconButton {
+        return IconButtonFixture
+            .aIconButton()
+            .withColorDefault()
+            .build()
+    }
+
+    private fun buildIconButtonDisabled(): IconButton {
+        return IconButtonFixture
+            .aIconButton()
+            .withDisabled()
+            .build()
+    }
+
+    companion object {
+        private const val DEFAULT = 0
+        private const val PRIMARY = 1
+        private const val OPACITY05_BASE255 = 61
+    }
+}
diff --git a/doc/iconbutton.md b/doc/iconbutton.md
new file mode 100644
index 000000000..f3b3705a4
--- /dev/null
+++ b/doc/iconbutton.md
@@ -0,0 +1,24 @@
+# Icon Button
+
+### What is it?
+Icons are also appropriate for toggle buttons that allow a single choice to be selected or deselected, such as adding or removing a star to an item.
+
+### When should I use it?
+Icon buttons are commonly found in app bars and toolbars.
+
+### How to use it?
+
+Add the TextField component in your xml layout file
+
+```android
+    <com.natura.android.iconButton.IconButton
+            android:id="@+id/iconButtonDefault"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:buttonColor="defaultColor"
+            app:iconName="outlined_action_calendar" />
+```
+#### Icon Button component has the following attributes that can be set:
+- `android:enabled` : when true, the button is active, when false the button is inactive
+- `app:iconName` : receives a string with the drawable to be render at button
+- `app:buttonColor` : receives two values, `default` or `primary`
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index d41aa0e9b..f5494e339 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -101,6 +101,7 @@
         <activity android:name=".tokens.ColorsActivity" />
         <activity android:name=".components.ShortcutActivity" />
         <activity android:name=".components.TagActivity" />
+        <activity android:name=".components.IconButtonActivity"/>
     </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 baa068983..68a40b31c 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
@@ -76,6 +76,10 @@ class MainActivity : AppCompatActivity() {
             startActivity(Intent(this, ExpansionPanelActivity::class.java))
         }
 
+        iconButtonButton.setOnClickListener {
+            startActivity(Intent(this, IconButtonActivity::class.java))
+        }
+
         btnSelection.setOnClickListener {
             startActivity(Intent(this, SelectionControlActivity::class.java))
         }
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/IconButtonActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/IconButtonActivity.kt
new file mode 100644
index 000000000..ea545a8f4
--- /dev/null
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/IconButtonActivity.kt
@@ -0,0 +1,38 @@
+package com.natura.android.sample.components
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import com.natura.android.iconButton.IconButton
+import com.natura.android.sample.R
+import com.natura.android.sample.setChosenDefaultTheme
+import kotlinx.android.synthetic.main.activity_icon_button.*
+
+class IconButtonActivity : AppCompatActivity() {
+    private var count = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setChosenDefaultTheme()
+
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_icon_button)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.title = "Icon Button"
+        setClickListener()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        onBackPressed()
+        return true
+    }
+
+    private fun setClickListener() {
+        for (i in 0 until iconButtonContainer.childCount) {
+            if (iconButtonContainer.getChildAt(i) is IconButton) {
+                iconButtonContainer.getChildAt(i).setOnClickListener {
+                }
+            }
+        }
+    }
+}
diff --git a/sample/src/main/res/layout/activity_icon_button.xml b/sample/src/main/res/layout/activity_icon_button.xml
new file mode 100644
index 000000000..59b2c7b33
--- /dev/null
+++ b/sample/src/main/res/layout/activity_icon_button.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical|center_horizontal"
+    android:id="@+id/iconButtonContainer"
+    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.natura.android.iconButton.IconButton
+        android:id="@+id/iconButtonDefault"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:buttonColor="defaultColor"
+        app:iconName="outlined_action_calendar"
+        app:notify="999"
+        android:layout_gravity="center_horizontal"/>
+
+    <TextView
+        android:id="@+id/iconButtonDefaultLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingMicro"
+        android:layout_marginBottom="?spacingLarge"
+        android:text="Default"
+        android:textAlignment="center"
+        android:textAppearance="?textAppearanceCaption"
+        android:layout_gravity="center_horizontal"/>
+
+    <com.natura.android.iconButton.IconButton
+        android:id="@+id/iconButtonPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:buttonColor="primaryColor"
+        app:iconName="outlined_action_calendar"
+        app:notify="4"
+        android:layout_gravity="center_horizontal"/>
+
+    <TextView
+        android:id="@+id/iconButtonPrimaryLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingMicro"
+        android:layout_marginBottom="?spacingLarge"
+        android:text="Primary"
+        android:textAlignment="center"
+        android:textAppearance="?textAppearanceCaption"
+        android:layout_gravity="center_horizontal"/>
+
+    <com.natura.android.iconButton.IconButton
+        android:id="@+id/iconButtonDefaultDisabled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:buttonColor="defaultColor"
+        android:enabled="false"
+        app:iconName="outlined_action_calendar"
+        android:layout_gravity="center_horizontal"/>
+
+    <TextView
+        android:id="@+id/iconButtonDefaultLabelDisabled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingMicro"
+        android:layout_marginBottom="?spacingLarge"
+        android:text="Default disabled"
+        android:textAlignment="center"
+        android:textAppearance="?textAppearanceCaption"
+        android:layout_gravity="center_horizontal"/>
+
+    <com.natura.android.iconButton.IconButton
+        android:id="@+id/iconButtonPrimaryDisabled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:buttonColor="primaryColor"
+        android:enabled="false"
+        app:iconName="outlined_action_calendar"
+        android:layout_gravity="center_horizontal"/>
+
+    <TextView
+        android:id="@+id/iconButtonPrimaryLabelDisabled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?spacingMicro"
+        android:layout_marginBottom="?spacingLarge"
+        android:text="Primary disabled"
+        android:textAlignment="center"
+        android:textAppearance="?textAppearanceCaption"
+        android:layout_gravity="center_horizontal"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 77785fa9f..94f4fb5ee 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -26,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Border Radius"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -38,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Color"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -50,7 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Elevation"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -62,7 +62,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Icons (drawables)"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -74,7 +74,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Icons (fonts)"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -86,7 +86,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Opacity"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -98,7 +98,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Size"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -110,7 +110,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Spacing"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -122,7 +122,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Typography"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -144,7 +144,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="App Bar (Top and Search)"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -156,7 +156,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Badge"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -168,7 +168,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Button"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -180,7 +180,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Dialog"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_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/iconButtonButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Icon Button"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -192,7 +204,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Expansion Panel"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -204,7 +216,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Progress Indicator"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -216,7 +228,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Selection Control"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -228,7 +240,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Shortcut"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -240,7 +252,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Tag"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -252,7 +264,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Text Field"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -264,7 +276,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Value Text Highlight"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -285,7 +297,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Error Default"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -297,7 +309,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Logo"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -309,7 +321,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Navigation Drawer"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -321,7 +333,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Menu Item"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
@@ -333,7 +345,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Submenu Item"
-            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:drawableRight="@drawable/default_icon_outlined_navigation_arrowleft"
             android:textAlignment="textStart"
             android:layout_gravity="start"
             android:padding="16dp"
diff --git a/sample/src/test/kotlin/com/natura/android/sample/components/IconButtonActivityTest.kt b/sample/src/test/kotlin/com/natura/android/sample/components/IconButtonActivityTest.kt
new file mode 100644
index 000000000..d40e50a71
--- /dev/null
+++ b/sample/src/test/kotlin/com/natura/android/sample/components/IconButtonActivityTest.kt
@@ -0,0 +1,37 @@
+package com.natura.android.sample.components
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.android.synthetic.main.activity_icon_button.*
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+internal class IconButtonActivityTest {
+    lateinit var activity: ActivityScenario<IconButtonActivity>
+
+    @Before
+    fun setUp() {
+        activity = ActivityScenario.launch(IconButtonActivity::class.java)
+    }
+
+    @Test
+    fun `WHEN IconButton is render, it SHOULD have 32dp of width`() {
+        activity.onActivity { activity ->
+            val iconButtonWidth = activity.iconButtonDefault.width
+
+            Assert.assertEquals(32, iconButtonWidth)
+        }
+    }
+
+    @Test
+    fun `WHEN IconButton is render, it SHOULD have 32dp of height`() {
+        activity.onActivity { activity ->
+            val iconButtonWidth = activity.iconButtonDefault.height
+
+            Assert.assertEquals(32, iconButtonWidth)
+        }
+    }
+}