diff --git a/app/src/main/res/layout/widget_date_time.xml b/app/src/main/res/layout/widget_date_time.xml
index 6d5e9c43..abf143bb 100644
--- a/app/src/main/res/layout/widget_date_time.xml
+++ b/app/src/main/res/layout/widget_date_time.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widget_date_time_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/small_margin"
     android:paddingLeft="@dimen/small_margin"
-    android:paddingRight="@dimen/small_margin">
+    android:paddingRight="@dimen/small_margin"
+    android:paddingBottom="@dimen/small_margin">
 
     <TextView
         android:id="@+id/widget_time"
@@ -23,7 +22,7 @@
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/normal_text_size"
-        tools:text="00:00"/>
+        tools:text="00:00" />
 
     <TextView
         android:id="@+id/widget_date"
@@ -37,7 +36,7 @@
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/normal_text_size"
-        tools:text="Mon, 1 January"/>
+        tools:text="Mon, 1 January" />
 
     <RelativeLayout
         android:id="@+id/widget_alarm_holder"
@@ -50,21 +49,21 @@
             android:id="@+id/widget_next_alarm_image"
             android:layout_width="@dimen/widget_alarm_icon_size"
             android:layout_height="@dimen/widget_alarm_icon_size"
-            android:layout_alignBottom="@+id/widget_next_alarm"
             android:layout_alignTop="@+id/widget_next_alarm"
-            android:src="@drawable/ic_alarm_vector"/>
+            android:layout_alignBottom="@+id/widget_next_alarm"
+            android:src="@drawable/ic_alarm_vector" />
 
         <TextView
             android:id="@+id/widget_next_alarm"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/widget_next_alarm_image"
+            android:layout_toEndOf="@+id/widget_next_alarm_image"
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:textSize="@dimen/normal_text_size"
-            tools:text="Tue, 18:30"/>
+            tools:text="Tue, 18:30" />
 
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_date_time_pre_oreo.xml b/app/src/main/res/layout/widget_date_time_pre_oreo.xml
index 7184f1f2..f67468b9 100644
--- a/app/src/main/res/layout/widget_date_time_pre_oreo.xml
+++ b/app/src/main/res/layout/widget_date_time_pre_oreo.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widget_date_time_holder"
     android:layout_width="match_parent"
@@ -18,7 +17,7 @@
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/widget_time_text_size_small"
-        tools:text="00:00"/>
+        tools:text="00:00" />
 
     <TextView
         android:id="@+id/widget_date"
@@ -28,7 +27,7 @@
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/actionbar_text_size"
-        tools:text="Mon, 1 January"/>
+        tools:text="Mon, 1 January" />
 
     <RelativeLayout
         android:id="@+id/widget_alarm_holder"
@@ -42,19 +41,19 @@
             android:layout_height="@dimen/widget_alarm_icon_size"
             android:layout_alignTop="@+id/widget_next_alarm"
             android:layout_alignBottom="@+id/widget_next_alarm"
-            android:src="@drawable/ic_alarm_vector"/>
+            android:src="@drawable/ic_alarm_vector" />
 
         <TextView
             android:id="@+id/widget_next_alarm"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/widget_next_alarm_image"
+            android:layout_toEndOf="@+id/widget_next_alarm_image"
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:textSize="@dimen/actionbar_text_size"
-            tools:text="Tue, 18:30"/>
+            tools:text="Tue, 18:30" />
 
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_date_time_with_shadow.xml b/app/src/main/res/layout/widget_date_time_with_shadow.xml
index 032eae9b..3511432c 100644
--- a/app/src/main/res/layout/widget_date_time_with_shadow.xml
+++ b/app/src/main/res/layout/widget_date_time_with_shadow.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widget_date_time_holder"
     android:layout_width="match_parent"
@@ -26,7 +25,7 @@
         android:shadowDy="1"
         android:shadowRadius="1"
         android:textSize="@dimen/normal_text_size"
-        tools:text="00:00"/>
+        tools:text="00:00" />
 
     <TextView
         android:id="@+id/widget_date"
@@ -43,7 +42,7 @@
         android:shadowDy="1"
         android:shadowRadius="1"
         android:textSize="@dimen/normal_text_size"
-        tools:text="Mon, 1 January"/>
+        tools:text="Mon, 1 January" />
 
     <RelativeLayout
         android:id="@+id/widget_alarm_holder"
@@ -58,22 +57,22 @@
             android:layout_height="@dimen/widget_alarm_icon_size"
             android:layout_alignTop="@+id/widget_next_alarm"
             android:layout_alignBottom="@+id/widget_next_alarm"
-            android:src="@drawable/ic_alarm_vector"/>
+            android:src="@drawable/ic_alarm_vector" />
 
         <TextView
             android:id="@+id/widget_next_alarm"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/widget_next_alarm_image"
+            android:layout_toEndOf="@+id/widget_next_alarm_image"
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:shadowColor="@android:color/black"
             android:shadowDy="1"
             android:shadowRadius="1"
             android:textSize="@dimen/normal_text_size"
-            tools:text="Tue, 18:30"/>
+            tools:text="Tue, 18:30" />
 
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_date_time_with_shadow_pre_oreo.xml b/app/src/main/res/layout/widget_date_time_with_shadow_pre_oreo.xml
index f2b8196d..c1ada64c 100644
--- a/app/src/main/res/layout/widget_date_time_with_shadow_pre_oreo.xml
+++ b/app/src/main/res/layout/widget_date_time_with_shadow_pre_oreo.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widget_date_time_holder"
     android:layout_width="match_parent"
@@ -21,7 +20,7 @@
         android:shadowDy="1"
         android:shadowRadius="1"
         android:textSize="@dimen/widget_time_text_size_small"
-        tools:text="00:00"/>
+        tools:text="00:00" />
 
     <TextView
         android:id="@+id/widget_date"
@@ -34,7 +33,7 @@
         android:shadowDy="1"
         android:shadowRadius="1"
         android:textSize="@dimen/actionbar_text_size"
-        tools:text="Mon, 1 January"/>
+        tools:text="Mon, 1 January" />
 
     <RelativeLayout
         android:id="@+id/widget_alarm_holder"
@@ -48,22 +47,22 @@
             android:layout_height="@dimen/widget_alarm_icon_size"
             android:layout_alignTop="@+id/widget_next_alarm"
             android:layout_alignBottom="@+id/widget_next_alarm"
-            android:src="@drawable/ic_alarm_vector"/>
+            android:src="@drawable/ic_alarm_vector" />
 
         <TextView
             android:id="@+id/widget_next_alarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/widget_next_alarm_image"
+            android:layout_toEndOf="@+id/widget_next_alarm_image"
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:paddingLeft="@dimen/small_margin"
+            android:paddingStart="@dimen/small_margin"
             android:shadowColor="@android:color/black"
             android:shadowDy="1"
             android:shadowRadius="1"
             android:textSize="@dimen/actionbar_text_size"
-            tools:text="Tue, 18:30"/>
+            tools:text="Tue, 18:30" />
 
     </RelativeLayout>
 </LinearLayout>