diff --git a/designsystem/src/main/kotlin/com/natura/android/checkbox/GaYaCheckbox.kt b/designsystem/src/main/kotlin/com/natura/android/checkbox/GaYaCheckbox.kt
new file mode 100644
index 00000000..fcc4ae8d
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/checkbox/GaYaCheckbox.kt
@@ -0,0 +1,110 @@
+package com.natura.android.checkbox
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.appcompat.widget.AppCompatCheckBox
+import com.natura.android.R
+import com.natura.android.resources.getColorTokenFromTheme
+
+class GaYaCheckbox : AppCompatCheckBox {
+
+    constructor(context: Context) : super(context, null, R.attr.checkboxStyleSecondary) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(
+        context,
+        attrs,
+        R.attr.checkboxStyleSecondary
+    ) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
+        init()
+    }
+
+    constructor(context: Context, themeResId: Int) : super(
+        ContextThemeWrapper(context, themeResId),
+        null,
+        R.attr.checkboxStyleSecondary
+    ) {
+        init()
+    }
+
+    private fun init() {
+        val colorChecked = getColorTokenFromTheme(context, R.attr.colorInputComponent)
+        val colorUnchecked = getColorTokenFromTheme(context, R.attr.colorInputComponent)
+        val colorIndeterminate = getColorTokenFromTheme(context, R.attr.colorInputComponent)
+        val colorDisabled = getColorTokenFromTheme(context, R.attr.colorContentDisabled)
+
+        val states = arrayOf(
+            intArrayOf(android.R.attr.state_checked, -android.R.attr.state_enabled),
+            intArrayOf(-android.R.attr.state_checked, -android.R.attr.state_enabled),
+            intArrayOf(android.R.attr.state_checked),
+            intArrayOf(-android.R.attr.state_checked),
+            intArrayOf(R.attr.state_indeterminate)
+        )
+
+        val colors = intArrayOf(
+            colorDisabled,
+            colorDisabled,
+            colorChecked,
+            colorUnchecked,
+            colorIndeterminate
+        )
+
+        buttonTintList = ColorStateList(states, colors)
+        updateDrawable()
+    }
+
+    var state = GaYaCheckboxState.UNCHECKED
+        set(value) {
+            field = value
+            refreshDrawableState()
+            updateDrawable()
+        }
+
+    private lateinit var indeterminateState: IntArray
+
+    private var onStateChangedListener: ((GaYaCheckboxState) -> Unit)? = null
+
+    fun setOnStateChangedListener(listener: (GaYaCheckboxState) -> Unit) {
+        onStateChangedListener = listener
+    }
+
+    private fun updateDrawable() {
+        val btnDrawable = when (state) {
+            GaYaCheckboxState.INDETERMINATE -> R.drawable.checkbox_status_indeterminate
+            GaYaCheckboxState.UNCHECKED -> R.drawable.checkbox_status_unchecked
+            GaYaCheckboxState.CHECKED -> R.drawable.checkbox_status_checked
+        }
+        setButtonDrawable(btnDrawable)
+        onStateChangedListener?.invoke(state)
+    }
+
+    override fun onCreateDrawableState(extraSpace: Int): IntArray {
+        indeterminateState = intArrayOf(R.attr.state_indeterminate)
+        val drawableState = super.onCreateDrawableState(extraSpace + 1)
+        mergeDrawableStates(drawableState, indeterminateState)
+        return drawableState
+    }
+
+    override fun setChecked(checked: Boolean) {
+        this.state = when (checked) {
+            true -> GaYaCheckboxState.CHECKED
+            else -> GaYaCheckboxState.UNCHECKED
+        }
+        super.setChecked(checked)
+    }
+}
+
+enum class GaYaCheckboxState {
+    UNCHECKED, CHECKED, INDETERMINATE
+}
diff --git a/designsystem/src/main/kotlin/com/natura/android/radiobutton/GaYaRadiobutton.kt b/designsystem/src/main/kotlin/com/natura/android/radiobutton/GaYaRadiobutton.kt
new file mode 100644
index 00000000..bccb5615
--- /dev/null
+++ b/designsystem/src/main/kotlin/com/natura/android/radiobutton/GaYaRadiobutton.kt
@@ -0,0 +1,76 @@
+package com.natura.android.radiobutton
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.appcompat.widget.AppCompatRadioButton
+import com.natura.android.R
+import com.natura.android.resources.getColorTokenFromTheme
+
+class GaYaRadiobutton : AppCompatRadioButton {
+
+    constructor(context: Context) : super(context, null, R.attr.radioButtonStyle) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(
+        context,
+        attrs,
+        R.attr.radioButtonStyle
+    ) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
+        init()
+    }
+
+    constructor(context: Context, themeResId: Int) : super(
+        ContextThemeWrapper(context, themeResId),
+        null,
+        R.attr.radioButtonStyle
+    ) {
+        init()
+    }
+
+    private val colorChecked by lazy { getColorTokenFromTheme(context, R.attr.colorInputComponent) }
+    private val colorUnchecked by lazy {
+        getColorTokenFromTheme(
+            context,
+            R.attr.colorInputComponent
+        )
+    }
+    private val colorDisabled by lazy {
+        getColorTokenFromTheme(
+            context,
+            R.attr.colorContentDisabled
+        )
+    }
+
+    private val colorStateList by lazy {
+        val states = arrayOf(
+            intArrayOf(android.R.attr.state_checked, -android.R.attr.state_enabled),
+            intArrayOf(-android.R.attr.state_checked, -android.R.attr.state_enabled),
+            intArrayOf(android.R.attr.state_checked),
+            intArrayOf(-android.R.attr.state_checked)
+        )
+
+        val colors = intArrayOf(
+            colorDisabled,
+            colorDisabled,
+            colorChecked,
+            colorUnchecked
+        )
+
+        ColorStateList(states, colors)
+    }
+
+    private fun init() {
+        buttonTintList = colorStateList
+    }
+}
diff --git a/designsystem/src/main/res/drawable/filled_content_crueltyfreebunny.xml b/designsystem/src/main/res/drawable/filled_content_crueltyfreebunny.xml
new file mode 100644
index 00000000..d8f5f422
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_content_crueltyfreebunny.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M7.554,2.363L7.809,1.726L7.811,1.727L7.817,1.73L7.837,1.738L7.912,1.768C7.977,1.795 8.07,1.834 8.19,1.886C8.428,1.988 8.768,2.138 9.181,2.331C10.005,2.716 11.123,3.276 12.298,3.97C13.47,4.663 14.717,5.5 15.786,6.446C16.846,7.384 17.787,8.476 18.273,9.69C19.145,11.87 19.573,14.242 19.785,16.048C19.829,16.42 19.864,16.77 19.892,17.09C20.035,15.193 20.467,12.413 21.499,9.833C23.333,5.333 31.666,1.833 31.999,1.833C32.333,1.667 32.666,1.667 32.833,1.833C33.166,2.167 33.166,2.333 33.166,2.667C33.166,2.833 32.333,10.167 31.499,14.333C30.833,17.833 28.333,20.975 27.499,21.975C27.517,21.987 27.528,21.999 27.532,22.011C27.923,22.35 28.31,22.699 28.697,23.048L28.837,23.174C29.644,23.903 30.453,24.633 31.316,25.326C32.594,26.352 33.225,28.015 33.325,29.716C33.425,31.428 32.998,33.295 32.019,34.856C31.032,36.429 29.477,37.701 27.35,38.157C25.321,38.593 22.864,38.267 20.003,36.903C17.141,38.267 14.684,38.593 12.655,38.157C10.529,37.701 8.973,36.429 7.987,34.856C7.008,33.295 6.58,31.428 6.68,29.716C6.78,28.015 7.412,26.352 8.69,25.326C9.608,24.588 10.45,23.829 11.277,23.083L11.384,22.987C11.708,22.695 12.03,22.405 12.353,22.121C12.305,22.063 12.295,22.014 12.333,21.975C12.223,21.844 12.085,21.536 11.925,21.338C11.622,20.971 11.257,20.503 10.877,19.954C9.906,18.552 8.797,16.569 8.349,14.33C8.225,13.713 8.102,13.026 7.982,12.302C7.322,8.475 6.739,3.424 6.672,2.603L6.671,2.592C6.639,2.301 6.762,2.014 6.995,1.837C7.228,1.659 7.537,1.617 7.809,1.726C7.809,1.726 7.809,1.726 7.554,2.363ZM14.277,20.34L14.297,20.363C15.349,19.615 16.412,19.04 17.544,18.698L17.541,18.647C17.509,18.116 17.45,17.363 17.342,16.486C17.122,14.71 16.709,12.511 15.952,10.619C15.673,9.923 15.056,9.139 14.129,8.319C13.221,7.515 12.12,6.768 11.026,6.122C10.502,5.813 9.988,5.531 9.51,5.282C9.56,5.682 9.615,6.11 9.673,6.555C9.985,8.948 10.396,11.816 10.8,13.84C11.153,15.603 12.112,17.359 13.055,18.732C13.517,19.405 13.956,19.958 14.277,20.34ZM25.671,20.293C24.744,19.591 23.732,19.049 22.585,18.716L22.514,18.622C22.516,18.554 22.52,18.48 22.523,18.402C22.548,17.898 22.597,17.182 22.696,16.34C22.896,14.641 23.29,12.511 24.047,10.619C24.325,9.923 24.942,9.139 25.869,8.319C26.778,7.515 27.879,6.768 28.972,6.122C29.496,5.813 30.01,5.531 30.489,5.282C30.438,5.682 30.384,6.11 30.326,6.555C30.014,8.948 29.603,11.816 29.198,13.84C28.844,15.611 27.938,17.271 27.066,18.53C26.637,19.15 26.232,19.65 25.938,19.993C25.833,20.114 25.743,20.215 25.671,20.293ZM25.019,30.006C25.94,30.006 26.686,29.26 26.686,28.34C26.686,27.419 25.94,26.673 25.019,26.673C24.099,26.673 23.353,27.419 23.353,28.34C23.353,29.26 24.099,30.006 25.019,30.006ZM16.666,28.34C16.666,29.26 15.92,30.006 14.999,30.006C14.079,30.006 13.333,29.26 13.333,28.34C13.333,27.419 14.079,26.673 14.999,26.673C15.92,26.673 16.666,27.419 16.666,28.34ZM16.702,32.254C16.808,31.903 17.132,31.662 17.499,31.662H22.499C22.867,31.662 23.191,31.903 23.297,32.254C23.403,32.606 23.267,32.985 22.962,33.189L20.462,34.856C20.182,35.042 19.817,35.042 19.537,34.856L17.037,33.189C16.732,32.985 16.595,32.606 16.702,32.254Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_content_exfoliator.xml b/designsystem/src/main/res/drawable/filled_content_exfoliator.xml
new file mode 100644
index 00000000..bb4b4eb8
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_content_exfoliator.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M27.501,1.667C27.736,1.667 27.961,1.766 28.119,1.941C28.18,2.008 28.243,2.079 28.309,2.153C28.87,2.783 29.617,3.661 30.363,4.654C31.11,5.649 31.855,6.757 32.412,7.846C32.971,8.939 33.334,9.999 33.334,10.903C33.334,14.559 30.417,16.667 27.501,16.667C24.585,16.667 21.667,14.559 21.667,10.903C21.667,9.999 22.031,8.939 22.589,7.846C23.146,6.757 23.891,5.649 24.638,4.654C25.385,3.661 26.132,2.783 26.692,2.153C26.758,2.079 26.822,2.008 26.882,1.941C27.04,1.766 27.265,1.667 27.501,1.667ZM26.667,13.333C27.588,13.333 28.334,12.587 28.334,11.667C28.334,10.746 27.588,10 26.667,10C25.747,10 25.001,10.746 25.001,11.667C25.001,12.587 25.747,13.333 26.667,13.333ZM28.334,7.5C28.334,7.96 27.961,8.333 27.501,8.333C27.04,8.333 26.667,7.96 26.667,7.5C26.667,7.04 27.04,6.667 27.501,6.667C27.961,6.667 28.334,7.04 28.334,7.5Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.244,15.275C16.086,15.1 15.861,15 15.626,15C15.39,15 15.165,15.1 15.007,15.275C14.91,15.383 14.807,15.497 14.701,15.616C13.797,16.632 12.592,18.047 11.39,19.647C10.186,21.25 8.995,23.024 8.108,24.758C7.214,26.508 6.667,28.143 6.667,29.489C6.667,35.093 11.124,38.333 15.626,38.333C20.128,38.333 24.584,35.093 24.584,29.489C24.584,28.143 24.038,26.508 23.143,24.758C22.256,23.024 21.065,21.25 19.861,19.647C18.659,18.047 17.455,16.632 16.55,15.616C16.444,15.497 16.342,15.383 16.244,15.275ZM15.001,31.667C15.001,32.587 14.255,33.333 13.334,33.333C12.413,33.333 11.667,32.587 11.667,31.667C11.667,30.746 12.413,30 13.334,30C14.255,30 15.001,30.746 15.001,31.667ZM15.834,25C16.294,25 16.667,24.627 16.667,24.167C16.667,23.706 16.294,23.333 15.834,23.333C15.374,23.333 15.001,23.706 15.001,24.167C15.001,24.627 15.374,25 15.834,25ZM20.001,28.333C20.001,29.254 19.254,30 18.334,30C17.413,30 16.667,29.254 16.667,28.333C16.667,27.413 17.413,26.667 18.334,26.667C19.254,26.667 20.001,27.413 20.001,28.333Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5.834,17.5C5.834,17.96 6.207,18.333 6.667,18.333C7.127,18.333 7.501,17.96 7.501,17.5C7.501,16.58 8.247,15.833 9.167,15.833C9.627,15.833 10.001,15.46 10.001,15C10.001,14.54 9.627,14.167 9.167,14.167C8.247,14.167 7.501,13.42 7.501,12.5C7.501,12.04 7.127,11.667 6.667,11.667C6.207,11.667 5.834,12.04 5.834,12.5C5.834,13.42 5.087,14.167 4.167,14.167C3.707,14.167 3.334,14.54 3.334,15C3.334,15.46 3.707,15.833 4.167,15.833C5.087,15.833 5.834,16.58 5.834,17.5Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M16.667,10C16.207,10 15.834,9.627 15.834,9.167C15.834,8.247 15.087,7.5 14.167,7.5C13.707,7.5 13.334,7.127 13.334,6.667C13.334,6.207 13.707,5.833 14.167,5.833C15.087,5.833 15.834,5.087 15.834,4.167C15.834,3.707 16.207,3.333 16.667,3.333C17.127,3.333 17.501,3.707 17.501,4.167C17.501,5.087 18.247,5.833 19.167,5.833C19.627,5.833 20.001,6.207 20.001,6.667C20.001,7.127 19.627,7.5 19.167,7.5C18.247,7.5 17.501,8.247 17.501,9.167C17.501,9.627 17.127,10 16.667,10Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M32.501,29.167C32.501,29.627 32.874,30 33.334,30C33.794,30 34.167,29.627 34.167,29.167C34.167,28.247 34.914,27.5 35.834,27.5C36.294,27.5 36.667,27.127 36.667,26.667C36.667,26.207 36.294,25.833 35.834,25.833C34.914,25.833 34.167,25.087 34.167,24.167C34.167,23.707 33.794,23.333 33.334,23.333C32.874,23.333 32.501,23.707 32.501,24.167C32.501,25.087 31.754,25.833 30.834,25.833C30.374,25.833 30.001,26.207 30.001,26.667C30.001,27.127 30.374,27.5 30.834,27.5C31.754,27.5 32.501,28.247 32.501,29.167Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_content_giftpricefair.xml b/designsystem/src/main/res/drawable/filled_content_giftpricefair.xml
new file mode 100644
index 00000000..b9663f57
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_content_giftpricefair.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M27.501,7.5C27.501,7.96 27.874,8.333 28.334,8.333C28.794,8.333 29.167,7.96 29.167,7.5C29.167,6.58 29.914,5.833 30.834,5.833C31.294,5.833 31.667,5.46 31.667,5C31.667,4.54 31.294,4.167 30.834,4.167C29.914,4.167 29.167,3.42 29.167,2.5C29.167,2.04 28.794,1.667 28.334,1.667C27.874,1.667 27.501,2.04 27.501,2.5C27.501,3.42 26.754,4.167 25.834,4.167C25.374,4.167 25.001,4.54 25.001,5C25.001,5.46 25.374,5.833 25.834,5.833C26.754,5.833 27.501,6.58 27.501,7.5Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M23.213,10.68C23.262,10.723 23.298,10.779 23.317,10.843C23.337,10.906 23.339,10.975 23.324,11.04C23.309,11.105 23.277,11.164 23.231,11.211L21.864,12.608L22.186,14.581C22.195,14.633 22.192,14.686 22.179,14.736C22.166,14.786 22.143,14.833 22.111,14.873C22.079,14.913 22.039,14.945 21.993,14.967C21.948,14.989 21.899,15 21.85,15C21.794,15 21.74,14.986 21.691,14.958L20.001,14.027L18.31,14.955C18.253,14.986 18.19,15.001 18.126,14.996C18.063,14.991 18.001,14.967 17.95,14.928C17.899,14.889 17.859,14.836 17.835,14.774C17.811,14.713 17.803,14.646 17.813,14.581L18.138,12.607L16.771,11.21C16.725,11.163 16.692,11.104 16.677,11.039C16.662,10.974 16.664,10.906 16.684,10.842C16.704,10.778 16.74,10.722 16.789,10.679C16.838,10.636 16.897,10.608 16.961,10.598L18.849,10.312L19.694,8.52C19.726,8.463 19.77,8.416 19.824,8.383C19.878,8.351 19.94,8.333 20.002,8.333C20.064,8.333 20.126,8.351 20.18,8.383C20.234,8.416 20.278,8.463 20.31,8.52L21.155,10.312L23.044,10.598C23.106,10.608 23.165,10.637 23.213,10.68Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M8.334,11.667C7.874,11.667 7.501,11.293 7.501,10.833C7.501,9.913 6.754,9.167 5.834,9.167C5.374,9.167 5.001,8.793 5.001,8.333C5.001,7.873 5.374,7.5 5.834,7.5C6.754,7.5 7.501,6.753 7.501,5.833C7.501,5.373 7.874,5 8.334,5C8.794,5 9.167,5.373 9.167,5.833C9.167,6.753 9.914,7.5 10.834,7.5C11.294,7.5 11.667,7.873 11.667,8.333C11.667,8.793 11.294,9.167 10.834,9.167C9.914,9.167 9.167,9.913 9.167,10.833C9.167,11.293 8.794,11.667 8.334,11.667Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M16.667,3.333C16.667,4.254 15.921,5 15.001,5C14.08,5 13.334,4.254 13.334,3.333C13.334,2.413 14.08,1.667 15.001,1.667C15.921,1.667 16.667,2.413 16.667,3.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M33.334,13.333C34.255,13.333 35.001,12.587 35.001,11.667C35.001,10.746 34.255,10 33.334,10C32.414,10 31.667,10.746 31.667,11.667C31.667,12.587 32.414,13.333 33.334,13.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M30.255,15.922L24.966,14.6C25.26,14.124 25.488,13.603 25.636,13.05L33.536,15.025C33.79,15.088 33.987,15.261 34.089,15.481L36.579,20.461C36.672,20.646 36.692,20.857 36.638,21.055C36.63,21.083 36.62,21.111 36.61,21.138C36.523,21.358 36.348,21.531 36.127,21.614L22.793,26.614C22.376,26.77 21.91,26.571 21.735,26.162L20.001,22.116L18.267,26.162C18.245,26.213 18.218,26.261 18.188,26.305C17.975,26.615 17.573,26.75 17.208,26.614L3.875,21.614C3.654,21.531 3.478,21.358 3.392,21.138C3.305,20.918 3.316,20.672 3.422,20.461L5.922,15.461C5.961,15.382 6.012,15.312 6.071,15.251C6.175,15.144 6.31,15.064 6.465,15.025L14.366,13.05C14.514,13.603 14.742,14.124 15.036,14.6L9.746,15.922L20.001,19.127L30.255,15.922Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M16.623,28.174C17.521,28.511 18.494,28.298 19.167,27.698V35.833C19.167,36.294 19.54,36.667 20.001,36.667C20.461,36.667 20.834,36.294 20.834,35.833V27.697C21.507,28.298 22.481,28.511 23.378,28.174L33.334,24.441V32.5C33.334,32.841 33.126,33.147 32.81,33.274L20.319,38.27C20.12,38.352 19.895,38.355 19.691,38.274L7.191,33.274C6.875,33.147 6.667,32.841 6.667,32.5V24.441L16.623,28.174Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_content_giftpricegreat.xml b/designsystem/src/main/res/drawable/filled_content_giftpricegreat.xml
new file mode 100644
index 00000000..da2627cd
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_content_giftpricegreat.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M30.834,7.5C30.834,7.96 31.207,8.333 31.667,8.333C32.127,8.333 32.501,7.96 32.501,7.5C32.501,6.58 33.247,5.833 34.167,5.833C34.627,5.833 35.001,5.46 35.001,5C35.001,4.54 34.627,4.167 34.167,4.167C33.247,4.167 32.501,3.42 32.501,2.5C32.501,2.04 32.127,1.667 31.667,1.667C31.207,1.667 30.834,2.04 30.834,2.5C30.834,3.42 30.087,4.167 29.167,4.167C28.707,4.167 28.334,4.54 28.334,5C28.334,5.46 28.707,5.833 29.167,5.833C30.087,5.833 30.834,6.58 30.834,7.5Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M6.465,15.025L16.906,12.415C17.089,12.823 17.255,13.347 17.365,14.018L9.746,15.922L20.001,19.127L30.255,15.922L27.704,15.285C28.029,14.834 28.245,14.299 28.312,13.719L33.536,15.025C33.79,15.088 33.986,15.261 34.089,15.48L36.579,20.461C36.672,20.646 36.692,20.857 36.638,21.055C36.63,21.083 36.62,21.111 36.61,21.138C36.523,21.358 36.348,21.531 36.127,21.614L22.793,26.614C22.376,26.77 21.91,26.571 21.735,26.162L20.001,22.116L18.267,26.162C18.245,26.213 18.218,26.261 18.188,26.305C17.975,26.615 17.573,26.75 17.208,26.614L3.875,21.614C3.654,21.531 3.478,21.358 3.392,21.138C3.305,20.918 3.316,20.672 3.422,20.461L5.922,15.461C5.963,15.379 6.016,15.306 6.078,15.245C6.181,15.141 6.313,15.063 6.465,15.025Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M8.334,10C7.874,10 7.501,9.627 7.501,9.167C7.501,8.247 6.754,7.5 5.834,7.5C5.374,7.5 5.001,7.127 5.001,6.667C5.001,6.207 5.374,5.833 5.834,5.833C6.754,5.833 7.501,5.087 7.501,4.167C7.501,3.707 7.874,3.333 8.334,3.333C8.794,3.333 9.167,3.707 9.167,4.167C9.167,5.087 9.914,5.833 10.834,5.833C11.294,5.833 11.667,6.207 11.667,6.667C11.667,7.127 11.294,7.5 10.834,7.5C9.914,7.5 9.167,8.247 9.167,9.167C9.167,9.627 8.794,10 8.334,10Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M18.334,3.333C18.334,4.254 17.588,5 16.667,5C15.747,5 15.001,4.254 15.001,3.333C15.001,2.413 15.747,1.667 16.667,1.667C17.588,1.667 18.334,2.413 18.334,3.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M25.001,15C25.921,15 26.667,14.254 26.667,13.333C26.667,12.413 25.921,11.667 25.001,11.667C24.08,11.667 23.334,12.413 23.334,13.333C23.334,14.254 24.08,15 25.001,15Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M16.623,28.174C17.521,28.511 18.494,28.298 19.167,27.698V35.833C19.167,36.294 19.54,36.667 20.001,36.667C20.461,36.667 20.834,36.294 20.834,35.833V27.697C21.507,28.298 22.481,28.511 23.378,28.174L33.334,24.441V32.5C33.334,32.841 33.126,33.147 32.81,33.274L20.319,38.27C20.12,38.352 19.895,38.355 19.691,38.274L7.191,33.274C6.875,33.147 6.667,32.841 6.667,32.5V24.441L16.623,28.174Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M24.636,5.917L24.642,5.914L24.646,5.913C25.062,5.717 25.559,5.896 25.755,6.312C25.95,6.728 25.772,7.223 25.358,7.42L25.354,7.421L25.326,7.435C25.299,7.449 25.255,7.473 25.197,7.506C25.08,7.572 24.907,7.677 24.696,7.824C24.273,8.119 23.702,8.581 23.13,9.24C21.995,10.547 20.834,12.649 20.834,15.833C20.834,16.294 20.461,16.667 20.001,16.667C19.541,16.667 19.167,16.294 19.167,15.833C19.167,12.607 18.189,10.961 17.334,10.121C16.896,9.692 16.465,9.447 16.152,9.31C15.995,9.242 15.869,9.201 15.788,9.178C15.748,9.167 15.719,9.16 15.703,9.157L15.691,9.154C15.241,9.076 14.938,8.65 15.012,8.199C15.086,7.745 15.514,7.437 15.969,7.511L15.975,7.512L15.982,7.513L16.002,7.517C16.017,7.52 16.036,7.523 16.059,7.528C16.104,7.538 16.165,7.553 16.238,7.574C16.385,7.615 16.584,7.68 16.818,7.783C17.287,7.987 17.897,8.338 18.501,8.932C19.062,9.483 19.597,10.221 20.013,11.202C20.518,9.938 21.192,8.93 21.872,8.147C22.549,7.366 23.229,6.815 23.743,6.456C24,6.277 24.218,6.145 24.375,6.056C24.453,6.011 24.517,5.978 24.563,5.954C24.586,5.942 24.605,5.933 24.619,5.926L24.636,5.917Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_content_giftpricehigh.xml b/designsystem/src/main/res/drawable/filled_content_giftpricehigh.xml
new file mode 100644
index 00000000..ab2b6a60
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_content_giftpricehigh.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M28.182,5.298C28.242,5.351 28.287,5.422 28.311,5.501C28.336,5.581 28.339,5.666 28.32,5.748C28.301,5.829 28.261,5.903 28.204,5.962L26.495,7.708L26.898,10.175C26.909,10.239 26.906,10.305 26.889,10.368C26.873,10.431 26.844,10.489 26.804,10.539C26.764,10.589 26.713,10.629 26.657,10.656C26.601,10.684 26.539,10.698 26.477,10.698C26.408,10.698 26.34,10.68 26.279,10.646L24.166,9.481L22.052,10.641C21.982,10.681 21.903,10.699 21.823,10.693C21.743,10.687 21.667,10.657 21.603,10.607C21.539,10.559 21.489,10.492 21.459,10.416C21.429,10.339 21.42,10.255 21.432,10.174L21.837,7.707L20.128,5.96C20.071,5.901 20.031,5.827 20.012,5.746C19.993,5.665 19.996,5.58 20.02,5.5C20.045,5.421 20.091,5.35 20.152,5.296C20.213,5.242 20.287,5.208 20.366,5.196L22.726,4.837L23.783,2.598C23.822,2.527 23.878,2.468 23.946,2.427C24.013,2.386 24.09,2.365 24.168,2.365C24.246,2.365 24.322,2.386 24.39,2.427C24.457,2.468 24.513,2.527 24.552,2.598L25.609,4.837L27.97,5.196C28.048,5.208 28.122,5.244 28.182,5.298Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M30.254,16.62L22.017,14.561C22.236,14.058 22.386,13.518 22.456,12.953L33.535,15.723C33.788,15.786 33.985,15.959 34.088,16.177L36.578,21.159C36.671,21.344 36.69,21.555 36.636,21.752C36.628,21.781 36.619,21.808 36.608,21.836C36.522,22.056 36.346,22.229 36.125,22.312L22.792,27.312C22.375,27.468 21.909,27.269 21.733,26.86L19.999,22.813L18.265,26.86C18.243,26.911 18.217,26.959 18.187,27.003C17.974,27.313 17.572,27.448 17.207,27.312L3.873,22.312C3.652,22.229 3.477,22.056 3.39,21.836C3.304,21.616 3.315,21.37 3.421,21.159L5.921,16.159C5.965,16.069 6.024,15.991 6.094,15.925C6.194,15.83 6.32,15.759 6.464,15.723L11.295,14.515C11.526,15.058 11.837,15.559 12.214,16.003L9.745,16.62L19.999,19.825L30.254,16.62Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M19.982,11.54C19.963,11.477 19.927,11.421 19.879,11.378C19.83,11.334 19.772,11.306 19.709,11.296L17.82,11.009L16.975,9.218C16.944,9.161 16.899,9.114 16.845,9.081C16.791,9.048 16.73,9.031 16.667,9.031C16.605,9.031 16.544,9.048 16.49,9.081C16.436,9.114 16.391,9.161 16.36,9.218L15.514,11.009L13.626,11.296C13.563,11.306 13.503,11.333 13.455,11.377C13.406,11.42 13.369,11.476 13.349,11.54C13.33,11.603 13.327,11.672 13.343,11.736C13.358,11.802 13.39,11.861 13.436,11.907L14.803,13.305L14.479,15.279C14.469,15.344 14.476,15.411 14.5,15.472C14.525,15.533 14.564,15.587 14.616,15.625C14.667,15.665 14.728,15.689 14.792,15.694C14.855,15.699 14.919,15.684 14.975,15.653L16.666,14.725L18.356,15.656C18.405,15.684 18.459,15.698 18.515,15.698C18.565,15.698 18.614,15.686 18.659,15.665C18.704,15.642 18.744,15.611 18.776,15.571C18.808,15.531 18.832,15.484 18.845,15.434C18.858,15.383 18.86,15.331 18.852,15.279L18.529,13.306L19.896,11.909C19.942,11.862 19.974,11.803 19.99,11.738C20.005,11.672 20.002,11.604 19.982,11.54Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M4.999,12.365C4.999,13.285 4.253,14.031 3.333,14.031C2.412,14.031 1.666,13.285 1.666,12.365C1.666,11.444 2.412,10.698 3.333,10.698C4.253,10.698 4.999,11.444 4.999,12.365Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M36.666,5.698C37.586,5.698 38.333,4.952 38.333,4.031C38.333,3.111 37.586,2.365 36.666,2.365C35.745,2.365 34.999,3.111 34.999,4.031C34.999,4.952 35.745,5.698 36.666,5.698Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M32.499,13.198C32.499,13.658 32.873,14.031 33.333,14.031C33.793,14.031 34.166,13.658 34.166,13.198C34.166,12.278 34.913,11.531 35.833,11.531C36.293,11.531 36.666,11.158 36.666,10.698C36.666,10.238 36.293,9.865 35.833,9.865C34.913,9.865 34.166,9.118 34.166,8.198C34.166,7.738 33.793,7.365 33.333,7.365C32.873,7.365 32.499,7.738 32.499,8.198C32.499,9.118 31.753,9.865 30.833,9.865C30.373,9.865 29.999,10.238 29.999,10.698C29.999,11.158 30.373,11.531 30.833,11.531C31.753,11.531 32.499,12.278 32.499,13.198Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M8.333,9.031C7.873,9.031 7.499,8.658 7.499,8.198C7.499,7.278 6.753,6.531 5.833,6.531C5.373,6.531 4.999,6.158 4.999,5.698C4.999,5.238 5.373,4.865 5.833,4.865C6.753,4.865 7.499,4.118 7.499,3.198C7.499,2.738 7.873,2.365 8.333,2.365C8.793,2.365 9.166,2.738 9.166,3.198C9.166,4.118 9.913,4.865 10.833,4.865C11.293,4.865 11.666,5.238 11.666,5.698C11.666,6.158 11.293,6.531 10.833,6.531C9.913,6.531 9.166,7.278 9.166,8.198C9.166,8.658 8.793,9.031 8.333,9.031Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M19.166,28.395C18.493,28.996 17.519,29.209 16.622,28.872L6.666,25.139V33.198C6.666,33.539 6.873,33.845 7.19,33.972L19.69,38.972C19.894,39.053 20.119,39.05 20.318,38.968L32.809,33.972C33.125,33.845 33.333,33.539 33.333,33.198V25.139L23.377,28.872C22.479,29.209 21.506,28.996 20.833,28.395V36.531C20.833,36.992 20.46,37.365 19.999,37.365C19.539,37.365 19.166,36.992 19.166,36.531V28.395Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_content_giftpricespecial.xml b/designsystem/src/main/res/drawable/filled_content_giftpricespecial.xml
new file mode 100644
index 00000000..74fa5619
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_content_giftpricespecial.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M20.754,2.844C20.616,2.551 20.322,2.365 19.999,2.365C19.676,2.365 19.382,2.551 19.245,2.844L17.373,6.83L13.207,7.467C12.898,7.515 12.642,7.731 12.542,8.027C12.443,8.323 12.518,8.65 12.736,8.873L15.776,11.989L15.057,16.397C15.005,16.712 15.139,17.029 15.399,17.212C15.66,17.396 16.003,17.415 16.282,17.26L19.999,15.206L23.716,17.26C23.996,17.415 24.338,17.396 24.599,17.212C24.86,17.029 24.993,16.712 24.942,16.397L24.223,11.989L27.263,8.873C27.481,8.65 27.555,8.323 27.456,8.027C27.357,7.731 27.101,7.515 26.792,7.467L22.625,6.83L20.754,2.844Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M30.254,16.62L26.515,15.686L26.223,13.895L33.535,15.723C33.787,15.786 33.984,15.958 34.087,16.177L36.578,21.159C36.671,21.344 36.69,21.555 36.636,21.752C36.628,21.781 36.619,21.808 36.608,21.836C36.522,22.056 36.346,22.229 36.125,22.312L22.792,27.312C22.375,27.468 21.909,27.269 21.733,26.86L19.999,22.813L18.265,26.86C18.243,26.911 18.217,26.959 18.187,27.003C17.974,27.313 17.572,27.448 17.207,27.312L3.873,22.312C3.652,22.229 3.477,22.056 3.39,21.836C3.304,21.616 3.315,21.37 3.421,21.159L5.921,16.159C6.03,15.94 6.225,15.788 6.447,15.727C6.454,15.725 6.461,15.724 6.468,15.722L13.776,13.895L13.484,15.686L9.745,16.621L19.999,19.825L30.254,16.62Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M4.999,12.365C4.999,13.285 4.253,14.031 3.333,14.031C2.412,14.031 1.666,13.285 1.666,12.365C1.666,11.444 2.412,10.698 3.333,10.698C4.253,10.698 4.999,11.444 4.999,12.365Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M36.666,5.698C37.586,5.698 38.333,4.952 38.333,4.031C38.333,3.111 37.586,2.365 36.666,2.365C35.745,2.365 34.999,3.111 34.999,4.031C34.999,4.952 35.745,5.698 36.666,5.698Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M7.499,8.198C7.499,8.658 7.873,9.031 8.333,9.031C8.793,9.031 9.166,8.658 9.166,8.198C9.166,7.278 9.913,6.531 10.833,6.531C11.293,6.531 11.666,6.158 11.666,5.698C11.666,5.238 11.293,4.865 10.833,4.865C9.913,4.865 9.166,4.118 9.166,3.198C9.166,2.738 8.793,2.365 8.333,2.365C7.873,2.365 7.499,2.738 7.499,3.198C7.499,4.118 6.753,4.865 5.833,4.865C5.373,4.865 4.999,5.238 4.999,5.698C4.999,6.158 5.373,6.531 5.833,6.531C6.753,6.531 7.499,7.278 7.499,8.198Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M31.666,14.031C31.206,14.031 30.833,13.658 30.833,13.198C30.833,12.278 30.086,11.531 29.166,11.531C28.706,11.531 28.333,11.158 28.333,10.698C28.333,10.238 28.706,9.865 29.166,9.865C30.086,9.865 30.833,9.118 30.833,8.198C30.833,7.738 31.206,7.365 31.666,7.365C32.126,7.365 32.499,7.738 32.499,8.198C32.499,9.118 33.246,9.865 34.166,9.865C34.626,9.865 34.999,10.238 34.999,10.698C34.999,11.158 34.626,11.531 34.166,11.531C33.246,11.531 32.499,12.278 32.499,13.198C32.499,13.658 32.126,14.031 31.666,14.031Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M19.166,28.395C18.493,28.996 17.519,29.209 16.622,28.872L6.666,25.139V33.198C6.666,33.539 6.873,33.845 7.19,33.972L19.69,38.972C19.894,39.053 20.119,39.05 20.318,38.968L32.809,33.972C33.125,33.845 33.333,33.539 33.333,33.198V25.139L23.377,28.872C22.479,29.209 21.506,28.996 20.833,28.395V36.531C20.833,36.992 20.46,37.365 19.999,37.365C19.539,37.365 19.166,36.992 19.166,36.531V28.395Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_content_plasticfree.xml b/designsystem/src/main/res/drawable/filled_content_plasticfree.xml
new file mode 100644
index 00000000..9471bb43
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_content_plasticfree.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M17.499,2.365C17.039,2.365 16.666,2.738 16.666,3.198V5.698H24.999V3.198C24.999,2.738 24.626,2.365 24.166,2.365H17.499Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M24.999,7.365H16.666V10.744C12.928,11.162 9.999,14.352 9.999,18.198V22.365H17.154L15.488,24.031H9.999V29.519L1.91,37.609C1.585,37.934 1.585,38.462 1.91,38.787C2.236,39.112 2.763,39.112 3.089,38.787L38.089,3.787C38.414,3.462 38.414,2.934 38.089,2.609C37.763,2.283 37.236,2.283 36.91,2.609L27.849,11.67C26.989,11.182 26.025,10.859 24.999,10.744V7.365Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M20.201,24.031L13.534,30.698H31.666V24.031H20.201Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M11.868,32.364L9.999,34.233V34.263C9.999,36.838 12.311,38.796 14.851,38.373L20.833,37.376L26.814,38.373C29.354,38.796 31.666,36.838 31.666,34.263V32.364H11.868Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M30.316,13.916L21.868,22.365H31.666V18.198C31.666,16.609 31.166,15.132 30.316,13.916Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_content_snorkelmask.xml b/designsystem/src/main/res/drawable/filled_content_snorkelmask.xml
new file mode 100644
index 00000000..be74a507
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_content_snorkelmask.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M35.833,2.365H37.499C37.72,2.365 37.932,2.452 38.089,2.609C38.245,2.765 38.333,2.977 38.333,3.198V29.865C38.323,32.217 37.409,34.475 35.78,36.172C34.152,37.869 31.933,38.876 29.583,38.983C27.233,39.09 24.933,38.29 23.156,36.747C21.38,35.205 20.265,33.039 20.041,30.698H18.333C17.891,30.698 17.467,30.522 17.154,30.21C16.842,29.897 16.666,29.473 16.666,29.031C16.666,28.589 16.842,28.165 17.154,27.853C17.467,27.54 17.891,27.365 18.333,27.365H24.999C25.441,27.365 25.865,27.54 26.178,27.853C26.49,28.165 26.666,28.589 26.666,29.031C26.666,29.473 26.49,29.897 26.178,30.21C25.865,30.522 25.441,30.698 24.999,30.698H23.418C23.626,32.156 24.379,33.482 25.526,34.406C26.673,35.331 28.128,35.787 29.597,35.681C31.066,35.575 32.441,34.916 33.444,33.837C34.446,32.757 35.002,31.338 34.999,29.865V3.198C34.999,2.977 35.087,2.765 35.243,2.609C35.4,2.452 35.612,2.365 35.833,2.365Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M20.194,22.365H25.82C26.925,22.365 27.985,21.926 28.766,21.144C29.547,20.363 29.986,19.303 29.986,18.198V9.865C29.986,8.759 29.547,7.7 28.766,6.918C27.985,6.137 26.925,5.698 25.82,5.698H5.833C4.728,5.698 3.668,6.137 2.886,6.918C2.105,7.7 1.666,8.759 1.666,9.865V18.198C1.666,19.303 2.105,20.363 2.886,21.144C3.668,21.926 4.728,22.365 5.833,22.365H11.469C11.79,22.365 12.101,22.254 12.349,22.052C12.597,21.85 12.768,21.567 12.832,21.253L13.776,16.816C13.84,16.502 14.011,16.22 14.259,16.017C14.507,15.815 14.817,15.704 15.137,15.704H16.526C16.847,15.704 17.157,15.815 17.405,16.017C17.653,16.22 17.823,16.502 17.888,16.816L18.832,21.253C18.896,21.567 19.067,21.85 19.315,22.052C19.563,22.254 19.874,22.365 20.194,22.365Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_media_play.xml b/designsystem/src/main/res/drawable/filled_media_play.xml
index 8ab3f805..4fab6af8 100644
--- a/designsystem/src/main/res/drawable/filled_media_play.xml
+++ b/designsystem/src/main/res/drawable/filled_media_play.xml
@@ -3,7 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 19.78V4.22A1.09 1.09 0 0 1 5 3a1 1 0 0 1 0.57 0.1l13.83 7.7a1.29 1.29 0 0 1 0.4 1.78a1.15 1.15 0 0 1-0.39 0.4L5.57 20.87A1.1 1.1 0 0 1 4 19.78z"/>
+  <path
+      android:pathData="M6,3.5c0,-1.2 1.4,-1.9 2.4,-1.2l12,8.5c0.8,0.6 0.8,1.9 0,2.4l-12,8.5c-1,0.7 -2.4,0 -2.4,-1.2V3.5Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularbottom.xml b/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularbottom.xml
index a8fa532e..01dbfdab 100644
--- a/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularbottom.xml
+++ b/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularbottom.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M2.667,7.293C3.058,6.902 3.691,6.902 4.082,7.293L12.375,15.586L20.667,7.293C21.058,6.902 21.691,6.902 22.082,7.293C22.472,7.683 22.472,8.317 22.082,8.707L13.082,17.707C12.894,17.895 12.64,18 12.375,18C12.109,18 11.855,17.895 11.667,17.707L2.667,8.707C2.277,8.317 2.277,7.683 2.667,7.293Z"
+      android:pathData="M2.3,8.3c0.4,-0.4 1,-0.4 1.4,0l8.3,8.3 8.3,-8.3c0.4,-0.4 1,-0.4 1.4,0 0.4,0.4 0.4,1 0,1.4l-9,9c-0.2,0.2 -0.4,0.3 -0.7,0.3s-0.5,-0.1 -0.7,-0.3L2.3,9.7c-0.4,-0.4 -0.4,-1 0,-1.4Z"
       android:fillColor="#363636"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularleft.xml b/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularleft.xml
index 4d361c3b..019bf96a 100644
--- a/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularleft.xml
+++ b/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularleft.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M18.082,2.293C18.472,2.683 18.472,3.317 18.082,3.707L9.789,12L18.082,20.293C18.472,20.683 18.472,21.317 18.082,21.707C17.691,22.098 17.058,22.098 16.667,21.707L7.667,12.707C7.48,12.52 7.375,12.265 7.375,12C7.375,11.735 7.48,11.48 7.667,11.293L16.667,2.293C17.058,1.902 17.691,1.902 18.082,2.293Z"
+      android:pathData="M15.7,2.3c0.4,0.4 0.4,1 0,1.4L7.4,12l8.3,8.3c0.4,0.4 0.4,1 0,1.4 -0.4,0.4 -1,0.4 -1.4,0L5.3,12.7c-0.2,-0.2 -0.3,-0.4 -0.3,-0.7s0.1,-0.5 0.3,-0.7L14.3,2.3c0.4,-0.4 1,-0.4 1.4,0Z"
       android:fillColor="#363636"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularright.xml b/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularright.xml
index aacc7eba..c2723e60 100644
--- a/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularright.xml
+++ b/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregularright.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M6.667,2.293C7.058,1.902 7.691,1.902 8.082,2.293L17.082,11.293C17.269,11.48 17.375,11.735 17.375,12C17.375,12.265 17.269,12.52 17.082,12.707L8.082,21.707C7.691,22.098 7.058,22.098 6.667,21.707C6.277,21.317 6.277,20.683 6.667,20.293L14.96,12L6.667,3.707C6.277,3.317 6.277,2.683 6.667,2.293Z"
+      android:pathData="M8.3,2.3c0.4,-0.4 1,-0.4 1.4,0l9,9c0.2,0.2 0.3,0.4 0.3,0.7s-0.1,0.5 -0.3,0.7l-9,9c-0.4,0.4 -1,0.4 -1.4,0 -0.4,-0.4 -0.4,-1 0,-1.4l8.3,-8.3L8.3,3.7c-0.4,-0.4 -0.4,-1 0,-1.4Z"
       android:fillColor="#363636"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregulartop.xml b/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregulartop.xml
