diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/DesignSystemButtons.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/DesignSystemButtons.kt
new file mode 100644
index 0000000000..99cdb213f4
--- /dev/null
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/DesignSystemButtons.kt
@@ -0,0 +1,78 @@
+package com.anytypeio.anytype.core_ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import com.anytypeio.anytype.core_ui.R
+
+class ButtonPrimaryXSmall @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.primaryXSmallButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonPrimarySmall @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.primarySmallButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonPrimaryMedium @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.primaryMediumButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonPrimaryLarge @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.primaryLargeButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonSecondaryXSmall @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.secondaryXSmallButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonSecondarySmall @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.secondarySmallButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonSecondaryMedium @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.secondaryMediumButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonSecondaryLarge @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.secondaryLargeButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonWarningXSmall @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.warningXSmallButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonWarningSmall @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.warningSmallButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonWarningMedium @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.warningMediumButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
+
+class ButtonWarningLarge @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.warningLargeButtonStyle,
+) : AppCompatTextView(context, attrs, defStyleAttr)
diff --git a/core-ui/src/main/res/color/text_color_button_warning_selector.xml b/core-ui/src/main/res/color/text_color_button_warning_selector.xml
new file mode 100644
index 0000000000..754c6ab732
--- /dev/null
+++ b/core-ui/src/main/res/color/text_color_button_warning_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/palette_system_red" android:state_enabled="true" android:state_pressed="false" />
+    <item android:color="@color/palette_light_red" android:state_enabled="true" android:state_pressed="true" />
+</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/button_background_warning.xml b/core-ui/src/main/res/drawable/button_background_warning.xml
new file mode 100644
index 0000000000..3b9c0056a4
--- /dev/null
+++ b/core-ui/src/main/res/drawable/button_background_warning.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true">
+        <shape android:shape="rectangle">
+            <stroke android:color="@color/shape_primary" android:width="1dp"/>
+            <corners android:radius="8dp" />
+            <solid android:color="@color/background_primary" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/ds_button_number.xml b/core-ui/src/main/res/layout/ds_button_number.xml
index 035e8daf61..64faa3aedb 100644
--- a/core-ui/src/main/res/layout/ds_button_number.xml
+++ b/core-ui/src/main/res/layout/ds_button_number.xml
@@ -6,15 +6,13 @@
     android:clickable="true"
     tools:context="com.anytypeio.anytype.core_ui.widgets.NumberButton">
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
         android:id="@+id/button"
         style="?attr/primaryLargeNumberButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clickable="false"
-        android:stateListAnimator="@null"
         android:text="Button"
-        android:textAppearance="?attr/primaryLargeNumberButtonTextAppearance"
         android:visibility="visible" />
 
     <TextView
diff --git a/core-ui/src/main/res/values/design_system.xml b/core-ui/src/main/res/values/design_system.xml
index 0319bbef30..c4d30050be 100644
--- a/core-ui/src/main/res/values/design_system.xml
+++ b/core-ui/src/main/res/values/design_system.xml
@@ -244,43 +244,54 @@
 
     <!--https://www.figma.com/file/vgXV7x2v20vJajc7clYJ7a/Mobile-Design-System?node-id=1588%3A59&t=9DPtsMxKLupkwVfY-1-->
     <!-- MOBILE DESIGN SYSTEM, Buttons-->
-    <style name="BaseButton" parent="Widget.MaterialComponents.Button">
-        <item name="android:stateListAnimator">@null</item>
-    </style>
-
-    <style name="Button.Primary" parent="BaseButton">
+    <style name="Button.Primary.XSmall" parent="TextView.UXStyle.Captions.1.Medium">
         <item name="android:background">@drawable/button_background_primary_selector</item>
         <item name="android:textColor">@color/text_color_button_primary_selector</item>
-        <item name="backgroundTint">@null</item>
-        <item name="android:minHeight">0dp</item>
-        <item name="android:minWidth">0dp</item>
-    </style>
-
-    <style name="Button.Primary.XSmall" parent="Button.Primary">
+        <item name="android:stateListAnimator">@null</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:paddingLeft">10dp</item>
         <item name="android:paddingRight">10dp</item>
-        <item name="android:insetTop">0dp</item>
-        <item name="android:insetBottom">0dp</item>
+        <item name="android:paddingTop">5dp</item>
+        <item name="android:paddingBottom">5dp</item>
     </style>
 
