diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1a1a761c3..7d10a0eb1 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
-    android:id="@+id/settings_scrollview"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/settings_scrollview"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -25,12 +25,14 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingLeft="@dimen/settings_padding"
+                android:paddingStart="@dimen/settings_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"/>
@@ -51,12 +53,14 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingLeft="@dimen/settings_padding"
+                android:paddingStart="@dimen/settings_padding"
                 android:text="@string/same_sorting"/>
 
             <android.support.v7.widget.SwitchCompat
                 android:id="@+id/settings_same_sorting"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:background="@null"
                 android:clickable="false"/>
diff --git a/app/src/main/res/layout/pager_video_item.xml b/app/src/main/res/layout/pager_video_item.xml
index 28bd6fecd..6365fe408 100644
--- a/app/src/main/res/layout/pager_video_item.xml
+++ b/app/src/main/res/layout/pager_video_item.xml
@@ -35,6 +35,7 @@
             android:layout_height="match_parent"
             android:layout_alignBottom="@+id/video_seekbar"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignTop="@+id/video_seekbar"
             android:gravity="center_vertical"
             android:text="00:00"
@@ -46,8 +47,10 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/activity_margin"
             android:layout_marginRight="@dimen/activity_margin"
+            android:layout_toEndOf="@+id/video_curr_time"
             android:layout_toLeftOf="@+id/video_duration"
             android:layout_toRightOf="@+id/video_curr_time"
+            android:layout_toStartOf="@+id/video_duration"
             android:paddingBottom="@dimen/activity_margin"
             android:paddingTop="@dimen/activity_margin"/>
 
@@ -56,6 +59,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/video_seekbar"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@+id/video_seekbar"
             android:gravity="center_vertical"