index cecf8da2..319bf9ee 100644
--- a/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregulartop.xml
+++ b/designsystem/src/main/res/drawable/filled_navigation_arrowctrlregulartop.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12.375,6C12.64,6 12.894,6.105 13.082,6.293L22.082,15.293C22.472,15.683 22.472,16.317 22.082,16.707C21.691,17.098 21.058,17.098 20.667,16.707L12.375,8.414L4.082,16.707C3.691,17.098 3.058,17.098 2.667,16.707C2.277,16.317 2.277,15.683 2.667,15.293L11.667,6.293C11.855,6.105 12.109,6 12.375,6Z"
+      android:pathData="M12,5c0.3,0 0.5,0.1 0.7,0.3l9,9c0.4,0.4 0.4,1 0,1.4 -0.4,0.4 -1,0.4 -1.4,0L12,7.4 3.7,15.7c-0.4,0.4 -1,0.4 -1.4,0 -0.4,-0.4 -0.4,-1 0,-1.4L11.3,5.3c0.2,-0.2 0.4,-0.3 0.7,-0.3Z"
       android:fillColor="#363636"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/filled_product_eyeshadow.xml b/designsystem/src/main/res/drawable/filled_product_eyeshadow.xml
new file mode 100644
index 00000000..c7eec80a
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_product_eyeshadow.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M9.999,8.729C9.539,8.729 9.166,8.356 9.166,7.896C9.166,6.976 8.419,6.229 7.499,6.229C7.039,6.229 6.666,5.856 6.666,5.396C6.666,4.936 7.039,4.562 7.499,4.562C8.419,4.562 9.166,3.816 9.166,2.896C9.166,2.436 9.539,2.062 9.999,2.062C10.459,2.062 10.833,2.436 10.833,2.896C10.833,3.816 11.579,4.562 12.499,4.562C12.959,4.562 13.333,4.936 13.333,5.396C13.333,5.856 12.959,6.229 12.499,6.229C11.579,6.229 10.833,6.976 10.833,7.896C10.833,8.356 10.459,8.729 9.999,8.729Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M23.605,6.626C24.341,5.957 25.155,5.386 26.028,4.932L28.26,9.608C28.458,10.024 28.955,10.2 29.371,10.002C29.786,9.803 29.962,9.306 29.764,8.891L27.563,4.28C28.602,3.931 29.7,3.743 30.833,3.743C33.527,3.743 36.081,4.646 38.089,6.654C38.336,6.901 38.402,7.276 38.256,7.593L34.637,15.41H27.029L23.41,7.593C23.257,7.263 23.336,6.871 23.605,6.626Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M27.531,17.076L28.333,34.583C28.339,35.344 28.671,35.923 29.117,36.369C29.331,36.583 29.578,36.769 29.885,36.894C30.19,37.018 30.506,37.063 30.833,37.063C31.573,37.063 32.132,36.794 32.607,36.319C33.115,35.811 33.327,35.098 33.333,34.584L34.126,17.076H27.531Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M17.499,12.896C17.499,13.356 17.873,13.729 18.333,13.729C18.793,13.729 19.166,13.356 19.166,12.896C19.166,11.976 19.913,11.229 20.833,11.229C21.293,11.229 21.666,10.856 21.666,10.396C21.666,9.936 21.293,9.562 20.833,9.562C19.913,9.562 19.166,8.816 19.166,7.896C19.166,7.436 18.793,7.062 18.333,7.062C17.873,7.062 17.499,7.436 17.499,7.896C17.499,8.816 16.753,9.562 15.833,9.562C15.373,9.562 14.999,9.936 14.999,10.396C14.999,10.856 15.373,11.229 15.833,11.229C16.753,11.229 17.499,11.976 17.499,12.896Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M9.999,23.729C9.999,24.649 9.253,25.396 8.333,25.396C7.412,25.396 6.666,24.649 6.666,23.729C6.666,22.809 7.412,22.062 8.333,22.062C9.253,22.062 9.999,22.809 9.999,23.729Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M16.666,25.396C17.587,25.396 18.333,24.649 18.333,23.729C18.333,22.809 17.587,22.062 16.666,22.062C15.745,22.062 14.999,22.809 14.999,23.729C14.999,24.649 15.745,25.396 16.666,25.396Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M18.333,32.062C18.333,32.983 17.587,33.729 16.666,33.729C15.745,33.729 14.999,32.983 14.999,32.062C14.999,31.142 15.745,30.396 16.666,30.396C17.587,30.396 18.333,31.142 18.333,32.062Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M8.333,33.729C9.253,33.729 9.999,32.983 9.999,32.062C9.999,31.142 9.253,30.396 8.333,30.396C7.412,30.396 6.666,31.142 6.666,32.062C6.666,32.983 7.412,33.729 8.333,33.729Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M4.166,17.065C2.785,17.065 1.666,18.184 1.666,19.565V36.231C1.666,37.612 2.785,38.731 4.166,38.731H20.833C22.213,38.731 23.333,37.612 23.333,36.231V19.565C23.333,18.184 22.213,17.065 20.833,17.065H4.166ZM8.333,27.062C10.174,27.062 11.666,25.57 11.666,23.729C11.666,21.888 10.174,20.396 8.333,20.396C6.492,20.396 4.999,21.888 4.999,23.729C4.999,25.57 6.492,27.062 8.333,27.062ZM19.999,23.729C19.999,25.57 18.507,27.062 16.666,27.062C14.825,27.062 13.333,25.57 13.333,23.729C13.333,21.888 14.825,20.396 16.666,20.396C18.507,20.396 19.999,21.888 19.999,23.729ZM16.666,35.396C18.507,35.396 19.999,33.903 19.999,32.062C19.999,30.221 18.507,28.729 16.666,28.729C14.825,28.729 13.333,30.221 13.333,32.062C13.333,33.903 14.825,35.396 16.666,35.396ZM11.666,32.062C11.666,33.903 10.174,35.396 8.333,35.396C6.492,35.396 4.999,33.903 4.999,32.062C4.999,30.221 6.492,28.729 8.333,28.729C10.174,28.729 11.666,30.221 11.666,32.062Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_product_hairdetox.xml b/designsystem/src/main/res/drawable/filled_product_hairdetox.xml
new file mode 100644
index 00000000..d0e687a1
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_product_hairdetox.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M9.167,3.729C8.706,3.729 8.333,4.102 8.333,4.562V7.896H20V4.562C20,4.102 19.627,3.729 19.167,3.729H9.167Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M5.833,8.729H22.5C22.96,8.729 23.333,9.102 23.333,9.562V23.326L23.302,23.382C21.29,21.467 18.617,20.396 15.833,20.396C15.17,20.396 14.534,20.659 14.066,21.128C13.597,21.597 13.333,22.233 13.333,22.896V27.896C13.333,30.769 14.475,33.524 16.506,35.556C17.082,36.132 17.715,36.636 18.393,37.062H10.833C7.612,37.062 5,34.451 5,31.229V9.562C5,9.102 5.373,8.729 5.833,8.729Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M23.746,26.601C24.246,24.841 25.189,23.219 26.506,21.902C28.538,19.87 31.294,18.729 34.167,18.729C34.388,18.729 34.6,18.817 34.756,18.973C34.912,19.129 35,19.341 35,19.562V26.229C35,29.102 33.859,31.858 31.827,33.889C29.795,35.921 27.04,37.062 24.167,37.062C21.736,37.062 19.404,36.097 17.685,34.377C15.966,32.659 15,30.327 15,27.896V22.896C15,22.675 15.088,22.463 15.244,22.306C15.4,22.15 15.612,22.062 15.833,22.062C18.264,22.062 20.596,23.028 22.315,24.747C22.874,25.306 23.354,25.93 23.746,26.601Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_product_organicalcohol.xml b/designsystem/src/main/res/drawable/filled_product_organicalcohol.xml
new file mode 100644
index 00000000..f6c62ab2
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_product_organicalcohol.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M16.666,5.396V8.729H8.333V3.59C8.333,3.185 8.494,2.796 8.78,2.51C9.067,2.223 9.455,2.062 9.86,2.062H21.805C22.21,2.062 22.599,2.223 22.885,2.51C23.172,2.796 23.333,3.324 23.333,3.729C23.333,4.134 23.172,4.662 22.885,4.948C22.599,5.235 22.21,5.396 21.805,5.396H16.666Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M18.333,13.729H21.785C22.195,13.729 22.589,13.895 22.879,14.19C23.17,14.485 23.333,14.886 23.333,15.303V22.896C22.025,22.351 20.61,22.062 19.166,22.062C18.503,22.062 17.867,22.326 17.398,22.795C16.929,23.264 16.666,23.899 16.666,24.562V29.562C16.666,32.436 17.807,35.191 19.839,37.223C20.414,37.798 21.048,38.302 21.726,38.729H3.214C2.803,38.729 2.41,38.563 2.119,38.268C1.829,37.973 1.666,37.572 1.666,37.155V15.303C1.666,14.886 1.829,14.485 2.119,14.19C2.41,13.895 2.803,13.729 3.214,13.729H6.666V11.97C6.666,11.552 6.829,11.152 7.119,10.857C7.41,10.562 7.803,10.396 8.214,10.396H16.785C17.195,10.396 17.589,10.562 17.879,10.857C18.17,11.152 18.333,11.552 18.333,11.97V13.729Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M19.166,23.729C20.628,23.729 22.054,24.078 23.333,24.731C24.18,25.163 24.963,25.729 25.648,26.414C26.207,26.973 26.686,27.597 27.079,28.268C27.579,26.507 28.522,24.886 29.839,23.569C31.871,21.537 34.626,20.396 37.499,20.396C37.72,20.396 37.932,20.484 38.089,20.64C38.245,20.796 38.333,21.008 38.333,21.229V27.896C38.333,30.769 37.191,33.525 35.16,35.556C33.128,37.588 30.372,38.729 27.499,38.729C26.003,38.729 24.545,38.363 23.244,37.681C22.43,37.255 21.679,36.705 21.017,36.044C19.299,34.325 18.333,31.994 18.333,29.562V24.562C18.333,24.341 18.42,24.129 18.577,23.973C18.733,23.817 18.945,23.729 19.166,23.729Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M26.666,5.396C26.445,5.396 26.233,5.484 26.077,5.64L26.073,5.643L26.066,5.65L26.042,5.675C26.022,5.696 25.993,5.726 25.956,5.764C25.882,5.841 25.779,5.951 25.656,6.088C25.41,6.361 25.081,6.746 24.749,7.187C24.42,7.627 24.076,8.139 23.811,8.669C23.553,9.185 23.333,9.79 23.333,10.396C23.333,11.539 23.914,12.385 24.585,12.919C25.225,13.427 26.026,13.717 26.664,13.713C27.371,13.721 28.182,13.442 28.823,12.91C29.49,12.357 29.999,11.507 29.999,10.396C29.999,9.79 29.779,9.185 29.521,8.669C29.256,8.139 28.912,7.627 28.583,7.187C28.251,6.746 27.922,6.361 27.676,6.088C27.553,5.951 27.449,5.841 27.376,5.764C27.34,5.726 27.31,5.696 27.29,5.675L27.266,5.65L27.259,5.643L27.255,5.64C27.099,5.484 26.887,5.396 26.666,5.396Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_product_recyclablepackaging.xml b/designsystem/src/main/res/drawable/filled_product_recyclablepackaging.xml
new file mode 100644
index 00000000..5896523f
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_product_recyclablepackaging.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M5.834,2.062C5.374,2.062 5.001,2.436 5.001,2.896C5.001,3.356 5.374,3.729 5.834,3.729H6.667V6.229H16.667V3.729H20.832C21.293,3.729 21.666,3.356 21.666,2.896C21.666,2.436 21.293,2.062 20.832,2.062H5.834Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M27.389,14.978C27.24,14.721 26.965,14.563 26.668,14.562C26.37,14.562 26.096,14.721 25.946,14.978L23.531,19.145C23.3,19.543 23.436,20.053 23.834,20.283C24.232,20.514 24.742,20.378 24.973,19.98L26.667,17.058L28.787,20.72L26.648,21.955C26.356,22.123 26.194,22.451 26.238,22.785C26.282,23.119 26.523,23.394 26.849,23.481L31.402,24.701C31.847,24.821 32.304,24.557 32.423,24.112L33.643,19.559C33.73,19.233 33.613,18.887 33.345,18.682C33.078,18.477 32.713,18.453 32.421,18.621L30.23,19.886L27.389,14.978Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M23.606,27.478L21.379,26.193L18.946,30.396H22.501C22.961,30.396 23.334,30.769 23.334,31.229C23.334,31.689 22.961,32.062 22.501,32.062H17.501C17.203,32.062 16.927,31.903 16.779,31.645C16.63,31.387 16.63,31.069 16.779,30.812L19.936,25.359L17.833,24.145C17.541,23.976 17.379,23.649 17.423,23.315C17.467,22.98 17.708,22.706 18.034,22.618L22.587,21.398C23.031,21.279 23.488,21.543 23.608,21.988L24.828,26.541C24.915,26.867 24.797,27.213 24.53,27.418C24.263,27.623 23.898,27.647 23.606,27.478Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M33.003,26.314C33.401,26.085 33.911,26.222 34.141,26.62L36.556,30.813C36.705,31.071 36.704,31.389 36.556,31.646C36.407,31.904 36.132,32.062 35.834,32.062H30.001V34.563C30.001,34.9 29.798,35.203 29.486,35.332C29.175,35.461 28.816,35.39 28.578,35.152L25.245,31.818C25.162,31.736 25.101,31.64 25.06,31.539C25.022,31.443 25.001,31.338 25.001,31.229C25.001,31.112 25.025,31 25.069,30.898C25.104,30.818 25.152,30.742 25.213,30.674C25.224,30.661 25.236,30.648 25.249,30.636L28.578,27.306C28.816,27.068 29.175,26.997 29.486,27.126C29.798,27.255 30.001,27.559 30.001,27.896V30.396H34.392L32.696,27.452C32.467,27.054 32.604,26.544 33.003,26.314Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M5.212,7.341C5.37,7.164 5.596,7.062 5.834,7.062H17.501C17.738,7.062 17.965,7.164 18.123,7.341C18.281,7.519 18.356,7.755 18.329,7.991L18.328,7.996L18.326,8.016L18.317,8.094C18.31,8.164 18.3,8.266 18.289,8.394C18.267,8.651 18.24,9.009 18.222,9.416C18.185,10.247 18.19,11.209 18.32,11.911C18.412,12.404 18.608,12.997 18.845,13.592C19.49,15.206 20.001,16.964 20.001,18.804V20.366L17.602,21.008C16.625,21.27 15.903,22.094 15.771,23.097C15.639,24.1 16.124,25.083 16.999,25.588L17.657,25.969L15.337,29.976C14.889,30.75 14.889,31.704 15.335,32.478C15.781,33.252 16.607,33.729 17.501,33.729H20.001V37.896C20.001,38.356 19.628,38.729 19.167,38.729H4.167C3.707,38.729 3.334,38.356 3.334,37.896L3.334,18.804C3.334,16.964 3.844,15.206 4.489,13.592C4.727,12.997 4.923,12.404 5.015,11.911C5.145,11.209 5.149,10.247 5.113,9.416C5.095,9.009 5.068,8.651 5.045,8.394C5.034,8.266 5.024,8.164 5.017,8.094L5.009,8.016L5.007,7.996L5.006,7.992C4.979,7.756 5.054,7.519 5.212,7.341Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/filled_product_refill.xml b/designsystem/src/main/res/drawable/filled_product_refill.xml
new file mode 100644
index 00000000..f4b6f118
--- /dev/null
+++ b/designsystem/src/main/res/drawable/filled_product_refill.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M4.167,3.427C3.93,3.427 3.704,3.528 3.546,3.705C3.388,3.881 3.313,4.117 3.339,4.352L6.672,34.352C6.707,34.664 6.915,34.93 7.209,35.041L7.222,35.046L7.261,35.06C7.294,35.072 7.343,35.09 7.405,35.112C7.531,35.157 7.712,35.221 7.939,35.297C8.392,35.449 9.032,35.653 9.778,35.86C11.258,36.27 13.209,36.708 14.976,36.76C16.775,36.813 18.75,36.367 20.236,35.93C20.396,35.882 20.552,35.835 20.702,35.788V32.418C20.702,31.997 20.806,31.601 20.99,31.253C20.389,30.796 20.001,30.073 20.001,29.26C20.001,25.783 21.937,22.758 24.79,21.204L26.662,4.352C26.688,4.117 26.613,3.881 26.455,3.705C26.297,3.528 26.071,3.427 25.834,3.427H4.167ZM23.002,29.926C22.99,29.935 22.979,29.943 22.967,29.951L23.002,29.926ZM10.834,8.427C10.605,8.427 10.386,8.521 10.229,8.688C10.071,8.854 9.989,9.078 10.002,9.307L10.835,24.306C10.86,24.748 11.225,25.094 11.667,25.094H18.334C18.776,25.094 19.142,24.748 19.166,24.306L19.999,9.307C20.012,9.078 19.93,8.854 19.773,8.688C19.615,8.521 19.396,8.427 19.167,8.427H10.834ZM12.456,23.427L11.715,10.094H18.286L17.546,23.427H12.456Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M23.334,29.26C23.334,26.039 25.946,23.427 29.167,23.427C30.296,23.427 31.351,23.748 32.244,24.303L31.034,25.513C30.796,25.751 30.725,26.11 30.854,26.421C30.983,26.733 31.286,26.936 31.623,26.936H35.026C35.036,26.936 35.046,26.936 35.055,26.936H35.132C35.592,26.936 35.965,26.563 35.965,26.102V22.594C35.965,22.257 35.763,21.953 35.451,21.824C35.14,21.695 34.781,21.766 34.543,22.004L33.447,23.1C32.234,22.256 30.758,21.76 29.167,21.76C25.025,21.76 21.667,25.118 21.667,29.26C21.667,29.721 22.04,30.094 22.501,30.094C22.961,30.094 23.334,29.721 23.334,29.26Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M36.667,29.26C36.667,28.8 36.294,28.427 35.834,28.427C35.374,28.427 35.001,28.8 35.001,29.26C35.001,32.482 32.389,35.094 29.167,35.094C28.038,35.094 26.984,34.773 26.091,34.217L27.301,33.007C27.539,32.769 27.61,32.411 27.481,32.099C27.352,31.788 27.048,31.585 26.711,31.585H23.313C23.3,31.585 23.288,31.585 23.275,31.585H23.203C22.742,31.585 22.369,31.958 22.369,32.418V35.927C22.369,36.264 22.572,36.568 22.884,36.697C23.195,36.826 23.553,36.755 23.792,36.516L24.888,35.42C26.101,36.265 27.576,36.76 29.167,36.76C33.31,36.76 36.667,33.402 36.667,29.26Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_content_crueltyfreebunny.xml b/designsystem/src/main/res/drawable/outlined_content_crueltyfreebunny.xml
new file mode 100644
index 00000000..6e139dfa
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_content_crueltyfreebunny.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M16.666,28.333C16.666,29.254 15.92,30 14.999,30C14.079,30 13.333,29.254 13.333,28.333C13.333,27.413 14.079,26.667 14.999,26.667C15.92,26.667 16.666,27.413 16.666,28.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M26.666,28.333C26.666,29.254 25.92,30 24.999,30C24.079,30 23.333,29.254 23.333,28.333C23.333,27.413 24.079,26.667 24.999,26.667C25.92,26.667 26.666,27.413 26.666,28.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M33.004,1.837C32.771,1.659 32.462,1.617 32.19,1.726L32.187,1.727L32.182,1.73L32.161,1.738L32.087,1.768C32.022,1.795 31.928,1.834 31.809,1.886C31.571,1.988 31.231,2.138 30.818,2.331C29.994,2.716 28.875,3.276 27.7,3.97C26.528,4.663 25.282,5.5 24.213,6.446C23.153,7.384 22.211,8.476 21.726,9.69C20.854,11.87 20.426,14.242 20.213,16.048C20.107,16.956 20.053,17.73 20.026,18.28L20.024,18.333L20.003,18.333L19.975,18.333L19.972,18.28C19.945,17.73 19.892,16.956 19.785,16.048C19.573,14.242 19.145,11.87 18.273,9.69C17.787,8.476 16.846,7.384 15.786,6.446C14.717,5.5 13.47,4.663 12.298,3.97C11.123,3.276 10.005,2.716 9.181,2.331C8.768,2.138 8.428,1.988 8.19,1.886C8.07,1.834 7.977,1.795 7.912,1.768L7.837,1.738L7.817,1.73L7.811,1.727L7.809,1.726C7.537,1.617 7.228,1.659 6.995,1.837C6.762,2.014 6.639,2.301 6.671,2.592L6.681,2.679L6.709,2.925C6.733,3.139 6.769,3.45 6.815,3.835C6.906,4.606 7.037,5.677 7.194,6.879C7.507,9.276 7.926,12.217 8.349,14.33C8.797,16.569 9.906,18.552 10.877,19.954C11.365,20.659 11.827,21.229 12.168,21.625C12.269,21.742 12.359,21.844 12.437,21.93C12.086,22.239 11.736,22.557 11.384,22.876L11.277,22.973C10.45,23.724 9.608,24.489 8.689,25.231C7.412,26.264 6.78,27.939 6.68,29.651C6.58,31.376 7.008,33.255 7.987,34.827C8.973,36.411 10.529,37.692 12.655,38.151C14.684,38.59 17.141,38.261 20.003,36.888C22.864,38.261 25.321,38.59 27.35,38.151C29.477,37.692 31.032,36.411 32.019,34.827C32.998,33.255 33.425,31.376 33.325,29.651C33.225,27.939 32.593,26.264 31.316,25.231C30.453,24.533 29.644,23.798 28.837,23.065L28.697,22.937C28.322,22.597 27.946,22.256 27.567,21.924C27.644,21.839 27.733,21.739 27.831,21.625C28.172,21.229 28.633,20.659 29.122,19.954C30.092,18.552 31.202,16.569 31.65,14.33C32.072,12.217 32.492,9.276 32.805,6.879C32.962,5.677 33.092,4.606 33.184,3.835C33.229,3.45 33.265,3.139 33.29,2.925L33.318,2.679L33.328,2.592C33.36,2.301 33.237,2.014 33.004,1.837ZM18.308,18.361L18.314,18.503C16.664,18.844 15.262,19.662 13.947,20.674C13.869,20.734 13.791,20.795 13.713,20.856C13.636,20.772 13.54,20.665 13.43,20.537C13.12,20.177 12.696,19.653 12.247,19.005C11.342,17.698 10.369,15.931 9.983,14.003C9.573,11.95 9.159,9.058 8.847,6.663C8.705,5.575 8.584,4.595 8.495,3.851C9.284,4.22 10.344,4.751 11.45,5.405C12.57,6.066 13.719,6.843 14.682,7.694C15.653,8.554 16.378,9.44 16.726,10.309C17.521,12.297 17.926,14.508 18.13,16.243C18.232,17.107 18.282,17.842 18.308,18.361ZM26.288,20.854C26.364,20.77 26.459,20.664 26.569,20.537C26.879,20.177 27.303,19.653 27.752,19.005C28.656,17.698 29.63,15.931 30.015,14.003C30.426,11.95 30.84,9.058 31.152,6.663C31.294,5.575 31.414,4.595 31.503,3.851C30.715,4.22 29.655,4.751 28.548,5.405C27.429,6.066 26.279,6.843 25.317,7.694C24.346,8.554 23.621,9.44 23.273,10.309C22.478,12.297 22.073,14.508 21.869,16.243C21.767,17.107 21.716,17.842 21.691,18.361L21.684,18.506C23.357,18.856 24.794,19.703 26.126,20.728C26.18,20.77 26.234,20.812 26.288,20.854ZM9.733,26.539C10.689,25.766 11.564,24.972 12.383,24.228L12.499,24.123C13.36,23.342 14.156,22.625 14.958,22.007C16.551,20.782 18.093,20.011 20.003,20.011C21.908,20.011 23.493,20.814 25.114,22.061C25.927,22.688 26.729,23.41 27.581,24.183L27.729,24.318C28.528,25.045 29.371,25.81 30.272,26.539C31.069,27.184 31.579,28.342 31.661,29.75C31.742,31.145 31.392,32.675 30.607,33.935C29.83,35.183 28.635,36.157 27,36.511C25.605,36.812 23.816,36.676 21.602,35.767L22.962,34.86C23.267,34.656 23.403,34.277 23.297,33.925C23.191,33.574 22.867,33.333 22.499,33.333H17.499C17.132,33.333 16.808,33.574 16.702,33.925C16.595,34.277 16.732,34.656 17.037,34.86L18.4,35.768C16.188,36.676 14.4,36.812 13.005,36.511C11.37,36.157 10.176,35.183 9.399,33.935C8.614,32.675 8.263,31.145 8.344,29.749C8.426,28.342 8.936,27.184 9.733,26.539Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_content_exfoliator.xml b/designsystem/src/main/res/drawable/outlined_content_exfoliator.xml
new file mode 100644
index 00000000..cbb8d132
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_content_exfoliator.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M28.334,7.5C28.334,7.96 27.961,8.333 27.501,8.333C27.04,8.333 26.667,7.96 26.667,7.5C26.667,7.04 27.04,6.667 27.501,6.667C27.961,6.667 28.334,7.04 28.334,7.5Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M26.667,13.333C27.588,13.333 28.334,12.587 28.334,11.667C28.334,10.746 27.588,10 26.667,10C25.747,10 25.001,10.746 25.001,11.667C25.001,12.587 25.747,13.333 26.667,13.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M27.501,1.667C27.736,1.667 27.961,1.766 28.119,1.941C28.18,2.008 28.243,2.079 28.309,2.153C28.87,2.783 29.617,3.661 30.363,4.654C31.11,5.649 31.855,6.757 32.412,7.846C32.971,8.939 33.334,9.999 33.334,10.903C33.334,14.559 30.417,16.667 27.501,16.667C24.585,16.667 21.667,14.559 21.667,10.903C21.667,9.999 22.031,8.939 22.589,7.846C23.146,6.757 23.891,5.649 24.638,4.654C25.385,3.661 26.132,2.783 26.692,2.153C26.758,2.079 26.822,2.008 26.882,1.941C27.04,1.766 27.265,1.667 27.501,1.667ZM27.501,3.76C27.039,4.296 26.503,4.946 25.971,5.656C25.255,6.608 24.571,7.632 24.073,8.605C23.556,9.616 23.334,10.394 23.334,10.903C23.334,13.483 25.342,15 27.501,15C29.659,15 31.667,13.483 31.667,10.903C31.667,10.394 31.445,9.616 30.928,8.605C30.431,7.632 29.747,6.608 29.031,5.656C28.498,4.946 27.963,4.296 27.501,3.76Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.667,10C16.207,10 15.834,9.627 15.834,9.167C15.834,8.247 15.087,7.5 14.167,7.5C13.707,7.5 13.334,7.127 13.334,6.667C13.334,6.207 13.707,5.833 14.167,5.833C15.087,5.833 15.834,5.087 15.834,4.167C15.834,3.707 16.207,3.333 16.667,3.333C17.127,3.333 17.501,3.707 17.501,4.167C17.501,5.087 18.247,5.833 19.167,5.833C19.627,5.833 20.001,6.207 20.001,6.667C20.001,7.127 19.627,7.5 19.167,7.5C18.247,7.5 17.501,8.247 17.501,9.167C17.501,9.627 17.127,10 16.667,10Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M5.834,17.5C5.834,17.96 6.207,18.333 6.667,18.333C7.127,18.333 7.501,17.96 7.501,17.5C7.501,16.58 8.247,15.833 9.167,15.833C9.627,15.833 10.001,15.46 10.001,15C10.001,14.54 9.627,14.167 9.167,14.167C8.247,14.167 7.501,13.42 7.501,12.5C7.501,12.04 7.127,11.667 6.667,11.667C6.207,11.667 5.834,12.04 5.834,12.5C5.834,13.42 5.087,14.167 4.167,14.167C3.707,14.167 3.334,14.54 3.334,15C3.334,15.46 3.707,15.833 4.167,15.833C5.087,15.833 5.834,16.58 5.834,17.5Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M32.501,29.167C32.501,29.627 32.874,30 33.334,30C33.794,30 34.167,29.627 34.167,29.167C34.167,28.247 34.914,27.5 35.834,27.5C36.294,27.5 36.667,27.127 36.667,26.667C36.667,26.207 36.294,25.833 35.834,25.833C34.914,25.833 34.167,25.087 34.167,24.167C34.167,23.707 33.794,23.333 33.334,23.333C32.874,23.333 32.501,23.707 32.501,24.167C32.501,25.087 31.754,25.833 30.834,25.833C30.374,25.833 30.001,26.207 30.001,26.667C30.001,27.127 30.374,27.5 30.834,27.5C31.754,27.5 32.501,28.247 32.501,29.167Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M16.667,24.167C16.667,24.627 16.294,25 15.834,25C15.374,25 15.001,24.627 15.001,24.167C15.001,23.706 15.374,23.333 15.834,23.333C16.294,23.333 16.667,23.706 16.667,24.167Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M15.001,31.667C15.001,32.587 14.255,33.333 13.334,33.333C12.413,33.333 11.667,32.587 11.667,31.667C11.667,30.746 12.413,30 13.334,30C14.255,30 15.001,30.746 15.001,31.667Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M18.334,30C19.254,30 20.001,29.254 20.001,28.333C20.001,27.413 19.254,26.667 18.334,26.667C17.413,26.667 16.667,27.413 16.667,28.333C16.667,29.254 17.413,30 18.334,30Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M16.244,15.275C16.086,15.1 15.861,15 15.626,15C15.39,15 15.165,15.1 15.007,15.275C14.91,15.383 14.807,15.497 14.701,15.616C13.797,16.632 12.592,18.047 11.39,19.647C10.186,21.25 8.995,23.024 8.108,24.758C7.214,26.508 6.667,28.143 6.667,29.489C6.667,35.093 11.124,38.333 15.626,38.333C20.128,38.333 24.584,35.093 24.584,29.489C24.584,28.143 24.038,26.508 23.143,24.758C22.256,23.024 21.065,21.25 19.861,19.647C18.659,18.047 17.455,16.632 16.55,15.616C16.444,15.497 16.342,15.383 16.244,15.275ZM12.723,20.648C13.754,19.276 14.789,18.04 15.626,17.087C16.462,18.04 17.498,19.276 18.529,20.648C19.702,22.21 20.832,23.899 21.659,25.517C22.512,27.185 22.917,28.537 22.917,29.489C22.917,34.017 19.37,36.667 15.626,36.667C11.881,36.667 8.334,34.017 8.334,29.489C8.334,28.537 8.739,27.185 9.592,25.517C10.419,23.899 11.55,22.21 12.723,20.648Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_content_giftpricefair.xml b/designsystem/src/main/res/drawable/outlined_content_giftpricefair.xml
new file mode 100644
index 00000000..f6361d1e
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_content_giftpricefair.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M28.334,8.333C27.874,8.333 27.501,7.96 27.501,7.5C27.501,6.58 26.754,5.833 25.834,5.833C25.374,5.833 25.001,5.46 25.001,5C25.001,4.54 25.374,4.167 25.834,4.167C26.754,4.167 27.501,3.42 27.501,2.5C27.501,2.04 27.874,1.667 28.334,1.667C28.794,1.667 29.167,2.04 29.167,2.5C29.167,3.42 29.914,4.167 30.834,4.167C31.294,4.167 31.667,4.54 31.667,5C31.667,5.46 31.294,5.833 30.834,5.833C29.914,5.833 29.167,6.58 29.167,7.5C29.167,7.96 28.794,8.333 28.334,8.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M23.213,10.68C23.262,10.723 23.298,10.779 23.317,10.843C23.337,10.906 23.339,10.975 23.324,11.04C23.309,11.105 23.277,11.164 23.231,11.211L21.864,12.608L22.186,14.581C22.195,14.633 22.192,14.686 22.179,14.736C22.166,14.786 22.143,14.833 22.111,14.873C22.079,14.913 22.039,14.945 21.993,14.967C21.948,14.989 21.899,15 21.85,15C21.794,15 21.74,14.986 21.691,14.958L20.001,14.027L18.31,14.955C18.253,14.986 18.19,15.001 18.126,14.996C18.063,14.991 18.001,14.967 17.95,14.928C17.899,14.889 17.859,14.836 17.835,14.774C17.811,14.713 17.803,14.646 17.813,14.581L18.138,12.607L16.771,11.21C16.725,11.163 16.692,11.104 16.677,11.039C16.662,10.974 16.664,10.906 16.684,10.842C16.704,10.778 16.74,10.722 16.789,10.679C16.838,10.636 16.897,10.608 16.961,10.598L18.849,10.312L19.694,8.52C19.726,8.463 19.77,8.416 19.824,8.383C19.878,8.351 19.94,8.333 20.002,8.333C20.064,8.333 20.126,8.351 20.18,8.383C20.234,8.416 20.278,8.463 20.31,8.52L21.155,10.312L23.044,10.598C23.106,10.608 23.165,10.637 23.213,10.68Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M24.966,14.6L30.255,15.922L20.001,19.127L9.747,15.922L15.036,14.6C14.742,14.124 14.514,13.603 14.366,13.05L6.477,15.022C6.444,15.03 6.411,15.04 6.379,15.051C6.295,15.082 6.219,15.125 6.152,15.179C6.058,15.252 5.978,15.348 5.922,15.46L3.422,20.461C3.316,20.672 3.305,20.918 3.392,21.138C3.478,21.358 3.654,21.531 3.875,21.614L6.67,22.662C6.668,22.682 6.667,22.703 6.667,22.724V32.5C6.667,32.841 6.875,33.147 7.191,33.274L19.691,38.274L19.7,38.277C19.895,38.352 20.113,38.353 20.31,38.274L32.81,33.274C33.126,33.147 33.334,32.841 33.334,32.5V22.661L36.127,21.614C36.348,21.531 36.523,21.358 36.61,21.138C36.696,20.918 36.685,20.672 36.579,20.461L34.088,15.477C33.985,15.259 33.788,15.088 33.536,15.025L25.636,13.05C25.488,13.603 25.26,14.124 24.966,14.6ZM8.334,31.936V23.286L17.208,26.614C17.625,26.77 18.091,26.571 18.267,26.162L19.167,24.06V36.269L8.334,31.936ZM31.667,23.286L22.793,26.614C22.376,26.77 21.91,26.571 21.735,26.162L20.834,24.06V36.269L31.667,31.936V23.286ZM5.327,20.378L7.096,16.84L18.871,20.52L17.048,24.774L5.327,20.378ZM22.953,24.774L21.13,20.52L32.906,16.84L34.675,20.378L22.953,24.774Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.501,10.833C7.501,11.293 7.874,11.667 8.334,11.667C8.794,11.667 9.167,11.293 9.167,10.833C9.167,9.913 9.914,9.167 10.834,9.167C11.294,9.167 11.667,8.793 11.667,8.333C11.667,7.873 11.294,7.5 10.834,7.5C9.914,7.5 9.167,6.753 9.167,5.833C9.167,5.373 8.794,5 8.334,5C7.874,5 7.501,5.373 7.501,5.833C7.501,6.753 6.754,7.5 5.834,7.5C5.374,7.5 5.001,7.873 5.001,8.333C5.001,8.793 5.374,9.167 5.834,9.167C6.754,9.167 7.501,9.913 7.501,10.833Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M15.001,5C15.921,5 16.667,4.254 16.667,3.333C16.667,2.413 15.921,1.667 15.001,1.667C14.08,1.667 13.334,2.413 13.334,3.333C13.334,4.254 14.08,5 15.001,5Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M35.001,11.667C35.001,12.587 34.255,13.333 33.334,13.333C32.414,13.333 31.667,12.587 31.667,11.667C31.667,10.746 32.414,10 33.334,10C34.255,10 35.001,10.746 35.001,11.667Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_content_giftpricegreat.xml b/designsystem/src/main/res/drawable/outlined_content_giftpricegreat.xml
new file mode 100644
index 00000000..b1a1082b
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_content_giftpricegreat.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M31.667,8.333C31.207,8.333 30.834,7.96 30.834,7.5C30.834,6.58 30.087,5.833 29.167,5.833C28.707,5.833 28.334,5.46 28.334,5C28.334,4.54 28.707,4.167 29.167,4.167C30.087,4.167 30.834,3.42 30.834,2.5C30.834,2.04 31.207,1.667 31.667,1.667C32.127,1.667 32.501,2.04 32.501,2.5C32.501,3.42 33.247,4.167 34.167,4.167C34.627,4.167 35.001,4.54 35.001,5C35.001,5.46 34.627,5.833 34.167,5.833C33.247,5.833 32.501,6.58 32.501,7.5C32.501,7.96 32.127,8.333 31.667,8.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M6.368,15.055C6.404,15.042 6.441,15.03 6.478,15.022L16.906,12.415C17.089,12.823 17.255,13.347 17.365,14.018L9.747,15.922L20.001,19.127L30.255,15.922L27.704,15.285C28.029,14.834 28.245,14.299 28.312,13.719L33.536,15.025L33.539,15.025C33.566,15.032 33.592,15.04 33.615,15.049C33.811,15.119 33.98,15.262 34.079,15.46L36.579,20.461C36.685,20.672 36.696,20.918 36.61,21.138C36.523,21.358 36.348,21.531 36.127,21.614L33.334,22.661V32.5C33.334,32.841 33.126,33.147 32.81,33.274L20.31,38.274C20.108,38.355 19.885,38.352 19.687,38.272L7.191,33.274C6.875,33.147 6.667,32.841 6.667,32.5V22.661L3.875,21.614C3.654,21.531 3.478,21.358 3.392,21.138C3.305,20.918 3.316,20.672 3.422,20.461L5.922,15.46C5.98,15.344 6.063,15.247 6.16,15.172C6.222,15.124 6.292,15.085 6.368,15.055ZM8.334,23.286V31.936L19.167,36.269V24.06L18.267,26.162C18.091,26.571 17.625,26.77 17.208,26.614L8.334,23.286ZM22.793,26.614L31.667,23.286V31.936L20.834,36.269V24.06L21.735,26.162C21.91,26.571 22.376,26.77 22.793,26.614ZM21.13,20.52L22.953,24.774L34.675,20.378L32.906,16.84L21.13,20.52ZM5.327,20.378L7.096,16.84L18.871,20.52L17.048,24.774L5.327,20.378Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.501,9.167C7.501,9.627 7.874,10 8.334,10C8.794,10 9.167,9.627 9.167,9.167C9.167,8.247 9.914,7.5 10.834,7.5C11.294,7.5 11.667,7.127 11.667,6.667C11.667,6.207 11.294,5.833 10.834,5.833C9.914,5.833 9.167,5.087 9.167,4.167C9.167,3.707 8.794,3.333 8.334,3.333C7.874,3.333 7.501,3.707 7.501,4.167C7.501,5.087 6.754,5.833 5.834,5.833C5.374,5.833 5.001,6.207 5.001,6.667C5.001,7.127 5.374,7.5 5.834,7.5C6.754,7.5 7.501,8.247 7.501,9.167Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M16.667,5C17.588,5 18.334,4.254 18.334,3.333C18.334,2.413 17.588,1.667 16.667,1.667C15.747,1.667 15.001,2.413 15.001,3.333C15.001,4.254 15.747,5 16.667,5Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M26.667,13.333C26.667,14.254 25.921,15 25.001,15C24.08,15 23.334,14.254 23.334,13.333C23.334,12.413 24.08,11.667 25.001,11.667C25.921,11.667 26.667,12.413 26.667,13.333Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M24.642,5.914L24.646,5.913C25.062,5.717 25.559,5.896 25.755,6.312C25.95,6.728 25.772,7.223 25.358,7.42L25.354,7.421L25.326,7.436C25.299,7.45 25.255,7.473 25.197,7.506C25.08,7.572 24.907,7.677 24.696,7.824C24.273,8.119 23.702,8.581 23.13,9.24C21.995,10.547 20.834,12.649 20.834,15.833C20.834,16.294 20.461,16.667 20.001,16.667C19.541,16.667 19.167,16.294 19.167,15.833C19.167,12.607 18.189,10.961 17.334,10.121C16.896,9.692 16.465,9.447 16.152,9.31C15.995,9.242 15.869,9.201 15.788,9.178C15.748,9.167 15.719,9.16 15.703,9.157L15.691,9.154C15.241,9.076 14.938,8.65 15.012,8.199C15.086,7.745 15.514,7.437 15.969,7.511L15.982,7.513L16.002,7.517C16.017,7.52 16.036,7.524 16.059,7.529C16.104,7.538 16.165,7.553 16.238,7.574C16.385,7.615 16.584,7.681 16.818,7.783C17.287,7.987 17.897,8.338 18.501,8.932C19.062,9.483 19.597,10.221 20.013,11.202C20.518,9.938 21.192,8.93 21.872,8.147C22.549,7.366 23.229,6.815 23.743,6.457C24,6.277 24.218,6.145 24.375,6.056C24.453,6.011 24.517,5.978 24.563,5.954C24.586,5.942 24.605,5.933 24.619,5.926L24.636,5.917L24.642,5.914Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_content_giftpricehigh.xml b/designsystem/src/main/res/drawable/outlined_content_giftpricehigh.xml
new file mode 100644
index 00000000..ad7ed4c2
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_content_giftpricehigh.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M28.311,5.501C28.287,5.422 28.242,5.351 28.182,5.298C28.122,5.244 28.048,5.208 27.97,5.196L25.609,4.837L24.552,2.598C24.513,2.527 24.457,2.468 24.39,2.427C24.322,2.386 24.246,2.365 24.168,2.365C24.09,2.365 24.013,2.386 23.946,2.427C23.878,2.468 23.822,2.527 23.783,2.598L22.726,4.837L20.366,5.196C20.287,5.208 20.213,5.242 20.152,5.296C20.091,5.35 20.045,5.421 20.02,5.5C19.996,5.58 19.993,5.665 20.012,5.746C20.031,5.827 20.071,5.901 20.128,5.96L21.837,7.707L21.432,10.174C21.42,10.255 21.429,10.339 21.459,10.416C21.489,10.492 21.539,10.559 21.603,10.607C21.667,10.657 21.743,10.687 21.823,10.693C21.903,10.699 21.982,10.681 22.052,10.641L24.166,9.481L26.279,10.646C26.34,10.68 26.408,10.698 26.477,10.698C26.539,10.698 26.601,10.684 26.657,10.656C26.713,10.629 26.764,10.589 26.804,10.539C26.844,10.489 26.873,10.431 26.889,10.368C26.906,10.305 26.909,10.239 26.898,10.175L26.495,7.708L28.204,5.962C28.261,5.903 28.301,5.829 28.32,5.748C28.339,5.666 28.336,5.581 28.311,5.501Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M30.253,16.62L22.017,14.561C22.236,14.058 22.386,13.518 22.456,12.953L33.526,15.72C33.542,15.724 33.558,15.729 33.575,15.734C33.807,15.804 33.988,15.968 34.086,16.174L36.578,21.158C36.684,21.37 36.695,21.616 36.608,21.836C36.522,22.056 36.346,22.228 36.125,22.311L33.333,23.359V33.198C33.333,33.539 33.125,33.845 32.809,33.972L20.309,38.972C20.107,39.053 19.883,39.05 19.685,38.97L7.19,33.972C6.873,33.845 6.666,33.539 6.666,33.198V23.359L3.873,22.311C3.652,22.228 3.477,22.056 3.39,21.836C3.304,21.616 3.315,21.37 3.421,21.158L5.921,16.158C5.984,16.032 6.076,15.928 6.185,15.851C6.23,15.819 6.279,15.791 6.331,15.768C6.378,15.747 6.428,15.731 6.479,15.719L11.295,14.515C11.526,15.058 11.837,15.559 12.214,16.003L9.745,16.62L19.999,19.825L30.253,16.62ZM22.792,27.311L31.666,23.984V32.634L20.833,36.967V24.758L21.733,26.859C21.909,27.269 22.375,27.468 22.792,27.311ZM21.129,21.218L22.952,25.471L34.673,21.076L32.904,17.538L21.129,21.218ZM19.166,36.967V24.758L18.265,26.859C18.09,27.269 17.624,27.468 17.207,27.311L8.333,23.984V32.634L19.166,36.967ZM7.094,17.538L5.325,21.076L17.047,25.471L18.87,21.218L7.094,17.538Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19.879,11.378C19.927,11.421 19.963,11.477 19.982,11.54C20.002,11.604 20.005,11.672 19.99,11.738C19.974,11.803 19.942,11.862 19.896,11.909L18.529,13.306L18.852,15.279C18.86,15.331 18.858,15.383 18.845,15.434C18.832,15.484 18.808,15.531 18.776,15.571C18.744,15.611 18.704,15.642 18.659,15.665C18.614,15.686 18.565,15.698 18.515,15.698C18.459,15.698 18.405,15.684 18.356,15.656L16.666,14.725L14.975,15.653C14.919,15.684 14.855,15.699 14.792,15.694C14.728,15.689 14.667,15.665 14.616,15.625C14.564,15.587 14.525,15.533 14.5,15.472C14.476,15.411 14.469,15.344 14.479,15.279L14.803,13.305L13.436,11.907C13.39,11.861 13.358,11.802 13.343,11.736C13.327,11.672 13.33,11.603 13.349,11.54C13.369,11.476 13.406,11.42 13.455,11.377C13.503,11.333 13.563,11.306 13.626,11.296L15.514,11.009L16.36,9.218C16.391,9.161 16.436,9.114 16.49,9.081C16.544,9.048 16.605,9.031 16.667,9.031C16.73,9.031 16.791,9.048 16.845,9.081C16.899,9.114 16.944,9.161 16.975,9.218L17.82,11.009L19.709,11.296C19.772,11.306 19.83,11.334 19.879,11.378Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M3.333,14.031C4.253,14.031 4.999,13.285 4.999,12.365C4.999,11.444 4.253,10.698 3.333,10.698C2.412,10.698 1.666,11.444 1.666,12.365C1.666,13.285 2.412,14.031 3.333,14.031Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M38.333,4.031C38.333,4.952 37.586,5.698 36.666,5.698C35.745,5.698 34.999,4.952 34.999,4.031C34.999,3.111 35.745,2.365 36.666,2.365C37.586,2.365 38.333,3.111 38.333,4.031Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M33.333,14.031C32.873,14.031 32.499,13.658 32.499,13.198C32.499,12.278 31.753,11.531 30.833,11.531C30.373,11.531 29.999,11.158 29.999,10.698C29.999,10.238 30.373,9.865 30.833,9.865C31.753,9.865 32.499,9.118 32.499,8.198C32.499,7.738 32.873,7.365 33.333,7.365C33.793,7.365 34.166,7.738 34.166,8.198C34.166,9.118 34.913,9.865 35.833,9.865C36.293,9.865 36.666,10.238 36.666,10.698C36.666,11.158 36.293,11.531 35.833,11.531C34.913,11.531 34.166,12.278 34.166,13.198C34.166,13.658 33.793,14.031 33.333,14.031Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M7.499,8.198C7.499,8.658 7.873,9.031 8.333,9.031C8.793,9.031 9.166,8.658 9.166,8.198C9.166,7.278 9.913,6.531 10.833,6.531C11.293,6.531 11.666,6.158 11.666,5.698C11.666,5.238 11.293,4.865 10.833,4.865C9.913,4.865 9.166,4.118 9.166,3.198C9.166,2.738 8.793,2.365 8.333,2.365C7.873,2.365 7.499,2.738 7.499,3.198C7.499,4.118 6.753,4.865 5.833,4.865C5.373,4.865 4.999,5.238 4.999,5.698C4.999,6.158 5.373,6.531 5.833,6.531C6.753,6.531 7.499,7.278 7.499,8.198Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_content_giftpricespecial.xml b/designsystem/src/main/res/drawable/outlined_content_giftpricespecial.xml
new file mode 100644
index 00000000..985ab574
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_content_giftpricespecial.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M19.999,2.365C20.322,2.365 20.616,2.551 20.754,2.844L22.625,6.83L26.792,7.467C27.101,7.515 27.357,7.731 27.456,8.027C27.555,8.323 27.481,8.65 27.263,8.873L24.223,11.989L24.942,16.397C24.993,16.712 24.86,17.029 24.599,17.212C24.338,17.396 23.996,17.415 23.716,17.26L19.999,15.206L16.282,17.26C16.003,17.415 15.66,17.396 15.399,17.212C15.139,17.029 15.005,16.712 15.057,16.397L15.776,11.989L12.736,8.873C12.518,8.65 12.443,8.323 12.542,8.027C12.642,7.731 12.898,7.515 13.207,7.467L17.373,6.83L19.245,2.844C19.382,2.551 19.676,2.365 19.999,2.365Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M26.515,15.686L30.253,16.62L19.999,19.825L9.746,16.62L13.484,15.686L13.776,13.895L6.482,15.718C6.245,15.772 6.036,15.928 5.921,16.158L3.421,21.158C3.315,21.37 3.304,21.616 3.39,21.836C3.477,22.056 3.652,22.228 3.873,22.311L6.666,23.359V33.198C6.666,33.539 6.873,33.845 7.19,33.972L19.685,38.97C19.883,39.05 20.107,39.053 20.309,38.972L32.809,33.972C33.125,33.845 33.333,33.539 33.333,33.198V23.359L36.125,22.311C36.346,22.228 36.522,22.056 36.608,21.836C36.695,21.616 36.684,21.37 36.578,21.158L34.085,16.173C33.993,15.979 33.826,15.822 33.612,15.746C33.583,15.736 33.552,15.726 33.521,15.719L26.223,13.895L26.515,15.686ZM8.333,32.634V23.984L17.207,27.311C17.624,27.468 18.09,27.269 18.265,26.859L19.166,24.758V36.967L8.333,32.634ZM31.666,23.984L22.792,27.311C22.375,27.468 21.909,27.269 21.733,26.859L20.833,24.758V36.967L31.666,32.634V23.984ZM5.325,21.076L7.094,17.538L18.87,21.218L17.047,25.471L5.325,21.076ZM22.952,25.471L21.129,21.218L32.904,17.538L34.673,21.076L22.952,25.471Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3.333,14.031C4.253,14.031 4.999,13.285 4.999,12.365C4.999,11.444 4.253,10.698 3.333,10.698C2.412,10.698 1.666,11.444 1.666,12.365C1.666,13.285 2.412,14.031 3.333,14.031Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M38.333,4.031C38.333,4.952 37.586,5.698 36.666,5.698C35.745,5.698 34.999,4.952 34.999,4.031C34.999,3.111 35.745,2.365 36.666,2.365C37.586,2.365 38.333,3.111 38.333,4.031Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M8.333,9.031C7.873,9.031 7.499,8.658 7.499,8.198C7.499,7.278 6.753,6.531 5.833,6.531C5.373,6.531 4.999,6.158 4.999,5.698C4.999,5.238 5.373,4.865 5.833,4.865C6.753,4.865 7.499,4.118 7.499,3.198C7.499,2.738 7.873,2.365 8.333,2.365C8.793,2.365 9.166,2.738 9.166,3.198C9.166,4.118 9.913,4.865 10.833,4.865C11.293,4.865 11.666,5.238 11.666,5.698C11.666,6.158 11.293,6.531 10.833,6.531C9.913,6.531 9.166,7.278 9.166,8.198C9.166,8.658 8.793,9.031 8.333,9.031Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M30.833,13.198C30.833,13.658 31.206,14.031 31.666,14.031C32.126,14.031 32.499,13.658 32.499,13.198C32.499,12.278 33.246,11.531 34.166,11.531C34.626,11.531 34.999,11.158 34.999,10.698C34.999,10.238 34.626,9.865 34.166,9.865C33.246,9.865 32.499,9.118 32.499,8.198C32.499,7.738 32.126,7.365 31.666,7.365C31.206,7.365 30.833,7.738 30.833,8.198C30.833,9.118 30.086,9.865 29.166,9.865C28.706,9.865 28.333,10.238 28.333,10.698C28.333,11.158 28.706,11.531 29.166,11.531C30.086,11.531 30.833,12.278 30.833,13.198Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_content_plasticfree.xml b/designsystem/src/main/res/drawable/outlined_content_plasticfree.xml
new file mode 100644
index 00000000..1c598990
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_content_plasticfree.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M17.499,2.365C17.039,2.365 16.666,2.738 16.666,3.198V10.744C12.928,11.162 9.999,14.352 9.999,18.198V29.519L1.91,37.609C1.585,37.934 1.585,38.462 1.91,38.787C2.236,39.112 2.763,39.112 3.089,38.787L38.089,3.787C38.414,3.462 38.414,2.934 38.089,2.609C37.763,2.283 37.236,2.283 36.91,2.609L27.849,11.67C26.989,11.182 26.025,10.859 24.999,10.744V3.198C24.999,2.738 24.626,2.365 24.166,2.365H17.499ZM23.333,5.698V4.031H18.333V5.698H23.333ZM18.333,7.365H23.333V11.531C23.333,11.991 23.706,12.365 24.166,12.365C25.038,12.365 25.867,12.559 26.612,12.906L17.154,22.365H11.666V18.198C11.666,14.991 14.293,12.365 17.499,12.365C17.96,12.365 18.333,11.991 18.333,11.531V7.365ZM15.488,24.031H11.666V27.853L15.488,24.031Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9.999,34.263V34.233L11.666,32.566V34.263C11.666,35.808 13.053,36.983 14.577,36.729L20.696,35.709C20.786,35.694 20.879,35.694 20.97,35.709L27.088,36.729C28.612,36.983 29.999,35.808 29.999,34.263V32.364H11.868L13.534,30.698H29.999V24.031H20.201L21.868,22.365H29.999V18.198C29.999,17.07 29.674,16.014 29.114,15.119L30.316,13.916C31.166,15.132 31.666,16.609 31.666,18.198V34.263C31.666,36.838 29.354,38.796 26.814,38.373L20.833,37.376L14.851,38.373C12.311,38.796 9.999,36.838 9.999,34.263Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_content_snorkelmask.xml b/designsystem/src/main/res/drawable/outlined_content_snorkelmask.xml
new file mode 100644
index 00000000..36a84a18
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_content_snorkelmask.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M37.499,2.365C37.96,2.365 38.333,2.738 38.333,3.198V30.698C38.333,32.908 37.455,35.028 35.892,36.59C34.329,38.153 32.209,39.031 29.999,39.031C27.789,39.031 25.67,38.153 24.107,36.59C22.544,35.028 21.666,32.908 21.666,30.698H19.166C18.706,30.698 18.333,30.325 18.333,29.865C18.333,29.404 18.706,29.031 19.166,29.031H25.833C26.293,29.031 26.666,29.404 26.666,29.865C26.666,30.325 26.293,30.698 25.833,30.698H23.333C23.333,32.466 24.035,34.162 25.285,35.412C26.535,36.662 28.231,37.364 29.999,37.364C31.767,37.364 33.463,36.662 34.713,35.412C35.964,34.162 36.666,32.466 36.666,30.698V3.198C36.666,2.738 37.039,2.365 37.499,2.365Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M5.833,25.698C3.532,25.698 1.666,23.832 1.666,21.531V11.531C1.666,9.23 3.532,7.365 5.833,7.365H29.166C31.467,7.365 33.333,9.23 33.333,11.531V21.531C33.333,23.832 31.467,25.698 29.166,25.698H5.833ZM3.333,11.531C3.333,10.151 4.452,9.031 5.833,9.031H29.166C30.547,9.031 31.666,10.151 31.666,11.531V21.531C31.666,22.912 30.547,24.031 29.166,24.031H21.483L19.975,17.996C19.882,17.625 19.548,17.365 19.166,17.365H15.833C15.45,17.365 15.117,17.625 15.024,17.996L13.515,24.031H5.833C4.452,24.031 3.333,22.912 3.333,21.531V11.531Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_media_play.xml b/designsystem/src/main/res/drawable/outlined_media_play.xml
index 5941032a..5843372d 100644
--- a/designsystem/src/main/res/drawable/outlined_media_play.xml
+++ b/designsystem/src/main/res/drawable/outlined_media_play.xml
@@ -3,7 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5.08 21.48a1.67 1.67 0 0 1-0.5-0.08a1.6 1.6 0 0 1-1.08-1.64V4.22C3.47 3.8 3.6 3.4 3.87 3.09A1.62 1.62 0 0 1 5 2.53C5.3 2.5 5.58 2.55 5.83 2.67l13.81 7.73a1.8 1.8 0 0 1 0.04 3.04L5.82 21.3a1.64 1.64 0 0 1-0.74 0.18zm0-18H5A0.58 0.58 0 0 0 4.6 3.7a0.54 0.54 0 0 0-0.14 0.43v15.7a0.59 0.59 0 0 0 0.85 0.59l13.81-7.84a0.68 0.68 0 0 0 0.22-0.23a0.79 0.79 0 0 0-0.25-1.1L5.32 3.56A0.63 0.63 0 0 0 5.1 3.53zM4 19.78z"/>
+  <path
+      android:pathData="M7.8,3.1c-0.3,-0.2 -0.8,0 -0.8,0.4v17c0,0.4 0.5,0.6 0.8,0.4l12,-8.5c0.3,-0.2 0.3,-0.6 0,-0.8L7.8,3.1ZM6,3.5c0,-1.2 1.4,-1.9 2.4,-1.2l12,8.5c0.8,0.6 0.8,1.9 0,2.4l-12,8.5c-1,0.7 -2.4,0 -2.4,-1.2V3.5Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularbottom.xml b/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularbottom.xml
index 22c25c1d..266f9331 100644
--- a/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularbottom.xml
+++ b/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularbottom.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M3.021,7.646C3.216,7.451 3.533,7.451 3.728,7.646L12.375,16.293L21.021,7.646C21.216,7.451 21.533,7.451 21.728,7.646C21.923,7.842 21.923,8.158 21.728,8.354L12.728,17.354C12.634,17.447 12.507,17.5 12.375,17.5C12.242,17.5 12.115,17.447 12.021,17.354L3.021,8.354C2.826,8.158 2.826,7.842 3.021,7.646Z"
+      android:pathData="M2.6,8.1c0.2,-0.2 0.5,-0.2 0.7,0l8.6,8.6 8.6,-8.6c0.2,-0.2 0.5,-0.2 0.7,0 0.2,0.2 0.2,0.5 0,0.7l-9,9c0,0 -0.2,0.1 -0.4,0.1s-0.3,0 -0.4,-0.1L2.6,8.9c-0.2,-0.2 -0.2,-0.5 0,-0.7Z"
       android:fillColor="#363636"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularleft.xml b/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularleft.xml
