diff --git a/src/main/res/layout/layout_apps.xml b/src/main/res/layout/layout_apps.xml
index 06b08f08..5d775569 100644
--- a/src/main/res/layout/layout_apps.xml
+++ b/src/main/res/layout/layout_apps.xml
@@ -18,8 +18,8 @@
             android:text="@string/on"
             android:textSize="18sp"
             android:textColor="?android:attr/textColorSecondary"
-            android:paddingLeft="60dp"
-            android:paddingRight="8dp"
+            android:paddingStart="60dp"
+            android:paddingEnd="8dp"
             android:paddingTop="12dp"
             android:paddingBottom="12dp"
             android:layout_width="match_parent"
@@ -30,8 +30,8 @@
             android:text="@string/bypass_apps"
             android:textSize="18sp"
             android:textColor="?android:attr/textColorSecondary"
-            android:paddingLeft="60dp"
-            android:paddingRight="8dp"
+            android:paddingStart="60dp"
+            android:paddingEnd="8dp"
             android:paddingTop="12dp"
             android:paddingBottom="12dp"
             android:layout_width="match_parent"
diff --git a/src/main/res/layout/layout_apps_item.xml b/src/main/res/layout/layout_apps_item.xml
index 75ebb779..ec11118c 100644
--- a/src/main/res/layout/layout_apps_item.xml
+++ b/src/main/res/layout/layout_apps_item.xml
@@ -11,8 +11,8 @@
         android:layout_width="60dp"
         android:layout_height="48dp"
         android:scaleType="fitCenter"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:paddingTop="2dp"
         android:paddingBottom="2dp"/>
 
@@ -28,7 +28,6 @@
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:clickable="false"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"/>
+        android:layout_marginEnd="8dp"/>
 
 </LinearLayout>
diff --git a/src/main/res/layout/layout_main.xml b/src/main/res/layout/layout_main.xml
index 0f643989..59b3a58b 100644
--- a/src/main/res/layout/layout_main.xml
+++ b/src/main/res/layout/layout_main.xml
@@ -11,7 +11,6 @@
                       android:layout_width="match_parent" android:layout_height="wrap_content"
                       android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical"
                       android:paddingStart="16dip" android:paddingEnd="16dip" android:focusable="true"
-                      android:paddingLeft="16dip" android:paddingRight="16dip"
                       android:paddingTop="16dip" android:paddingBottom="16dip"
                       android:background="@drawable/background_stat" android:orientation="vertical"
                       android:nextFocusRight="@+id/fab">
@@ -34,12 +33,12 @@
             <android.support.v7.widget.GridLayout android:layout_width="match_parent"
                                                   android:layout_height="wrap_content"
                                                   android:paddingEnd="72dip"
-                                                  android:paddingRight="72dip"
                                                   app:columnCount="4">
                 <TextView app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
                           android:ellipsize="marquee" android:text="@string/sent"
                           android:layout_width="wrap_content" android:layout_height="wrap_content"
-                          android:layout_marginRight="24dp" android:layout_marginEnd="24dp" android:gravity="end"/>
+                          android:layout_marginEnd="24dp"
+                          android:gravity="end"/>
                 <TextView app:layout_column="1" android:id="@+id/tx" android:textSize="14sp"
                           android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
                           android:layout_width="0dp" android:layout_height="wrap_content"
@@ -54,7 +53,8 @@
                           app:layout_gravity="fill_horizontal" android:gravity="end"/>
                 <TextView app:layout_row="1" app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
                           android:layout_width="wrap_content" android:layout_height="wrap_content"
-                          android:layout_marginRight="24dp" android:layout_marginEnd="24dp" android:gravity="end"
+                          android:layout_marginEnd="24dp"
+                          android:gravity="end"
                           android:ellipsize="marquee" android:text="@string/received"/>
                 <TextView app:layout_row="1" app:layout_column="1" android:id="@+id/rx" android:textSize="14sp"
                           android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
@@ -77,9 +77,7 @@
                                                    android:layout_width="wrap_content"
                                                    android:layout_height="wrap_content" android:elevation="6dp"
                                                    android:layout_alignBottom="@+id/title_bar"
-                                                   android:layout_alignParentRight="true"
                                                    android:layout_alignParentEnd="true"
-                                                   android:layout_marginRight="16dp"
                                                    android:layout_marginEnd="16dp"
                                                    android:layout_marginBottom="@dimen/fab_margin_bottom">
         <android.support.design.widget.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content"
diff --git a/src/main/res/layout/layout_profiles.xml b/src/main/res/layout/layout_profiles.xml
index d5f3a7e3..bf37c802 100644
--- a/src/main/res/layout/layout_profiles.xml
+++ b/src/main/res/layout/layout_profiles.xml
@@ -16,7 +16,6 @@
             android:layout_height="match_parent"
             android:layout_gravity="bottom|end"
             android:layout_marginBottom="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginEnd="16dp"
             app:menu_colorNormal="@color/material_accent_500"
             app:menu_colorPressed="@color/material_accent_700"
diff --git a/src/main/res/layout/layout_profiles_item.xml b/src/main/res/layout/layout_profiles_item.xml
index 53b667dd..d1f856b3 100644
--- a/src/main/res/layout/layout_profiles_item.xml
+++ b/src/main/res/layout/layout_profiles_item.xml
@@ -8,8 +8,6 @@
               android:background="?android:attr/selectableItemBackground"
               android:paddingStart="20dp"
               android:paddingEnd="?attr/dialogPreferredPadding"
-              android:paddingLeft="20dp"
-              android:paddingRight="?attr/dialogPreferredPadding"
               android:focusable="true"
               android:nextFocusRight="@+id/share">
     <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -23,7 +21,6 @@
                      android:textColor="?android:attr/textColorAlertDialogListItem"
                      android:gravity="center_vertical"
                      android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-                     android:drawableLeft="?android:attr/listChoiceIndicatorSingle"
                      android:drawablePadding="20dp"
                      android:maxLines="4"
                      android:scrollHorizontally="false" />