-    <style name="Button.Primary.Small" parent="Button.Primary">
+    <style name="Button.Primary.Small" parent="TextView.UXStyle.Body.Callout.Medium">
+        <item name="android:background">@drawable/button_background_primary_selector</item>
+        <item name="android:textColor">@color/text_color_button_primary_selector</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:paddingLeft">12dp</item>
         <item name="android:paddingRight">12dp</item>
-        <item name="android:insetTop">2.5dp</item>
-        <item name="android:insetBottom">2.5dp</item>
+        <item name="android:paddingTop">7dp</item>
+        <item name="android:paddingBottom">7dp</item>
     </style>
 
-    <style name="Button.Primary.Medium" parent="Button.Primary">
+    <style name="Button.Primary.Medium" parent="TextView.UXStyle.Buttons.Medium">
+        <item name="android:background">@drawable/button_background_primary_selector</item>
+        <item name="android:textColor">@color/text_color_button_primary_selector</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:paddingLeft">56dp</item>
         <item name="android:paddingRight">56dp</item>
-        <item name="android:insetTop">5dp</item>
-        <item name="android:insetBottom">5dp</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
     </style>
 
-    <style name="Button.Primary.Large" parent="Button.Primary">
+    <style name="Button.Primary.Large" parent="TextView.UXStyle.Buttons.Medium">
+        <item name="android:background">@drawable/button_background_primary_selector</item>
+        <item name="android:textColor">@color/text_color_button_primary_selector</item>
+        <item name="android:stateListAnimator">@null</item>
         <item name="android:layout_width">match_parent</item>
-        <item name="android:insetTop">7dp</item>
-        <item name="android:insetBottom">7dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingBottom">12dp</item>
     </style>
 
     <style name="Button.Primary.Large.Icon" parent="Widget.Material3.Button.TextButton">
@@ -289,60 +300,110 @@
         <item name="android:insetBottom">7dp</item>
     </style>
 
-    <style name="Button.Secondary" parent="BaseButton">
+    <style name="Button.Secondary.XSmall" parent="TextView.UXStyle.Captions.1.Medium">
         <item name="android:background">@drawable/button_background_secondary_selector</item>
         <item name="android:textColor">@color/text_color_button_secondary_selector</item>
-        <item name="backgroundTint">@null</item>
-        <item name="android:minHeight">0dp</item>
-        <item name="android:minWidth">0dp</item>
-    </style>
-
-    <style name="Button.Secondary.XSmall" parent="Button.Secondary">
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:paddingLeft">10dp</item>
         <item name="android:paddingRight">10dp</item>
-        <item name="android:insetTop">0dp</item>
-        <item name="android:insetBottom">0dp</item>
+        <item name="android:paddingTop">5dp</item>
+        <item name="android:paddingBottom">5dp</item>
     </style>
 
-    <style name="Button.Secondary.Small" parent="Button.Secondary">
+    <style name="Button.Secondary.Small" parent="TextView.UXStyle.Body.Callout.Medium">
+        <item name="android:background">@drawable/button_background_secondary_selector</item>
+        <item name="android:textColor">@color/text_color_button_secondary_selector</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:paddingLeft">12dp</item>
         <item name="android:paddingRight">12dp</item>
-        <item name="android:insetTop">2.5dp</item>
-        <item name="android:insetBottom">2.5dp</item>
+        <item name="android:paddingTop">7dp</item>
+        <item name="android:paddingBottom">7dp</item>
     </style>
 
-    <style name="Button.Secondary.Medium" parent="Button.Secondary">
+    <style name="Button.Secondary.Medium" parent="TextView.UXStyle.Buttons.Medium">
+        <item name="android:background">@drawable/button_background_secondary_selector</item>
+        <item name="android:textColor">@color/text_color_button_secondary_selector</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:paddingLeft">56dp</item>
         <item name="android:paddingRight">56dp</item>
-        <item name="android:insetTop">5dp</item>
-        <item name="android:insetBottom">5dp</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
     </style>
 
-    <style name="Button.Secondary.Large" parent="Button.Secondary">
+    <style name="Button.Secondary.Large" parent="TextView.UXStyle.Buttons.Medium">
+        <item name="android:background">@drawable/button_background_secondary_selector</item>
+        <item name="android:textColor">@color/text_color_button_secondary_selector</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
         <item name="android:layout_width">match_parent</item>