index 6e83e900..8a437f89 100644
--- a/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularleft.xml
+++ b/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularleft.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M16.728,2.646C16.923,2.842 16.923,3.158 16.728,3.354L8.082,12L16.728,20.646C16.923,20.842 16.923,21.158 16.728,21.354C16.533,21.549 16.216,21.549 16.021,21.354L7.021,12.354C6.927,12.26 6.875,12.133 6.875,12C6.875,11.867 6.927,11.74 7.021,11.646L16.021,2.646C16.216,2.451 16.533,2.451 16.728,2.646Z"
+      android:pathData="M15.9,2.6c0.2,0.2 0.2,0.5 0,0.7L7.2,12l8.6,8.6c0.2,0.2 0.2,0.5 0,0.7 -0.2,0.2 -0.5,0.2 -0.7,0L6.1,12.4c0,0 -0.1,-0.2 -0.1,-0.4s0,-0.3 0.1,-0.4L15.1,2.6c0.2,-0.2 0.5,-0.2 0.7,0Z"
       android:fillColor="#363636"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularright.xml b/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularright.xml
index 14a7249a..9fbb0239 100644
--- a/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularright.xml
+++ b/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregularright.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M8.021,2.646C8.216,2.451 8.533,2.451 8.728,2.646L17.728,11.646C17.822,11.74 17.875,11.867 17.875,12C17.875,12.133 17.822,12.26 17.728,12.354L8.728,21.354C8.533,21.549 8.216,21.549 8.021,21.354C7.826,21.158 7.826,20.842 8.021,20.646L16.667,12L8.021,3.354C7.826,3.158 7.826,2.842 8.021,2.646Z"
+      android:pathData="M8.1,2.6c0.2,-0.2 0.5,-0.2 0.7,0l9,9c0,0 0.1,0.2 0.1,0.4s0,0.3 -0.1,0.4l-9,9c-0.2,0.2 -0.5,0.2 -0.7,0 -0.2,-0.2 -0.2,-0.5 0,-0.7l8.6,-8.6L8.1,3.4c-0.2,-0.2 -0.2,-0.5 0,-0.7Z"
       android:fillColor="#363636"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregulartop.xml b/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregulartop.xml
