diff --git a/src/main/res/layout/synced_folders_settings_layout.xml b/src/main/res/layout/synced_folders_settings_layout.xml
index 2fc545c9c1..890cbb5deb 100644
--- a/src/main/res/layout/synced_folders_settings_layout.xml
+++ b/src/main/res/layout/synced_folders_settings_layout.xml
@@ -82,107 +82,59 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/local_folder_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:baselineAligned="false">
+                android:layout_weight="1"
+                android:padding="@dimen/standard_padding">
 
-                <RelativeLayout
-                    android:layout_width="0dp"
+                <TextView
+                    android:id="@+id/local_folder_title"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:padding="@dimen/standard_padding">
+                    android:maxLines="2"
+                    android:text="@string/prefs_synced_folders_local_path_title"
+                    android:textAppearance="?attr/textAppearanceListItem" />
 
-                    <TextView
-                        android:id="@+id/local_folder_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="2"
-                        android:text="@string/prefs_synced_folders_local_path_title"
-                        android:textAppearance="?attr/textAppearanceListItem" />
+                <TextView
+                    android:id="@+id/local_folder_summary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/local_folder_title"
+                    android:layout_alignStart="@id/local_folder_title"
+                    android:ellipsize="middle"
+                    android:maxLines="2"
+                    android:text="@string/choose_local_folder"
+                    android:textColor="?android:attr/textColorSecondary" />
+            </RelativeLayout>
 
-                    <TextView
-                        android:id="@+id/local_folder_summary"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/local_folder_title"
-                        android:layout_alignStart="@id/local_folder_title"
-                        android:ellipsize="middle"
-                        android:maxLines="2"
-                        android:text="@string/choose_local_folder"
-                        android:textColor="?android:attr/textColorSecondary" />
-                </RelativeLayout>
-
-                <!-- Preference should place its actual preference widget here. -->
-                <LinearLayout
-                    android:id="@+id/local_folder_frame"
-                    android:layout_width="@dimen/synced_folders_control_width"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:padding="@dimen/standard_padding">
-
-                    <ImageView
-                        android:id="@+id/local_folder_icon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="fill_parent"
-                        android:background="@null"
-                        android:contentDescription="@string/folder_icon"
-                        android:padding="@dimen/standard_quarter_padding"
-                        android:src="@drawable/ic_folder_open" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/remote_folder_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:baselineAligned="false">
+                android:layout_weight="1"
+                android:padding="@dimen/standard_padding">
 
-                <RelativeLayout
-                    android:layout_width="0dp"
+                <TextView
+                    android:id="@+id/remote_folder_title"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:padding="@dimen/standard_padding">
+                    android:maxLines="2"
+                    android:text="@string/prefs_synced_folders_remote_path_title"
+                    android:textAppearance="?attr/textAppearanceListItem" />
 
-                    <TextView
-                        android:id="@+id/remote_folder_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="2"
-                        android:text="@string/prefs_synced_folders_remote_path_title"
-                        android:textAppearance="?attr/textAppearanceListItem" />
-
-                    <TextView
-                        android:id="@+id/remote_folder_summary"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/remote_folder_title"
-                        android:layout_alignStart="@id/remote_folder_title"
-                        android:ellipsize="middle"
-                        android:maxLines="2"
-                        android:text="@string/choose_remote_folder"
-                        android:textColor="?android:attr/textColorSecondary" />
-                </RelativeLayout>
-
-                <!-- Preference should place its actual preference widget here. -->
-                <LinearLayout
-                    android:id="@+id/remote_folder_frame"
-                    android:layout_width="@dimen/synced_folders_control_width"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:padding="@dimen/standard_padding">
-
-                    <ImageView
-                        android:id="@+id/remote_folder_icon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="fill_parent"
-                        android:background="@null"
-                        android:contentDescription="@string/folder_icon"
-                        android:padding="@dimen/standard_quarter_padding"
-                        android:src="@drawable/ic_folder_open" />
-                </LinearLayout>
-            </LinearLayout>
+                <TextView
+                    android:id="@+id/remote_folder_summary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/remote_folder_title"
+                    android:layout_alignStart="@id/remote_folder_title"
+                    android:ellipsize="middle"
+                    android:maxLines="2"
+                    android:text="@string/choose_remote_folder"
+                    android:textColor="?android:attr/textColorSecondary" />
+            </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/setting_instant_upload_on_wifi_container"