diff --git a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
index 4932b68..9283278 100644
--- a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
+++ b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
@@ -18,8 +18,8 @@ class CountdownDialog(
     private val prefs: SharedPreferences
 ) : Dialog(context) {
     private lateinit var cvCountdown: CountdownCanvasView
-    private lateinit var btnStop: Button
-    private lateinit var btnRestart: Button
+    private lateinit var btnStop: View
+    private lateinit var btnRestart: View
     private lateinit var btnDismiss: Button
     private var timer: CountDownTimer? = null
     private var toneGenerator: ToneGenerator? = null
diff --git a/app/src/main/res/layout/dialog_countdown.xml b/app/src/main/res/layout/dialog_countdown.xml
index e16df30..0abdf12 100644
--- a/app/src/main/res/layout/dialog_countdown.xml
+++ b/app/src/main/res/layout/dialog_countdown.xml
@@ -26,33 +26,41 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <Button
+        <FrameLayout
             android:id="@+id/btnStop"
             android:layout_width="100dp"
             android:layout_height="100dp"
             android:layout_marginEnd="16dp"
             android:background="@drawable/btn_stop_selector"
-            android:drawableTop="@drawable/ic_stop_square"
-            android:gravity="center"
-            android:padding="16dp"
-            android:text="Stop"
-            android:textColor="#FFFFFF"
-            android:textSize="14sp"
-            android:textStyle="bold" />
+            android:clickable="true"
+            android:focusable="true">
 
-        <Button
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/stop_timer"
+                android:src="@drawable/ic_stop_square" />
+
+        </FrameLayout>
+
+        <FrameLayout
             android:id="@+id/btnRestart"
             android:layout_width="100dp"
             android:layout_height="100dp"
             android:layout_marginStart="16dp"
             android:background="@drawable/btn_restart_selector"
-            android:drawableTop="@drawable/ic_refresh_square"
-            android:gravity="center"
-            android:padding="16dp"
-            android:text="Restart"
-            android:textColor="#FFFFFF"
-            android:textSize="14sp"
-            android:textStyle="bold" />
+            android:clickable="true"
+            android:focusable="true">
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/restart_timer"
+                android:src="@drawable/ic_refresh_square" />
+
+        </FrameLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2f4538c..d950ade 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,4 +11,6 @@
     <string name="settings">Settings</string>
     <string name="vibration">Vibration</string>
     <string name="sounds">Sounds</string>
+    <string name="stop_timer">Stop Timer</string>
+    <string name="restart_timer">Restart Timer</string>
 </resources>