index fcf35bd9..29c8c187 100644
--- a/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregulartop.xml
+++ b/designsystem/src/main/res/drawable/outlined_navigation_arrowctrlregulartop.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12.375,6.5C12.507,6.5 12.634,6.553 12.728,6.646L21.728,15.646C21.923,15.842 21.923,16.158 21.728,16.354C21.533,16.549 21.216,16.549 21.021,16.354L12.375,7.707L3.728,16.354C3.533,16.549 3.216,16.549 3.021,16.354C2.826,16.158 2.826,15.842 3.021,15.646L12.021,6.646C12.115,6.553 12.242,6.5 12.375,6.5Z"
+      android:pathData="M12,6c0.1,0 0.3,0 0.4,0.1l9,9c0.2,0.2 0.2,0.5 0,0.7 -0.2,0.2 -0.5,0.2 -0.7,0L12,7.2 3.4,15.9c-0.2,0.2 -0.5,0.2 -0.7,0 -0.2,-0.2 -0.2,-0.5 0,-0.7L11.6,6.1c0,0 0.2,-0.1 0.4,-0.1Z"
       android:fillColor="#363636"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/designsystem/src/main/res/drawable/outlined_product_eyeshadow.xml b/designsystem/src/main/res/drawable/outlined_product_eyeshadow.xml