-        <item name="android:insetTop">7dp</item>
-        <item name="android:insetBottom">7dp</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingBottom">12dp</item>
     </style>
 
-    <!-- button text appearance -->
-    <attr name="primaryXSButtonTextAppearance" format="reference" />
-    <attr name="secondaryXSButtonTextAppearance" format="reference" />
-    <attr name="primarySButtonTextAppearance" format="reference" />
-    <attr name="secondarySButtonTextAppearance" format="reference" />
-    <attr name="primaryMediumButtonTextAppearance" format="reference" />
-    <attr name="secondaryMediumButtonTextAppearance" format="reference" />
-    <attr name="primaryLargeButtonTextAppearance" format="reference" />
-    <attr name="secondaryLargeButtonTextAppearance" format="reference" />
-    <attr name="primaryLargeNumberButtonTextAppearance" format="reference" />
+    <style name="Button.Warning.XSmall" parent="TextView.UXStyle.Captions.1.Medium">
+        <item name="android:background">@drawable/button_background_warning</item>
+        <item name="android:textColor">@color/text_color_button_warning_selector</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:paddingRight">10dp</item>
+        <item name="android:paddingTop">5dp</item>
+        <item name="android:paddingBottom">5dp</item>
+    </style>
+
+    <style name="Button.Warning.Small" parent="TextView.UXStyle.Body.Callout.Medium">
+        <item name="android:background">@drawable/button_background_warning</item>
+        <item name="android:textColor">@color/text_color_button_warning_selector</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:paddingTop">7dp</item>
+        <item name="android:paddingBottom">7dp</item>
+    </style>
+
+    <style name="Button.Warning.Medium" parent="TextView.UXStyle.Buttons.Medium">
+        <item name="android:background">@drawable/button_background_warning</item>
+        <item name="android:textColor">@color/text_color_button_warning_selector</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:paddingLeft">56dp</item>
+        <item name="android:paddingRight">56dp</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+    </style>
+
+    <style name="Button.Warning.Large" parent="TextView.UXStyle.Buttons.Medium">
+        <item name="android:background">@drawable/button_background_warning</item>
+        <item name="android:textColor">@color/text_color_button_warning_selector</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingBottom">12dp</item>
+    </style>
 
     <!-- button styles -->
-    <attr name="primaryXSButtonStyle" format="reference" />
-    <attr name="secondaryXSButtonStyle" format="reference" />
-    <attr name="primarySButtonStyle" format="reference" />
-    <attr name="secondarySButtonStyle" format="reference" />
+    <attr name="primaryXSmallButtonStyle" format="reference" />
+    <attr name="secondaryXSmallButtonStyle" format="reference" />
+    <attr name="primarySmallButtonStyle" format="reference" />
+    <attr name="secondarySmallButtonStyle" format="reference" />
     <attr name="primaryMediumButtonStyle" format="reference" />
     <attr name="secondaryMediumButtonStyle" format="reference" />
     <attr name="primaryLargeButtonStyle" format="reference" />
     <attr name="secondaryLargeButtonStyle" format="reference" />
     <attr name="primaryLargeNumberButtonStyle" format="reference" />
+    <attr name="warningXSmallButtonStyle" format="reference" />
+    <attr name="warningSmallButtonStyle" format="reference" />
+    <attr name="warningMediumButtonStyle" format="reference" />
+    <attr name="warningLargeButtonStyle" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/sample/src/main/java/com/anytypeio/anytype/sample/design_system/ButtonsWarningFragment.kt b/sample/src/main/java/com/anytypeio/anytype/sample/design_system/ButtonsWarningFragment.kt
new file mode 100644
index 0000000000..cb8986b596
--- /dev/null
+++ b/sample/src/main/java/com/anytypeio/anytype/sample/design_system/ButtonsWarningFragment.kt
@@ -0,0 +1,6 @@
+package com.anytypeio.anytype.sample.design_system
+
+import androidx.fragment.app.Fragment
+import com.anytypeio.anytype.sample.R
+
+class ButtonsWarningFragment : Fragment(R.layout.fragment_buttons_warning)
\ No newline at end of file
diff --git a/sample/src/main/java/com/anytypeio/anytype/sample/design_system/DesignSystemActivity.kt b/sample/src/main/java/com/anytypeio/anytype/sample/design_system/DesignSystemActivity.kt
index b5c0991552..b3a2a40ee8 100644
--- a/sample/src/main/java/com/anytypeio/anytype/sample/design_system/DesignSystemActivity.kt
+++ b/sample/src/main/java/com/anytypeio/anytype/sample/design_system/DesignSystemActivity.kt
@@ -55,6 +55,14 @@ class DesignSystemActivity : AppCompatActivity(), Navigate {
             .addToBackStack(null)
             .commit()
     }
+
+    override fun toButtonsWarning() {
+        supportFragmentManager
+            .beginTransaction()
+            .replace(R.id.root, ButtonsWarningFragment())
+            .addToBackStack(null)
+            .commit()
+    }
 }
 
 interface Navigate {
@@ -63,4 +71,5 @@ interface Navigate {
     fun toUxStyle()
     fun toButtons()
     fun toButtonsSecondary()
+    fun toButtonsWarning()
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/anytypeio/anytype/sample/design_system/NavigateFragment.kt b/sample/src/main/java/com/anytypeio/anytype/sample/design_system/NavigateFragment.kt
index eafb905184..3e0ef65ad1 100644
--- a/sample/src/main/java/com/anytypeio/anytype/sample/design_system/NavigateFragment.kt
+++ b/sample/src/main/java/com/anytypeio/anytype/sample/design_system/NavigateFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.Button
 import android.widget.Switch
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.Fragment
 import com.anytypeio.anytype.sample.R
@@ -12,21 +13,24 @@ class NavigateFragment : Fragment(R.layout.fragment_navigate) {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        view.findViewById<Button>(R.id.button2).setOnClickListener {
+        view.findViewById<TextView>(R.id.button2).setOnClickListener {
             (activity as Navigate).toContentStyle()
         }
-        view.findViewById<Button>(R.id.button3).setOnClickListener {
+        view.findViewById<TextView>(R.id.button3).setOnClickListener {
             (activity as Navigate).toContentStyleMultiline()
         }
-        view.findViewById<Button>(R.id.btnUxStyle).setOnClickListener {
+        view.findViewById<TextView>(R.id.btnUxStyle).setOnClickListener {
             (activity as Navigate).toUxStyle()
         }
-        view.findViewById<Button>(R.id.button7).setOnClickListener {
+        view.findViewById<TextView>(R.id.button7).setOnClickListener {
             (activity as Navigate).toButtons()
         }
-        view.findViewById<Button>(R.id.button12).setOnClickListener {
+        view.findViewById<TextView>(R.id.button12).setOnClickListener {
             (activity as Navigate).toButtonsSecondary()
         }
+        view.findViewById<TextView>(R.id.button20).setOnClickListener {
+            (activity as Navigate).toButtonsWarning()
+        }
         view.findViewById<Switch>(R.id.switch3).setOnClickListener {
             it as Switch
             if (it.isChecked) {
diff --git a/sample/src/main/res/layout/fragment_buttons.xml b/sample/src/main/res/layout/fragment_buttons.xml
index 3fe63a22ac..b29f33f6da 100644
--- a/sample/src/main/res/layout/fragment_buttons.xml
+++ b/sample/src/main/res/layout/fragment_buttons.xml
@@ -16,27 +16,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryXSmall
         android:id="@+id/button8"
-        style="?attr/primaryXSButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Button"
-        android:textAppearance="?attr/primaryXSButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="@+id/textView21"
         app:layout_constraintStart_toStartOf="@+id/textView21"
         app:layout_constraintTop_toBottomOf="@+id/textView21" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryXSmall
         android:id="@+id/button13"
-        style="?attr/primaryXSButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:enabled="false"
         android:text="Button"
-        android:textAppearance="?attr/primaryXSButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="@+id/textView21"
         app:layout_constraintStart_toStartOf="@+id/textView21"
         app:layout_constraintTop_toBottomOf="@+id/button8" />
@@ -51,27 +47,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button13" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimarySmall
         android:id="@+id/button9"
-        style="?attr/primarySButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Button"
-        android:textAppearance="?attr/primarySButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView22" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimarySmall
         android:id="@+id/button17"
-        style="?attr/primarySButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:enabled="false"
         android:text="Button"
-        android:textAppearance="?attr/primarySButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button9" />
@@ -86,27 +78,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button17" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
         android:id="@+id/button10"
-        style="?attr/primaryMediumButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Button"
-        android:textAppearance="?attr/primaryMediumButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView23" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
         android:id="@+id/button18"
-        style="?attr/primaryMediumButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:enabled="false"
         android:text="Button"
-        android:textAppearance="?attr/primaryMediumButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button10" />
@@ -121,23 +109,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button18" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
         android:id="@+id/button11"
-        style="?attr/primaryLargeButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:text="Button"
-        android:textAppearance="?attr/primaryLargeButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView24" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
         android:id="@+id/button19"
-        style="?attr/primaryLargeButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -145,7 +130,6 @@
         android:layout_marginEnd="16dp"
         android:enabled="false"
         android:text="Button"
-        android:textAppearance="?attr/primaryLargeButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button11" />
diff --git a/sample/src/main/res/layout/fragment_buttons_secondary.xml b/sample/src/main/res/layout/fragment_buttons_secondary.xml
index 3132a5ef1e..88a22737fd 100644
--- a/sample/src/main/res/layout/fragment_buttons_secondary.xml
+++ b/sample/src/main/res/layout/fragment_buttons_secondary.xml
@@ -16,27 +16,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondaryXSmall
         android:id="@+id/button8"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Button"
-        style="?attr/secondaryXSButtonStyle"
-        android:textAppearance="?attr/secondaryXSButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="@+id/textView21"
         app:layout_constraintStart_toStartOf="@+id/textView21"
         app:layout_constraintTop_toBottomOf="@+id/textView21" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondaryXSmall
         android:id="@+id/button30"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Button"
-        style="?attr/secondaryXSButtonStyle"
         android:enabled="false"
-        android:textAppearance="?attr/secondaryXSButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="@+id/textView21"
         app:layout_constraintStart_toStartOf="@+id/textView21"
         app:layout_constraintTop_toBottomOf="@+id/button8" />
@@ -51,27 +47,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button30" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondarySmall
         android:id="@+id/button9"
-        style="?attr/secondarySButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Button"
-        android:textAppearance="?attr/secondarySButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView22" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondarySmall
         android:id="@+id/button14"
-        style="?attr/secondarySButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:enabled="false"
         android:text="Button"
-        android:textAppearance="?attr/secondarySButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button9" />
@@ -86,27 +78,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button14" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondaryMedium
         android:id="@+id/button10"
-        style="?attr/secondaryMediumButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Button"
-        android:textAppearance="?attr/secondaryMediumButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView23" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondaryMedium
         android:id="@+id/button15"
-        style="?attr/secondaryMediumButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:enabled="false"
         android:text="Button"
-        android:textAppearance="?attr/secondaryMediumButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button10" />
@@ -121,23 +109,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button15" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
         android:id="@+id/button11"
-        style="?attr/secondaryLargeButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:text="Button"
-        android:textAppearance="?attr/secondaryLargeButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView24" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
         android:id="@+id/button16"
-        style="?attr/secondaryLargeButtonStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -145,7 +130,6 @@
         android:layout_marginEnd="16dp"
         android:enabled="false"
         android:text="Button"
-        android:textAppearance="?attr/secondaryLargeButtonTextAppearance"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button11" />
diff --git a/sample/src/main/res/layout/fragment_buttons_warning.xml b/sample/src/main/res/layout/fragment_buttons_warning.xml
new file mode 100644
index 0000000000..a4c8577eea
--- /dev/null
+++ b/sample/src/main/res/layout/fragment_buttons_warning.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".design_system.ButtonsPrimaryFragment">
+
+    <TextView
+        android:id="@+id/textView21"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="XSmall Button Warning"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.anytypeio.anytype.core_ui.views.ButtonWarningXSmall
+        android:id="@+id/button8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Button"
+        app:layout_constraintEnd_toEndOf="@+id/textView21"
+        app:layout_constraintStart_toStartOf="@+id/textView21"
+        app:layout_constraintTop_toBottomOf="@+id/textView21" />
+
+    <TextView
+        android:id="@+id/textView22"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="Small Button Warning"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button8" />
+
+    <com.anytypeio.anytype.core_ui.views.ButtonWarningSmall
+        android:id="@+id/button9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView22" />
+
+    <TextView
+        android:id="@+id/textView23"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="Medium Button Warning"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button9" />
+
+    <com.anytypeio.anytype.core_ui.views.ButtonWarningMedium
+        android:id="@+id/button10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView23" />
+
+    <TextView
+        android:id="@+id/textView24"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="Large Button Warning"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button10" />
+
+    <com.anytypeio.anytype.core_ui.views.ButtonWarningLarge
+        android:id="@+id/button11"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:text="Button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView24" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/fragment_navigate.xml b/sample/src/main/res/layout/fragment_navigate.xml
index a2a78e233a..c1fad6d374 100644
--- a/sample/src/main/res/layout/fragment_navigate.xml
+++ b/sample/src/main/res/layout/fragment_navigate.xml
@@ -5,50 +5,42 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
         android:id="@+id/button2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="64dp"
         android:text="Content Style"
-        style="@style/Button.Primary.Medium"
-        android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
         android:id="@+id/button3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:text="Content Style Multiline"
-        style="@style/Button.Primary.Medium"
-        android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button2" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
         android:id="@+id/btnUxStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:text="UX Style"
-        style="@style/Button.Primary.Medium"
-        android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button3" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
         android:id="@+id/button7"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:text="Buttons Primary"
-        style="@style/Button.Primary.Medium"
-        android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btnUxStyle" />
@@ -63,16 +55,25 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
         android:id="@+id/button12"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:text="Buttons Secondary"
-        style="@style/Button.Primary.Medium"
-        android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button7" />
 
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
+        android:id="@+id/button20"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="Buttons Warning"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.503"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button12" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 05ee541938..ddd75c7510 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -13,28 +13,21 @@
 <!--        <item name="android:alertDialogTheme">?alertDialogTheme</item>-->
 <!--        <item name="dialogTheme">?alertDialogTheme</item>-->
 
-        <item name="primaryXSButtonTextAppearance">@style/TextView.UXStyle.Captions.1.Medium</item>
-        <item name="primarySButtonTextAppearance">@style/TextView.UXStyle.Body.Callout.Medium</item>
-        <item name="primaryMediumButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
-        <item name="primaryLargeButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
-        <item name="primaryLargeNumberButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
-
-        <item name="secondaryXSButtonTextAppearance">@style/TextView.UXStyle.Captions.1.Medium</item>
-        <item name="secondarySButtonTextAppearance">@style/TextView.UXStyle.Body.Callout.Medium</item>
-        <item name="secondaryMediumButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
-        <item name="secondaryLargeButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
-
-        <item name="primaryXSButtonStyle">@style/Button.Primary.XSmall</item>
-        <item name="primarySButtonStyle">@style/Button.Primary.Small</item>
+        <item name="primaryXSmallButtonStyle">@style/Button.Primary.XSmall</item>
+        <item name="primarySmallButtonStyle">@style/Button.Primary.Small</item>
         <item name="primaryMediumButtonStyle">@style/Button.Primary.Medium</item>
         <item name="primaryLargeButtonStyle">@style/Button.Primary.Large</item>
         <item name="primaryLargeNumberButtonStyle">@style/Button.Primary.Large</item>
 
-        <item name="secondaryXSButtonStyle">@style/Button.Secondary.XSmall</item>
-        <item name="secondarySButtonStyle">@style/Button.Secondary.Small</item>
+        <item name="secondaryXSmallButtonStyle">@style/Button.Secondary.XSmall</item>
+        <item name="secondarySmallButtonStyle">@style/Button.Secondary.Small</item>
         <item name="secondaryMediumButtonStyle">@style/Button.Secondary.Medium</item>
         <item name="secondaryLargeButtonStyle">@style/Button.Secondary.Large</item>
 
+        <item name="warningXSmallButtonStyle">@style/Button.Warning.XSmall</item>
+        <item name="warningSmallButtonStyle">@style/Button.Warning.Small</item>
+        <item name="warningMediumButtonStyle">@style/Button.Warning.Medium</item>
+        <item name="warningLargeButtonStyle">@style/Button.Warning.Large</item>
     </style>
 
     <!-- define your dialog theme -->