diff --git a/src/main/kotlin/xyz/atnrch/wrench/display/status/WrenchStatus.kt b/src/main/kotlin/xyz/atnrch/wrench/display/status/WrenchStatus.kt
index f4413b3..28d19e6 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/display/status/WrenchStatus.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/display/status/WrenchStatus.kt
@@ -2,9 +2,16 @@ package xyz.atnrch.wrench.display.status
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -29,10 +36,26 @@ fun WrenchStatus(
             }
             startStopButtonText = if (status) "Stop" else "Start"
         }) {
+            if (status) Icon(
+                Icons.Filled.Close,
+                contentDescription = "Start",
+                modifier = Modifier.size(ButtonDefaults.IconSize)
+            ) else Icon(
+                Icons.Filled.PlayArrow,
+                contentDescription = "Start",
+                modifier = Modifier.size(ButtonDefaults.IconSize)
+            )
+            Spacer(Modifier.size(ButtonDefaults.IconSpacing))
             Text(startStopButtonText)
         }
         Spacer(Modifier.width(10.dp))
         Button(onAddButtonClick) {
+            Icon(
+                Icons.Filled.Add,
+                contentDescription = "Add",
+                modifier = Modifier.size(ButtonDefaults.IconSize)
+            )
+            Spacer(Modifier.size(ButtonDefaults.IconSpacing))
             Text("Add...")
         }
         Spacer(Modifier.width(10.dp))