new file mode 100644
index 00000000..472eda33
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_product_eyeshadow.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M9.166,7.896C9.166,8.356 9.539,8.729 9.999,8.729C10.459,8.729 10.833,8.356 10.833,7.896C10.833,6.976 11.579,6.229 12.499,6.229C12.959,6.229 13.333,5.856 13.333,5.396C13.333,4.936 12.959,4.562 12.499,4.562C11.579,4.562 10.833,3.816 10.833,2.896C10.833,2.436 10.459,2.062 9.999,2.062C9.539,2.062 9.166,2.436 9.166,2.896C9.166,3.816 8.419,4.562 7.499,4.562C7.039,4.562 6.666,4.936 6.666,5.396C6.666,5.856 7.039,6.229 7.499,6.229C8.419,6.229 9.166,6.976 9.166,7.896Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M30.833,3.743C28.104,3.743 25.576,4.835 23.605,6.626C23.336,6.871 23.257,7.263 23.41,7.593L27.501,16.43L28.333,34.583C28.339,35.344 28.671,35.923 29.117,36.369C29.331,36.583 29.578,36.769 29.885,36.894C30.19,37.018 30.506,37.063 30.833,37.063C31.573,37.063 32.132,36.793 32.607,36.318C33.115,35.81 33.327,35.098 33.333,34.584L34.155,16.451L38.256,7.593C38.402,7.276 38.336,6.901 38.089,6.654C36.081,4.646 33.527,3.743 30.833,3.743ZM29.999,34.524L29.199,17.076H32.458L31.667,34.525C31.666,34.537 31.666,34.55 31.666,34.563C31.666,34.617 31.651,34.726 31.604,34.851C31.558,34.974 31.494,35.074 31.428,35.14C31.237,35.331 31.092,35.396 30.833,35.396C30.66,35.396 30.569,35.372 30.513,35.35C30.46,35.328 30.394,35.289 30.296,35.191C30.079,34.974 29.999,34.791 29.999,34.563C29.999,34.55 29.999,34.537 29.999,34.524ZM28.865,15.41L25.187,7.465C25.677,7.071 26.198,6.727 26.744,6.439L28.26,9.609C28.459,10.024 28.956,10.2 29.371,10.001C29.787,9.803 29.962,9.305 29.764,8.89L28.285,5.798C29.103,5.544 29.958,5.41 30.833,5.41C32.948,5.41 34.901,6.052 36.49,7.44L32.8,15.41H28.865Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.666,23.729C11.666,25.57 10.174,27.062 8.333,27.062C6.492,27.062 4.999,25.57 4.999,23.729C4.999,21.888 6.492,20.396 8.333,20.396C10.174,20.396 11.666,21.888 11.666,23.729ZM8.333,25.396C9.253,25.396 9.999,24.65 9.999,23.729C9.999,22.809 9.253,22.062 8.333,22.062C7.412,22.062 6.666,22.809 6.666,23.729C6.666,24.65 7.412,25.396 8.333,25.396Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.666,27.062C18.507,27.062 19.999,25.57 19.999,23.729C19.999,21.888 18.507,20.396 16.666,20.396C14.825,20.396 13.333,21.888 13.333,23.729C13.333,25.57 14.825,27.062 16.666,27.062ZM18.333,23.729C18.333,24.65 17.587,25.396 16.666,25.396C15.745,25.396 14.999,24.65 14.999,23.729C14.999,22.809 15.745,22.062 16.666,22.062C17.587,22.062 18.333,22.809 18.333,23.729Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19.999,32.062C19.999,33.903 18.507,35.396 16.666,35.396C14.825,35.396 13.333,33.903 13.333,32.062C13.333,30.222 14.825,28.729 16.666,28.729C18.507,28.729 19.999,30.222 19.999,32.062ZM16.666,33.729C17.587,33.729 18.333,32.983 18.333,32.062C18.333,31.142 17.587,30.396 16.666,30.396C15.745,30.396 14.999,31.142 14.999,32.062C14.999,32.983 15.745,33.729 16.666,33.729Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8.333,35.396C10.174,35.396 11.666,33.903 11.666,32.062C11.666,30.222 10.174,28.729 8.333,28.729C6.492,28.729 4.999,30.222 4.999,32.062C4.999,33.903 6.492,35.396 8.333,35.396ZM9.999,32.062C9.999,32.983 9.253,33.729 8.333,33.729C7.412,33.729 6.666,32.983 6.666,32.062C6.666,31.142 7.412,30.396 8.333,30.396C9.253,30.396 9.999,31.142 9.999,32.062Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4.166,17.065C2.785,17.065 1.666,18.184 1.666,19.565V36.231C1.666,37.612 2.785,38.731 4.166,38.731H20.833C22.213,38.731 23.333,37.612 23.333,36.231V19.565C23.333,18.184 22.213,17.065 20.833,17.065H4.166ZM3.333,19.565C3.333,19.104 3.706,18.731 4.166,18.731H20.833C21.293,18.731 21.666,19.104 21.666,19.565V36.231C21.666,36.691 21.293,37.064 20.833,37.064H4.166C3.706,37.064 3.333,36.691 3.333,36.231V19.565Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M18.333,13.729C17.873,13.729 17.499,13.356 17.499,12.896C17.499,11.976 16.753,11.229 15.833,11.229C15.373,11.229 14.999,10.856 14.999,10.396C14.999,9.936 15.373,9.562 15.833,9.562C16.753,9.562 17.499,8.816 17.499,7.896C17.499,7.436 17.873,7.062 18.333,7.062C18.793,7.062 19.166,7.436 19.166,7.896C19.166,8.816 19.913,9.562 20.833,9.562C21.293,9.562 21.666,9.936 21.666,10.396C21.666,10.856 21.293,11.229 20.833,11.229C19.913,11.229 19.166,11.976 19.166,12.896C19.166,13.356 18.793,13.729 18.333,13.729Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_product_hairdetox.xml b/designsystem/src/main/res/drawable/outlined_product_hairdetox.xml
new file mode 100644
index 00000000..85253ab6
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_product_hairdetox.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M9.167,3.729C8.706,3.729 8.333,4.102 8.333,4.562V8.729H5.833C5.373,8.729 5,9.102 5,9.562V31.229C5,34.451 7.612,37.062 10.833,37.062H12.5C12.96,37.062 13.333,36.689 13.333,36.229C13.333,35.769 12.96,35.396 12.5,35.396H10.833C8.532,35.396 6.667,33.53 6.667,31.229V10.396H21.667V17.896C21.667,18.356 22.04,18.729 22.5,18.729C22.96,18.729 23.333,18.356 23.333,17.896V9.562C23.333,9.102 22.96,8.729 22.5,8.729H20V4.562C20,4.102 19.627,3.729 19.167,3.729H9.167ZM18.333,8.729V5.396H10V8.729H18.333Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M23.746,26.601C23.354,25.93 22.874,25.306 22.315,24.747C20.596,23.028 18.264,22.062 15.833,22.062C15.612,22.062 15.4,22.15 15.244,22.306C15.088,22.463 15,22.675 15,22.896V27.896C15,30.327 15.966,32.659 17.685,34.377C19.404,36.097 21.736,37.062 24.167,37.062C27.04,37.062 29.795,35.921 31.827,33.889C33.859,31.858 35,29.102 35,26.229V19.562C35,19.341 34.912,19.129 34.756,18.973C34.6,18.817 34.388,18.729 34.167,18.729C31.294,18.729 28.538,19.87 26.506,21.902C25.189,23.219 24.246,24.841 23.746,26.601ZM33.333,20.434C31.208,20.628 29.206,21.559 27.685,23.081C25.966,24.8 25,27.131 25,29.562V35.358C27.126,35.164 29.127,34.232 30.649,32.711C32.368,30.992 33.333,28.66 33.333,26.229V20.434ZM23.333,35.349V31.229C23.333,29.24 22.543,27.332 21.137,25.926C19.928,24.717 18.349,23.963 16.667,23.775V27.896C16.667,29.885 17.457,31.792 18.863,33.199C20.072,34.408 21.651,35.161 23.333,35.349Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_product_organicalcohol.xml b/designsystem/src/main/res/drawable/outlined_product_organicalcohol.xml
new file mode 100644
index 00000000..feae6ef5
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_product_organicalcohol.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M9.166,2.062C8.706,2.062 8.333,2.436 8.333,2.896V8.729H7.499C6.119,8.729 4.999,9.848 4.999,11.229V13.729H4.166C2.785,13.729 1.666,14.848 1.666,16.229V36.229C1.666,37.61 2.785,38.729 4.166,38.729H15.833C16.293,38.729 16.666,38.356 16.666,37.896C16.666,37.436 16.293,37.062 15.833,37.062H4.166C3.706,37.062 3.333,36.689 3.333,36.229V16.229C3.333,15.769 3.706,15.396 4.166,15.396H20.833C21.293,15.396 21.666,15.769 21.666,16.229V19.562C21.666,20.023 22.039,20.396 22.499,20.396C22.96,20.396 23.333,20.023 23.333,19.562V16.229C23.333,14.848 22.213,13.729 20.833,13.729H19.999V11.229C19.999,9.848 18.88,8.729 17.499,8.729H16.666V3.729H22.498C22.958,3.729 23.331,3.356 23.331,2.896C23.331,2.436 22.958,2.062 22.498,2.062H9.166ZM14.999,8.729V3.729H9.999V8.729H14.999ZM7.499,10.396C7.039,10.396 6.666,10.769 6.666,11.229V13.729H18.333V11.229C18.333,10.769 17.96,10.396 17.499,10.396H7.499Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M27.079,28.268C26.686,27.597 26.207,26.973 25.648,26.414C23.929,24.695 21.597,23.729 19.166,23.729C18.945,23.729 18.733,23.817 18.577,23.973C18.42,24.129 18.333,24.341 18.333,24.562V29.562C18.333,31.994 19.299,34.325 21.017,36.044C22.737,37.763 25.068,38.729 27.499,38.729C30.372,38.729 33.128,37.588 35.16,35.556C37.191,33.525 38.333,30.769 38.333,27.896V21.229C38.333,21.008 38.245,20.796 38.089,20.64C37.932,20.484 37.72,20.396 37.499,20.396C34.626,20.396 31.871,21.537 29.839,23.569C28.522,24.886 27.579,26.507 27.079,28.268ZM36.666,22.1C34.541,22.294 32.539,23.226 31.017,24.747C29.299,26.466 28.333,28.798 28.333,31.229V37.025C30.458,36.831 32.46,35.899 33.981,34.378C35.7,32.659 36.666,30.327 36.666,27.896V22.1ZM26.666,37.016V32.896C26.666,30.907 25.876,28.999 24.469,27.593C23.261,26.384 21.682,25.63 19.999,25.442V29.562C19.999,31.552 20.789,33.459 22.196,34.866C23.405,36.074 24.983,36.828 26.666,37.016Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M26.666,3.729C26.445,3.729 26.233,3.817 26.077,3.973L26.073,3.977L26.066,3.984L26.042,4.008C26.022,4.029 25.993,4.059 25.956,4.098C25.882,4.174 25.779,4.285 25.656,4.422C25.41,4.695 25.081,5.079 24.749,5.521C24.42,5.96 24.076,6.473 23.811,7.002C23.553,7.518 23.333,8.124 23.333,8.729C23.333,9.873 23.914,10.719 24.585,11.252C25.225,11.761 26.026,12.05 26.664,12.046C27.371,12.055 28.182,11.775 28.823,11.243C29.49,10.691 29.999,9.84 29.999,8.729C29.999,8.124 29.779,7.518 29.521,7.002C29.256,6.473 28.912,5.96 28.583,5.521C28.251,5.079 27.922,4.695 27.676,4.422C27.553,4.285 27.449,4.174 27.376,4.098C27.34,4.059 27.31,4.029 27.29,4.008L27.266,3.984L27.259,3.977L27.255,3.973C27.099,3.817 26.887,3.729 26.666,3.729ZM26.083,6.521C26.284,6.252 26.487,6.005 26.666,5.797C26.845,6.005 27.048,6.252 27.249,6.521C27.545,6.915 27.826,7.34 28.03,7.748C28.241,8.169 28.333,8.501 28.333,8.729C28.333,9.285 28.092,9.684 27.759,9.961C27.403,10.255 26.97,10.384 26.68,10.38L26.656,10.38C26.463,10.382 26.019,10.263 25.622,9.947C25.252,9.653 24.999,9.252 24.999,8.729C24.999,8.501 25.091,8.169 25.302,7.748C25.506,7.34 25.787,6.915 26.083,6.521Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_product_recyclablepackaging.xml b/designsystem/src/main/res/drawable/outlined_product_recyclablepackaging.xml
new file mode 100644
index 00000000..a3395f43
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_product_recyclablepackaging.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M5.834,2.062C5.374,2.062 5.001,2.436 5.001,2.896C5.001,3.356 5.374,3.729 5.834,3.729H6.667V7.062H5.834C5.596,7.062 5.37,7.164 5.212,7.341C5.054,7.519 4.979,7.756 5.006,7.992L5.007,7.996L5.009,8.016L5.017,8.094C5.024,8.164 5.034,8.266 5.045,8.394C5.068,8.651 5.095,9.009 5.113,9.416C5.149,10.247 5.145,11.209 5.015,11.911C4.923,12.404 4.727,12.997 4.489,13.592C3.844,15.206 3.334,16.964 3.334,18.804L3.334,37.896C3.334,38.356 3.707,38.729 4.167,38.729H19.167C19.628,38.729 20.001,38.356 20.001,37.896V33.729H18.334V37.062H5.001L5.001,18.804C5.001,17.265 5.429,15.732 6.037,14.21C6.291,13.574 6.533,12.865 6.653,12.214C6.82,11.316 6.815,10.195 6.778,9.342C6.768,9.122 6.756,8.915 6.743,8.729H16.592C16.579,8.915 16.567,9.122 16.557,9.342C16.52,10.195 16.515,11.316 16.681,12.214C16.802,12.865 17.044,13.574 17.298,14.21C17.906,15.732 18.334,17.265 18.334,18.804V20.812L20.001,20.366V18.804C20.001,16.964 19.49,15.206 18.845,13.592C18.608,12.997 18.412,12.404 18.32,11.911C18.19,11.209 18.185,10.247 18.222,9.416C18.24,9.009 18.267,8.651 18.289,8.394C18.3,8.266 18.31,8.164 18.317,8.094L18.326,8.016L18.328,7.996L18.329,7.991C18.356,7.755 18.281,7.519 18.123,7.341C17.965,7.164 17.738,7.062 17.501,7.062H16.667V3.729H20.832C21.293,3.729 21.666,3.356 21.666,2.896C21.666,2.436 21.293,2.062 20.832,2.062H5.834ZM15.001,7.062V3.729H8.334V7.062H15.001Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M26.668,14.562C26.965,14.563 27.24,14.721 27.389,14.978L31.324,21.775L32.033,19.127C32.152,18.683 32.609,18.419 33.054,18.538C33.498,18.657 33.762,19.114 33.643,19.559L32.423,24.112C32.304,24.557 31.847,24.821 31.402,24.701L26.849,23.481C26.404,23.362 26.14,22.905 26.26,22.461C26.379,22.016 26.836,21.752 27.28,21.872L29.853,22.561L26.667,17.058L24.973,19.98C24.742,20.378 24.232,20.514 23.834,20.283C23.436,20.053 23.3,19.543 23.531,19.145L25.946,14.978C26.096,14.721 26.37,14.562 26.668,14.562Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M18.465,24.228L20.981,23.554L16.779,30.812C16.63,31.069 16.63,31.387 16.779,31.645C16.927,31.903 17.203,32.062 17.501,32.062H22.501C22.961,32.062 23.334,31.689 23.334,31.229C23.334,30.769 22.961,30.396 22.501,30.396H18.946L22.493,24.269L23.218,26.972C23.337,27.417 23.794,27.681 24.238,27.562C24.683,27.442 24.947,26.986 24.828,26.541L23.608,21.988C23.488,21.543 23.031,21.279 22.587,21.398L18.033,22.618C17.589,22.737 17.325,23.194 17.444,23.639C17.563,24.084 18.02,24.347 18.465,24.228Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M33.003,26.314C33.401,26.085 33.911,26.222 34.141,26.62L36.556,30.813C36.705,31.071 36.704,31.389 36.556,31.646C36.407,31.904 36.132,32.062 35.834,32.062H27.846L29.757,33.973C30.082,34.299 30.082,34.826 29.757,35.152C29.431,35.477 28.903,35.477 28.578,35.152L25.245,31.818C25.165,31.739 25.104,31.646 25.064,31.548C25.024,31.451 25.001,31.345 25.001,31.234L25.001,31.229L25.001,31.224C25.001,31.113 25.024,31.007 25.064,30.91C25.104,30.812 25.165,30.72 25.245,30.64L28.578,27.306C28.903,26.981 29.431,26.981 29.757,27.306C30.082,27.632 30.082,28.16 29.757,28.485L27.846,30.396H34.392L32.696,27.452C32.467,27.054 32.604,26.544 33.003,26.314Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/outlined_product_refill.xml b/designsystem/src/main/res/drawable/outlined_product_refill.xml
new file mode 100644
index 00000000..034745fd
--- /dev/null
+++ b/designsystem/src/main/res/drawable/outlined_product_refill.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="41dp"
+    android:viewportWidth="40"
+    android:viewportHeight="41">
+  <path
+      android:pathData="M3.546,3.705C3.704,3.528 3.93,3.427 4.167,3.427H25.834C26.071,3.427 26.297,3.528 26.455,3.705C26.613,3.881 26.688,4.117 26.662,4.352L24.904,20.178C24.853,20.635 24.441,20.965 23.984,20.914C23.526,20.863 23.197,20.451 23.247,19.994L24.903,5.094H5.098L8.271,33.65C8.332,33.671 8.398,33.693 8.469,33.717C8.901,33.862 9.511,34.056 10.223,34.254C11.66,34.652 13.459,35.048 15.025,35.094C16.566,35.139 18.35,34.748 19.784,34.326C20.225,34.195 20.688,34.448 20.819,34.889C20.949,35.331 20.697,35.794 20.255,35.924C18.767,36.363 16.783,36.813 14.976,36.76C13.209,36.708 11.258,36.27 9.778,35.86C9.032,35.653 8.392,35.449 7.939,35.297C7.712,35.221 7.531,35.157 7.405,35.112C7.343,35.09 7.294,35.072 7.261,35.06L7.222,35.046L7.209,35.041L7.501,34.26C7.207,35.04 7.209,35.041 7.209,35.041C6.915,34.93 6.707,34.664 6.672,34.352L3.339,4.352C3.313,4.117 3.388,3.881 3.546,3.705Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M10.229,8.688C10.386,8.521 10.605,8.427 10.834,8.427H19.167C19.396,8.427 19.615,8.521 19.773,8.688C19.93,8.854 20.012,9.078 19.999,9.307L19.166,24.306C19.142,24.748 18.776,25.094 18.334,25.094H11.667C11.225,25.094 10.86,24.748 10.835,24.306L10.002,9.307C9.989,9.078 10.071,8.854 10.229,8.688ZM11.715,10.094L12.456,23.427H17.546L18.286,10.094H11.715Z"
+      android:fillColor="#363636"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M35.965,22.594C35.965,22.133 35.592,21.76 35.132,21.76C34.672,21.76 34.299,22.133 34.299,22.594V23.791C32.958,22.532 31.153,21.76 29.167,21.76C25.025,21.76 21.667,25.118 21.667,29.26C21.667,29.721 22.04,30.094 22.501,30.094C22.961,30.094 23.334,29.721 23.334,29.26C23.334,26.039 25.946,23.427 29.167,23.427C30.844,23.427 32.357,24.135 33.422,25.269H31.623C31.163,25.269 30.79,25.642 30.79,26.102C30.79,26.563 31.163,26.936 31.623,26.936H35.025C35.035,26.936 35.046,26.936 35.057,26.936H35.132C35.592,26.936 35.965,26.563 35.965,26.102V22.594Z"
+      android:fillColor="#363636"/>
+  <path
+      android:pathData="M22.369,32.418C22.369,31.958 22.742,31.585 23.203,31.585H23.275C23.288,31.585 23.3,31.585 23.313,31.585H26.711C27.172,31.585 27.545,31.958 27.545,32.418C27.545,32.879 27.172,33.252 26.711,33.252H24.913C25.978,34.386 27.49,35.094 29.167,35.094C32.389,35.094 35.001,32.482 35.001,29.26C35.001,28.8 35.374,28.427 35.834,28.427C36.294,28.427 36.667,28.8 36.667,29.26C36.667,33.402 33.31,36.76 29.167,36.76C27.182,36.76 25.377,35.988 24.036,34.73V35.927C24.036,36.387 23.663,36.76 23.203,36.76C22.742,36.76 22.369,36.387 22.369,35.927V32.418Z"
+      android:fillColor="#363636"/>
+</vector>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 497862a8..7c876b25 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -11,6 +11,12 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light">
+        <activity
+            android:name=".components.GaYaRadiobuttonActivity"
+            android:theme="@style/Theme.Natura.Light"  />
+        <activity
+            android:name=".components.GaYaCheckboxActivity"
+            android:theme="@style/Theme.Natura.Light" />
         <activity
             android:name=".components.GaYaShortcutActivity"
             android:theme="@style/Theme.Natura.Light" />
