diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 9322c4f..01337f4 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -23,7 +23,7 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:weightSum="1"
-    android:layout_margin="12dp">
+    android:layout_margin="16dp">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_download.xml b/app/src/main/res/layout/activity_download.xml
index 73e4710..21b8a97 100644
--- a/app/src/main/res/layout/activity_download.xml
+++ b/app/src/main/res/layout/activity_download.xml
@@ -22,7 +22,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="12dp">
+    android:layout_margin="16dp">
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/checkbox_image_item.xml b/app/src/main/res/layout/checkbox_image_item.xml
index 36ccef6..99e7453 100644
--- a/app/src/main/res/layout/checkbox_image_item.xml
+++ b/app/src/main/res/layout/checkbox_image_item.xml
@@ -25,13 +25,15 @@
     <TableRow
         android:id="@+id/path_table_row"
         android:layout_height="48dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
         android:background="?attr/selectableItemBackground">
         <ImageView
             android:id="@+id/path_img"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginLeft="12dp"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
             android:layout_gravity="center"
             android:gravity="center" />
         <LinearLayout
@@ -49,23 +51,22 @@
                 android:textSize="14sp"
                 android:textColor="@color/text_color"
                 android:fontFamily="sans-serif-medium"
-                android:layout_gravity="left"
-                android:gravity="left"/>
+                android:layout_gravity="start"
+                android:gravity="start"/>
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/path_text_desc"
-                android:textSize="10sp"
+                android:textSize="12sp"
                 android:textColor="@color/text_color_light"
                 android:fontFamily="sans-serif-light"
-                android:layout_gravity="left"
-                android:gravity="left" />
+                android:layout_gravity="start"
+                android:gravity="start" />
         </LinearLayout>
         <CheckBox
             android:id="@+id/path_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="48dp"
-            android:paddingRight="12dp"
-            android:gravity="right|center_vertical"/>
+            android:gravity="end|center_vertical"/>
     </TableRow>
 </TableLayout>
diff --git a/app/src/main/res/layout/hut_dialog.xml b/app/src/main/res/layout/hut_dialog.xml
index 78ed2d2..0c13521 100644
--- a/app/src/main/res/layout/hut_dialog.xml
+++ b/app/src/main/res/layout/hut_dialog.xml
@@ -26,17 +26,29 @@
     <EditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/hutName" />
+        android:id="@+id/hutName"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp" />
 
     <Spinner
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:entries="@array/hut_dialog_types"
-        android:id="@+id/hutTypes" />
+        android:id="@+id/hutTypes"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp" />
 
     <CheckBox
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/hut_dialog_winterroom"
-        android:id="@+id/hutWinterroom" />
+        android:id="@+id/hutWinterroom"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/warning_list_item.xml b/app/src/main/res/layout/warning_list_item.xml
index 641b3c3..1ea4e12 100644
--- a/app/src/main/res/layout/warning_list_item.xml
+++ b/app/src/main/res/layout/warning_list_item.xml
@@ -24,13 +24,12 @@
     android:layout_height="match_parent">
     <TableRow
         android:id="@+id/warning_table_row"
-        android:layout_height="48dp">
+        android:layout_height="48dp"
+        android:layout_margin="16dp" >
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_weight="0.5"
             android:layout_height="48dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginLeft="12dp"
             android:orientation="vertical"
             android:gravity="center_vertical">
             <TextView
@@ -40,17 +39,17 @@
                 android:textSize="14sp"
                 android:textColor="@color/text_color"
                 android:fontFamily="sans-serif-medium"
-                android:layout_gravity="left"
-                android:gravity="left"/>
+                android:layout_gravity="start"
+                android:gravity="start"/>
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/warning_text_desc"
-                android:textSize="10sp"
+                android:textSize="12sp"
                 android:textColor="@color/text_color_light"
                 android:fontFamily="sans-serif-light"
-                android:layout_gravity="left"
-                android:gravity="left" />
+                android:layout_gravity="start"
+                android:gravity="start" />
         </LinearLayout>
     </TableRow>
 </TableLayout>