diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index f43c95dd..a26f39e1 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
-    android:id="@+id/about_scrollview"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/about_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">
@@ -10,9 +10,7 @@
         android:id="@+id/about_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/activity_margin"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingTop="@dimen/activity_margin">
+        android:padding="@dimen/activity_margin">
 
         <TextView
             android:id="@+id/about_website"
@@ -89,6 +87,8 @@
             android:layout_height="@dimen/social_logo"
             android:layout_below="@+id/about_follow_us"
             android:layout_marginLeft="@dimen/social_padding"
+            android:layout_marginRight="@dimen/social_padding"
+            android:layout_toEndOf="@+id/about_facebook"
             android:layout_toRightOf="@+id/about_facebook"
             android:src="@mipmap/gplus"/>
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index ffb76906..45bc3a38 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -25,12 +25,14 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingLeft="@dimen/normal_padding"
+                android:paddingStart="@dimen/normal_padding"
                 android:text="@string/dark_theme"/>
 
             <android.support.v7.widget.SwitchCompat
                 android:id="@+id/settings_dark_theme"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:background="@null"
                 android:clickable="false"/>
@@ -53,12 +55,14 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingLeft="@dimen/normal_padding"
+                android:paddingStart="@dimen/normal_padding"
                 android:text="@string/note_font_size"/>
 
             <android.support.v7.widget.AppCompatSpinner
                 android:id="@+id/settings_font_size"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:entries="@array/font_sizes"/>
 
@@ -80,12 +84,14 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingLeft="@dimen/normal_padding"
+                android:paddingStart="@dimen/normal_padding"
                 android:text="@string/gravity"/>
 
             <android.support.v7.widget.AppCompatSpinner
                 android:id="@+id/settings_gravity"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:entries="@array/gravity"/>
 
@@ -107,12 +113,14 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingLeft="@dimen/normal_padding"
+                android:paddingStart="@dimen/normal_padding"
                 android:text="@string/widget_note"/>
 
             <android.support.v7.widget.AppCompatSpinner
                 android:id="@+id/settings_widget_note"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"/>
 
         </RelativeLayout>