diff --git a/sample/src/main/assets/icons_map.txt b/sample/src/main/assets/icons_map.txt
index 39aa6548..8402ea8a 100644
--- a/sample/src/main/assets/icons_map.txt
+++ b/sample/src/main/assets/icons_map.txt
@@ -47,10 +47,16 @@ filled_communication_noconnection
 filled_content_bathtub
 filled_content_channel
 filled_content_childfriendly
+filled_content_crueltyfreebunny
 filled_content_design
 filled_content_divulgation
 filled_content_dropper
+filled_content_exfoliator
 filled_content_gauge
+filled_content_giftpricefair
+filled_content_giftpricegreat
+filled_content_giftpricehigh
+filled_content_giftpricespecial
 filled_content_gymdumbbell
 filled_content_hairbeard
 filled_content_handsoap
@@ -62,9 +68,11 @@ filled_content_mortar
 filled_content_oil
 filled_content_oilunavailable
 filled_content_palette
+filled_content_plasticfree
 filled_content_quote
 filled_content_sensitive
 filled_content_shower
+filled_content_snorkelmask
 filled_content_soap
 filled_content_soapbubble
 filled_content_violence
@@ -142,8 +150,10 @@ filled_product_combcream
 filled_product_conditioner
 filled_product_cube
 filled_product_deodorantrollon
