diff --git a/app/build.gradle b/app/build.gradle
index 33fc8b9f..1aecf0db 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,9 +67,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.28.24'
+    implementation 'com.simplemobiletools:commons:5.29.13'
     implementation 'com.facebook.stetho:stetho:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
     implementation 'com.shawnlin:number-picker:2.4.6'
     implementation "androidx.preference:preference:1.1.0"
     implementation "androidx.work:work-runtime-ktx:2.3.2"
diff --git a/app/src/main/res/layout/fragment_stopwatch.xml b/app/src/main/res/layout/fragment_stopwatch.xml
index 1664327f..89a2c09b 100644
--- a/app/src/main/res/layout/fragment_stopwatch.xml
+++ b/app/src/main/res/layout/fragment_stopwatch.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/stopwatch_fragment"
@@ -19,7 +18,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="00.00"/>
+        tools:text="00.00" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/stopwatch_sorting_indicators_holder"
@@ -35,7 +34,7 @@
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_2"
@@ -44,7 +43,7 @@
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_3"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_1"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_3"
@@ -53,7 +52,7 @@
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_2"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -69,7 +68,7 @@
         app:layout_constraintBottom_toTopOf="@+id/stopwatch_play_pause"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/stopwatch_sorting_indicators_holder"/>
+        app:layout_constraintTop_toBottomOf="@+id/stopwatch_sorting_indicators_holder" />
 
     <ImageView
         android:id="@+id/stopwatch_play_pause"
@@ -78,18 +77,18 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/big_margin"
-        android:padding="@dimen/normal_margin"
+        android:padding="@dimen/activity_margin"
         android:src="@drawable/ic_play_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/stopwatch_reset"
         android:layout_width="@dimen/stopwatch_button_small_size"
         android:layout_height="@dimen/stopwatch_button_small_size"
-        android:layout_toLeftOf="@+id/stopwatch_play_pause"
+        android:layout_toStartOf="@+id/stopwatch_play_pause"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_reset_vector"
@@ -97,7 +96,7 @@
         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"/>
+        app:layout_constraintTop_toTopOf="@+id/stopwatch_play_pause" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/stopwatch_lap"
@@ -115,6 +114,6 @@
         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"/>
+        app:layout_constraintTop_toTopOf="@+id/stopwatch_play_pause" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_timer.xml b/app/src/main/res/layout/fragment_timer.xml
index dbb2b178..b16ee540 100644
--- a/app/src/main/res/layout/fragment_timer.xml
+++ b/app/src/main/res/layout/fragment_timer.xml
@@ -16,6 +16,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/timer_constraint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -80,6 +81,7 @@
                 tools:text="Default alarm" />
 
             <LinearLayout
+                android:id="@+id/timer_label_holder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
@@ -120,7 +122,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/big_margin"
-        android:padding="@dimen/normal_margin"
+        android:padding="@dimen/activity_margin"
         android:src="@drawable/ic_play_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -134,11 +136,11 @@
         android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_reset_vector"
         android:visibility="gone"
-        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@+id/timer_play_pause"
         app:layout_constraintEnd_toStartOf="@+id/timer_play_pause"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/timer_play_pause" />
+        app:layout_constraintTop_toTopOf="@+id/timer_play_pause"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_add_time_zone.xml b/app/src/main/res/layout/item_add_time_zone.xml
index 1366df17..555fed76 100644
--- a/app/src/main/res/layout/item_add_time_zone.xml
+++ b/app/src/main/res/layout/item_add_time_zone.xml
@@ -13,7 +13,7 @@
         android:id="@+id/add_time_zone_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/add_time_zone_checkbox"
+        android:layout_toStartOf="@+id/add_time_zone_checkbox"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
@@ -27,8 +27,8 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/add_time_zone_title"
         android:layout_alignBottom="@+id/add_time_zone_title"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:clickable="false"
         android:gravity="center"/>
 
diff --git a/build.gradle b/build.gradle
index d991c1f9..d11fae6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c8418039..f62c3ca7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 18 12:31:29 CET 2020
+#Fri Jun 19 16:25:51 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip