diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
index e331a253..1b53277d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
@@ -25,8 +25,21 @@ class StopwatchFragment : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         view = (inflater.inflate(R.layout.fragment_stopwatch, container, false) as ViewGroup).apply {
-            stopwatch_time.setOnClickListener { togglePlayPause() }
-            stopwatch_play_pause.setOnClickListener { togglePlayPause() }
+            stopwatch_time.setOnClickListener {
+                togglePlayPause()
+            }
+
+            stopwatch_play_pause.setOnClickListener {
+                togglePlayPause()
+            }
+
+            stopwatch_reset.setOnClickListener {
+
+            }
+
+            stopwatch_lap.setOnClickListener {
+
+            }
         }
         return view
     }
@@ -45,8 +58,8 @@ class StopwatchFragment : Fragment() {
         context!!.apply {
             updateTextColors(view.stopwatch_fragment)
             view.stopwatch_play_pause.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, getAdjustedPrimaryColor())
-            updatePlayPauseIcon()
         }
+        updatePlayPauseIcon()
     }
 
     private fun updatePlayPauseIcon() {
diff --git a/app/src/main/res/layout/fragment_stopwatch.xml b/app/src/main/res/layout/fragment_stopwatch.xml
index c5d55e5e..1dd1123c 100644
--- a/app/src/main/res/layout/fragment_stopwatch.xml
+++ b/app/src/main/res/layout/fragment_stopwatch.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.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:id="@+id/stopwatch_fragment"
     android:layout_width="match_parent"
@@ -8,23 +9,62 @@
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/stopwatch_time"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/normal_margin"
+        android:layout_marginTop="@dimen/medium_margin"
         android:background="?attr/selectableItemBackground"
-        android:padding="@dimen/activity_margin"
-        android:textSize="@dimen/alarm_text_size"
-        tools:text="00:00"/>
+        android:gravity="center_horizontal"
+        android:padding="@dimen/normal_margin"
+        android:textSize="@dimen/stopwatch_text_size"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="00.00"/>
+
+    <ImageView
+        android:id="@+id/stopwatch_reset"
+        style="@style/MyBorderlessBackgroundStyle"
+        android:layout_width="@dimen/stopwatch_button_small_size"
+        android:layout_height="@dimen/stopwatch_button_small_size"
+        android:layout_alignParentBottom="true"
+        android:layout_toLeftOf="@+id/stopwatch_play_pause"
+        android:padding="@dimen/normal_margin"
+        android:src="@drawable/ic_reset"
+        app:layout_constraintBottom_toBottomOf="@+id/stopwatch_play_pause"
+        app:layout_constraintEnd_toStartOf="@+id/stopwatch_play_pause"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/stopwatch_play_pause"/>
 
     <ImageView
         android:id="@+id/stopwatch_play_pause"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
+        android:layout_width="@dimen/stopwatch_button_size"
+        android:layout_height="@dimen/stopwatch_button_size"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/big_margin"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_play"/>
+        android:src="@drawable/ic_play"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"/>
 
-</RelativeLayout>
+    <com.simplemobiletools.commons.views.MyTextView
+        android:id="@+id/stopwatch_lap"
+        style="@style/MyBorderlessBackgroundStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/stopwatch_button_small_size"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:letterSpacing="0.1"
+        android:paddingLeft="@dimen/activity_margin"
+        android:paddingRight="@dimen/activity_margin"
+        android:text="@string/lap"
+        android:textAllCaps="true"
+        android:textSize="@dimen/bigger_text_size"
+        app:layout_constraintBottom_toBottomOf="@+id/stopwatch_play_pause"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/stopwatch_play_pause"
+        app:layout_constraintTop_toTopOf="@+id/stopwatch_play_pause"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 50b4afe5..ef702848 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -6,6 +6,7 @@
     <string name="label">Label</string>
     <string name="no_days_selected">No days selected</string>
     <string name="alarm">Alarm</string>
+    <string name="lap">Lap</string>
 
     <!-- Settings -->
     <string name="clock_tab">Relógio</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 5304d465..0a349fd3 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -6,6 +6,7 @@
     <string name="label">Štítok</string>
     <string name="no_days_selected">Neboli označené žiadne dni</string>
     <string name="alarm">Budík</string>
+    <string name="lap">Kolo</string>
 
     <!-- Settings -->
     <string name="clock_tab">Okno s časom</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1b256b91..61aec07c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,9 @@
 <resources>
     <dimen name="alarm_day_size">38dp</dimen>
+    <dimen name="stopwatch_button_small_size">60dp</dimen>
+    <dimen name="stopwatch_button_size">64dp</dimen>
 
     <dimen name="clock_text_size">70sp</dimen>
     <dimen name="alarm_text_size">46sp</dimen>
+    <dimen name="stopwatch_text_size">60sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ddafedac..12a0578a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="label">Label</string>
     <string name="no_days_selected">No days selected</string>
     <string name="alarm">Alarm</string>
+    <string name="lap">Lap</string>
 
     <!-- Settings -->
     <string name="clock_tab">Clock tab</string>