+filled_product_eyeshadow
 filled_product_fashion
 filled_product_haircream
+filled_product_hairdetox
 filled_product_hairdresser
 filled_product_hairgel
 filled_product_makeconcealer
@@ -151,7 +161,10 @@ filled_product_makeeyeliner
 filled_product_makefoundation
 filled_product_makemask
 filled_product_nailpolish
+filled_product_organicalcohol
 filled_product_pencilblush
+filled_product_recyclablepackaging
+filled_product_refill
 filled_product_shampoo
 filled_product_soapliquid
 filled_social_fireworks
@@ -264,17 +277,23 @@ outlined_content_childfriendly
 outlined_content_christmascard
 outlined_content_cloud
 outlined_content_consistency
+outlined_content_crueltyfreebunny
 outlined_content_design
 outlined_content_divulgation
 outlined_content_dropper
 outlined_content_education
 outlined_content_emptybag
 outlined_content_exchangereports
+outlined_content_exfoliator
 outlined_content_flower
 outlined_content_fragrance
 outlined_content_gallery
 outlined_content_gauge
 outlined_content_gift
+outlined_content_giftpricefair
+outlined_content_giftpricegreat
+outlined_content_giftpricehigh
+outlined_content_giftpricespecial
 outlined_content_global
 outlined_content_gymdumbbell
 outlined_content_hairbeard
@@ -305,6 +324,7 @@ outlined_content_oilunavailable
 outlined_content_palette
 outlined_content_password
 outlined_content_planb
+outlined_content_plasticfree
 outlined_content_productshowcase
 outlined_content_produtivity
 outlined_content_rainycloud
@@ -312,6 +332,7 @@ outlined_content_report
 outlined_content_saleinsight
 outlined_content_sensitive
 outlined_content_shower
+outlined_content_snorkelmask
 outlined_content_snow
 outlined_content_soap
 outlined_content_soapbubble
@@ -433,6 +454,7 @@ outlined_product_childish
 outlined_product_combcream
 outlined_product_conditioner
 outlined_product_cube
+outlined_product_eyeshadow
 outlined_product_dailycare
 outlined_product_deodorantrollon
 outlined_product_ekos
@@ -441,6 +463,7 @@ outlined_product_face
 outlined_product_fashion
 outlined_product_hair
 outlined_product_haircream
+outlined_product_hairdetox
 outlined_product_hairdresser
 outlined_product_hairgel
 outlined_product_lashes
@@ -452,6 +475,7 @@ outlined_product_makefoundation
 outlined_product_makemask
 outlined_product_makeup
 outlined_product_nailpolish
+outlined_product_organicalcohol
 outlined_product_outlet
 outlined_product_pencil
 outlined_product_pencilblush
@@ -462,7 +486,9 @@ outlined_product_perfumerytbs
 outlined_product_powder
 outlined_product_primer
 outlined_product_promotionproduct
+outlined_product_recyclablepackaging
 outlined_product_relatedproducts
+outlined_product_refill
 outlined_product_repurchase
 outlined_product_scent
 outlined_product_shampoo
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 96a56a82..5287044d 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
@@ -26,8 +26,10 @@ import com.natura.android.sample.components.AvatarActivity
 import com.natura.android.sample.components.ChipActivity
 import com.natura.android.sample.components.AlertActivity
 import com.natura.android.sample.components.GaYaButtonActivity
+import com.natura.android.sample.components.GaYaCheckboxActivity
 import com.natura.android.sample.components.GaYaChipActivity
 import com.natura.android.sample.components.GaYaIconButtonActivity
+import com.natura.android.sample.components.GaYaRadiobuttonActivity
 import com.natura.android.sample.components.GaYaShortcutActivity
 import com.natura.android.sample.components.SnackbarActivity
 import com.natura.android.sample.components.listitem.ListItemActivity
@@ -219,5 +221,13 @@ class MainActivity : AppCompatActivity() {
         binding.gayaShortcutButton.setOnClickListener {
             startActivity(Intent(this, GaYaShortcutActivity::class.java))
         }
+
+        binding.gayaCheckboxButton.setOnClickListener {
+            startActivity(Intent(this, GaYaCheckboxActivity::class.java))
+        }
+
+        binding.gayaRadiobuttonButton.setOnClickListener {
+            startActivity(Intent(this, GaYaRadiobuttonActivity::class.java))
+        }
     }
 }
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/GaYaCheckboxActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/GaYaCheckboxActivity.kt
new file mode 100644
index 00000000..47602693
--- /dev/null
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/GaYaCheckboxActivity.kt
@@ -0,0 +1,50 @@
+package com.natura.android.sample.components
+
+import android.os.Bundle
+import android.view.MenuItem
+import android.widget.LinearLayout
+import androidx.appcompat.app.AppCompatActivity
+import com.natura.android.checkbox.GaYaCheckbox
+import com.natura.android.checkbox.GaYaCheckboxState
+import com.natura.android.sample.R
+import com.natura.android.sample.setChosenDefaultTheme
+
+class GaYaCheckboxActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setChosenDefaultTheme()
+
+        val checkboxPrimaryChecked: GaYaCheckbox by lazy { findViewById(R.id.checkboxPrimaryChecked) }
+        val checkboxPrimaryIndeterminate: GaYaCheckbox by lazy { findViewById(R.id.checkboxPrimaryIndeterminate) }
+
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_gaya_checkbox)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.title = "GaYaCheckbox"
+
+        checkboxPrimaryIndeterminate.state = GaYaCheckboxState.INDETERMINATE
+        checkboxPrimaryChecked.state = GaYaCheckboxState.CHECKED
+
+        val gaYaCheckbox = GaYaCheckbox(this).apply {
+            text = "Adicionado programaticamente"
+            isChecked = true
+            isEnabled = true
+        }
+
+        val gaYaCheckboxAvon = GaYaCheckbox(this, R.style.Theme_Avon_Light_SSOT).apply {
+            text = "GaYaCheckbox Avon"
+            isChecked = true
+            isEnabled = true
+        }
+
+        val container: LinearLayout = findViewById(R.id.lnlProgramatically)
+        container.addView(gaYaCheckbox)
+        container.addView(gaYaCheckboxAvon)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        onBackPressed()
+        return true
+    }
+}
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/GaYaRadiobuttonActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/GaYaRadiobuttonActivity.kt
new file mode 100644
index 00000000..a173e6c7
--- /dev/null
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/GaYaRadiobuttonActivity.kt
@@ -0,0 +1,43 @@
+package com.natura.android.sample.components
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.view.MenuItem
+import android.widget.LinearLayout
+import com.natura.android.radiobutton.GaYaRadiobutton
+import com.natura.android.sample.R
+import com.natura.android.sample.setChosenDefaultTheme
+
+class GaYaRadiobuttonActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setChosenDefaultTheme()
+
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_gaya_radiobutton)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.title = "GaYaRadiobutton"
+
+        val gaYaRadiobutton = GaYaRadiobutton(this).apply {
+            text = "Adicionado programaticamente"
+            isChecked = true
+            isEnabled = true
+        }
+
+        val gaYaRadiobuttonAvon = GaYaRadiobutton(this, R.style.Theme_Avon_Light_SSOT).apply {
+            text = "GaYaRadiobutton Avon"
+            isChecked = true
+            isEnabled = true
+        }
+
+        val container: LinearLayout = findViewById(R.id.lnlProgramatically)
+        container.addView(gaYaRadiobutton)
+        container.addView(gaYaRadiobuttonAvon)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        onBackPressed()
+        return true
+    }
+}
diff --git a/sample/src/main/res/layout/activity_gaya_checkbox.xml b/sample/src/main/res/layout/activity_gaya_checkbox.xml
new file mode 100644
index 00000000..d673f586
--- /dev/null
+++ b/sample/src/main/res/layout/activity_gaya_checkbox.xml
@@ -0,0 +1,77 @@
+<?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="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="start"
+        android:orientation="vertical"
+        android:padding="@dimen/ds_spacing_large"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.natura.android.checkbox.GaYaCheckbox
+            android:id="@+id/checkboxPrimaryChecked"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="?spacingSmall"
+            android:checked="true"
+            android:text="@string/checkbox_screen_checkbox_primary_checked_text" />
+
+        <com.natura.android.checkbox.GaYaCheckbox
+            android:id="@+id/checkboxPrimaryIndeterminate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="?spacingSmall"
+            android:text="@string/checkbox_screen_checkbox_primary_indeterminate_text" />
+
+        <com.natura.android.checkbox.GaYaCheckbox
+            android:id="@+id/checkboxPrimaryUnchecked"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="?spacingSmall"
+            android:checked="false"
+            android:text="@string/checkbox_screen_checkbox_primary_unchecked_text" />
+
+        <com.natura.android.checkbox.GaYaCheckbox
+            android:id="@+id/checkboxPrimaryCheckedDisabled"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="?spacingSmall"
+            android:checked="true"
+            android:enabled="false"
+            android:text="@string/checkbox_screen_checkbox_primary_checked_disabled_text" />
+
+        <com.natura.android.checkbox.GaYaCheckbox
+            android:id="@+id/checkboxPrimaryUncheckedDisabled"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="?spacingSmall"
+            android:enabled="false"
+            android:text="@string/checkbox_screen_checkbox_primary_unchecked_disabled_text" />
+
+        <LinearLayout
+            android:id="@+id/lnlProgramatically"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginTop="@dimen/ds_spacing_small"
+            android:layout_marginStart="@dimen/ds_spacing_micro"
+            android:layout_marginEnd="@dimen/ds_spacing_micro">
+
+            <TextView
+                android:id="@+id/txvAddingByCode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="ADD PROGRAMMATICALLY"
+                android:layout_marginBottom="16dp"
+                android:textAppearance="?textAppearanceHeadline6"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_gaya_radiobutton.xml b/sample/src/main/res/layout/activity_gaya_radiobutton.xml
new file mode 100644
index 00000000..32b0f38d
--- /dev/null
+++ b/sample/src/main/res/layout/activity_gaya_radiobutton.xml
@@ -0,0 +1,65 @@
+<?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="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:orientation="vertical"
+        android:padding="@dimen/ds_spacing_large"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <RadioGroup
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.natura.android.radiobutton.GaYaRadiobutton
+                android:id="@+id/radioPrimary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:text="@string/radio_button_screen_radio_primary_text" />
+
+            <com.natura.android.radiobutton.GaYaRadiobutton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:enabled="false"
+                android:text="@string/radio_button_screen_radio_primary_disabled_text" />
+
+            <com.natura.android.radiobutton.GaYaRadiobutton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:checked="true"
+                android:enabled="false"
+                android:text="@string/radio_button_screen_radio_primary_disabled_checked_text" />
+        </RadioGroup>
+
+        <LinearLayout
+            android:id="@+id/lnlProgramatically"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginTop="@dimen/ds_spacing_small"
+            android:layout_marginStart="@dimen/ds_spacing_micro"
+            android:layout_marginEnd="@dimen/ds_spacing_micro">
+
+            <TextView
+                android:id="@+id/txvAddingByCode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="ADD PROGRAMMATICALLY"
+                android:layout_marginBottom="16dp"
+                android:textAppearance="?textAppearanceHeadline6"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 d01df89d..ef41ce3d 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -234,6 +234,18 @@
             android:textAlignment="textStart"
             android:textColor="@color/highEmphasis" />
 
+        <Button
+            android:id="@+id/gayaCheckboxButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:background="@color/surface"
+            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:padding="16dp"
+            android:text="GaYaCheckbox"
+            android:textAlignment="textStart"
+            android:textColor="@color/highEmphasis" />
+
         <Button
             android:id="@+id/chipButton"
             android:layout_width="match_parent"
@@ -379,6 +391,18 @@
             android:textAlignment="textStart"
             android:textColor="@color/highEmphasis" />
 
+        <Button
+            android:id="@+id/gayaRadiobuttonButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:background="@color/surface"
+            android:drawableRight="@drawable/outlined_navigation_arrowleft"
+            android:padding="16dp"
+            android:text="GaYaRadiobutton"
+            android:textAlignment="textStart"
+            android:textColor="@color/highEmphasis" />
+
         <Button
             android:id="@+id/selectButton"
             android:layout_width="match_parent"
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 170d8f0e..c798f10d 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -15,11 +15,11 @@
     <string name="avatar_screen_semix_with_image_text">SemiX</string>
     <string name="avatar_screen_medium_with_image_text">Medium</string>
     <string name="avatar_screen_largexxx_with_image_text">LargeXXX</string>
-    <string name="radio_button_screen_radio_primary_text">Radio Primary</string>
+    <string name="radio_button_screen_radio_primary_text">Active not selected</string>
     <string name="radio_button_screen_radio_secondary_text">Radio Secondary</string>
-    <string name="radio_button_screen_radio_primary_disabled_text">Radio Primary Disabled</string>
-    <string name="radio_button_screen_radio_primary_disabled_checked_text">Radio Primary Disabled Checked</string>
-    <string name="radio_button_screen_radio_secondary_disabled_checked_text">Radio Secondary Disable Checked</string>
+    <string name="radio_button_screen_radio_primary_disabled_text">Disabled not selected</string>
+    <string name="radio_button_screen_radio_primary_disabled_checked_text">Disabled selected</string>
+    <string name="radio_button_screen_radio_secondary_disabled_checked_text">Disabled selected</string>
     <string name="card_screen_overline_text">Overline</string>
     <string name="card_screen_header_text">Header 6</string>
     <string name="card_screen_caption_text">Caption</string>
@@ -82,11 +82,11 @@
     <string name="button_screen_outlined_disabled_semi_text">disable outlined - semi</string>
     <string name="button_screen_text_medium_text">text</string>
     <string name="button_screen_text_medium_disabled_text">disable text</string>
-    <string name="checkbox_screen_checkbox_primary_checked_text">Checkbox Primary Checked</string>
-    <string name="checkbox_screen_checkbox_primary_indeterminate_text">CheckBox Primary Indeterminate</string>
-    <string name="checkbox_screen_checkbox_primary_unchecked_text">Checkbox Primary Unchecked</string>
-    <string name="checkbox_screen_checkbox_primary_checked_disabled_text">CheckBox Primary Checked Disabled</string>
-    <string name="checkbox_screen_checkbox_primary_unchecked_disabled_text">CheckBox Primary Unchecked Disabled</string>
+    <string name="checkbox_screen_checkbox_primary_checked_text">Checked</string>
+    <string name="checkbox_screen_checkbox_primary_indeterminate_text">Indeterminate</string>
+    <string name="checkbox_screen_checkbox_primary_unchecked_text">Unchecked</string>
+    <string name="checkbox_screen_checkbox_primary_checked_disabled_text">Checked disabled</string>
+    <string name="checkbox_screen_checkbox_primary_unchecked_disabled_text">Unchecked disabled</string>
     <string name="counter_screen_size_medium_text">Size Medium</string>
     <string name="counter_screen_size_semix_text">Size Semix</string>
     <string name="counter_screen_subtract_disable_text">Subtract Disable</string>
@@ -381,4 +381,5 @@
         libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus
         vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim.
     </string>
+    <string name="title_activity_ga_ya_checkbox">GaYaCheckboxActivity</string>
 </resources>