diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 0aace63..425dff6 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -39,7 +39,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:text="@string/settings_storage_local_desc"/>
 
             <RadioButton android:id="@+id/settings_data_webdav"
@@ -51,14 +51,14 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:text="@string/settings_storage_dav_desc"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:textStyle="bold"
                 android:text="@string/settings_storage_dav_url"/>
 
@@ -66,7 +66,7 @@
                 android:id="@+id/settings_data_webdav_url"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:hint="@string/settings_storage_dav_url_hint"
                 android:inputType="textUri"
                 android:background="@drawable/textview_background"/>
@@ -75,7 +75,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:textStyle="bold"
                 android:text="@string/settings_storage_dav_user"/>
 
@@ -83,7 +83,7 @@
                 android:id="@+id/settings_data_webdav_user"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:inputType="textEmailAddress"
                 android:background="@drawable/textview_background"/>
 
@@ -91,7 +91,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:textStyle="bold"
                 android:text="@string/settings_storage_dav_pass"/>
 
@@ -99,7 +99,7 @@
                 android:id="@+id/settings_data_webdav_pass"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:inputType="textPassword"
                 android:background="@drawable/textview_background"/>
 
diff --git a/app/src/main/res/layout/row_luna_event.xml b/app/src/main/res/layout/row_luna_event.xml
index e656076..2ef9d27 100644
--- a/app/src/main/res/layout/row_luna_event.xml
+++ b/app/src/main/res/layout/row_luna_event.xml
@@ -11,7 +11,7 @@
         android:id="@+id/type"
         android:layout_width="90dp"
         android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
+        android:paddingStart="10dp"
         android:textSize="28sp"
         android:lines="1"
         android:maxLines="1"