diff --git a/app/src/main/java/app/plugbrain/android/ui/designsystem/components/button/PlugButton.kt b/app/src/main/java/app/plugbrain/android/ui/designsystem/components/button/PlugButton.kt
index 545b400..724198d 100644
--- a/app/src/main/java/app/plugbrain/android/ui/designsystem/components/button/PlugButton.kt
+++ b/app/src/main/java/app/plugbrain/android/ui/designsystem/components/button/PlugButton.kt
@@ -2,7 +2,9 @@ package app.plugbrain.android.ui.designsystem.components.button
 
 import android.content.res.Configuration
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -20,14 +22,21 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import app.plugbrain.android.R
 import app.plugbrain.android.ui.theme.MathlockAppTheme
+import app.plugbrain.android.ui.theme.PrimaryGradient
+
+val shape = RoundedCornerShape(50)
+val buttonPadding = PaddingValues(
+  horizontal = 24.dp,
+  vertical = 15.dp,
+)
 
-// TODO add Primary button with the gradient
 @Composable
 fun PlugButtonPrimary(
   text: String,
@@ -36,17 +45,26 @@ fun PlugButtonPrimary(
   enabled: Boolean = true,
   icon: ImageVector? = null,
 ) {
-  val shape = RoundedCornerShape(50)
-
   Button(
     onClick = onClick,
-    modifier = modifier,
     enabled = enabled,
     shape = shape,
-    elevation = ButtonDefaults.buttonElevation(
-      defaultElevation = 8.dp,
-      pressedElevation = 0.dp,
+    contentPadding = buttonPadding,
+    colors = ButtonDefaults.buttonColors(
+      containerColor = Color.Transparent,
+      disabledContainerColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f),
     ),
+    modifier = modifier
+      .then(
+        if (enabled) {
+          Modifier.background(
+            brush = PrimaryGradient,
+            shape = shape,
+          )
+        } else {
+          Modifier
+        },
+      ),
   ) {
     ButtonContent(
       text = text,
@@ -63,13 +81,12 @@ fun PlugButtonSecondary(
   enabled: Boolean = true,
   icon: ImageVector? = null,
 ) {
-  val shape = RoundedCornerShape(50)
-
   OutlinedButton(
     onClick = onClick,
     modifier = modifier,
     enabled = enabled,
     shape = shape,
+    contentPadding = buttonPadding,
   ) {
     ButtonContent(
       text = text,
@@ -86,13 +103,12 @@ fun PlugButtonTertiary(
   enabled: Boolean = true,
   icon: ImageVector? = null,
 ) {
-  val shape = RoundedCornerShape(50)
-
   TextButton(
     onClick = onClick,
     modifier = modifier,
     enabled = enabled,
     shape = shape,
+    contentPadding = buttonPadding,
   ) {
     ButtonContent(
       text = text,
@@ -142,6 +158,7 @@ private fun PlugButtonPreview() {
   MathlockAppTheme(dynamicColor = false) {
     Column(
       modifier = Modifier.background(MaterialTheme.colorScheme.background),
+      verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
       PlugButtonPrimary(
         text = "Primary Button with icon",
@@ -149,6 +166,11 @@ private fun PlugButtonPreview() {
         icon = Icons.Default.Settings,
         modifier = Modifier.fillMaxWidth(),
       )
+      PlugButtonPrimary(
+        text = "Primary Button without icon",
+        onClick = {},
+        modifier = Modifier.fillMaxWidth(),
+      )
       PlugButtonPrimary(
         text = "Primary Button disabled",
         onClick = {},
diff --git a/app/src/test/snapshots/images/app.plugbrain.android.screenshots_PlugButtonScreenshotTest_plugButtonDarkModeTests.png b/app/src/test/snapshots/images/app.plugbrain.android.screenshots_PlugButtonScreenshotTest_plugButtonDarkModeTests.png
index 5b1aa1a..87bcd78 100644
Binary files a/app/src/test/snapshots/images/app.plugbrain.android.screenshots_PlugButtonScreenshotTest_plugButtonDarkModeTests.png and b/app/src/test/snapshots/images/app.plugbrain.android.screenshots_PlugButtonScreenshotTest_plugButtonDarkModeTests.png differ
diff --git a/app/src/test/snapshots/images/app.plugbrain.android.screenshots_PlugButtonScreenshotTest_plugButtonTests.png b/app/src/test/snapshots/images/app.plugbrain.android.screenshots_PlugButtonScreenshotTest_plugButtonTests.png
index 494e3cf..75d2c89 100644
Binary files a/app/src/test/snapshots/images/app.plugbrain.android.screenshots_PlugButtonScreenshotTest_plugButtonTests.png and b/app/src/test/snapshots/images/app.plugbrain.android.screenshots_PlugButtonScreenshotTest_plugButtonTests.png differ