diff --git a/app/src/betaDebug/res/values/ic_launcher_background.xml b/app/src/betaDebug/res/values/ic_launcher_background.xml
deleted file mode 100644
index c5d5899fd..000000000
--- a/app/src/betaDebug/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_nearby.xml b/app/src/main/res/layout-land/activity_nearby.xml
deleted file mode 100644
index 049887f06..000000000
--- a/app/src/main/res/layout-land/activity_nearby.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/coordinator_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            
-            <include
-                android:id="@+id/toolbar"
-                layout="@layout/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:layout_below="@id/toolbar">
-
-                <ProgressBar
-                    android:id="@+id/progressBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true" />
-
-                <FrameLayout
-                    android:id="@+id/container"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-
-            </LinearLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/transparentView"
-                android:layout_below="@id/toolbar"
-                android:background="#aa969696"
-                android:elevation="6dp"
-                />
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/fab_recenter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/toolbar"
-                android:layout_marginRight="12dp"
-                android:layout_marginTop="6dp"
-                android:clickable="true"
-                android:visibility="invisible"
-                app:backgroundTint="@color/main_background_light"
-                app:elevation="6dp"
-                app:fabSize="normal"
-                app:layout_anchorGravity="top|right|end"
-                app:srcCompat="@drawable/ic_my_location_black_24dp" />
-        </RelativeLayout>
-
-        <include layout="@layout/bottom_sheet_nearby" />
-        <include layout="@layout/bottom_sheet_details" android:id="@+id/bottom_sheet_details" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_plus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:fabSize="normal"
-            android:layout_margin="16dp"
-            android:visibility="invisible"
-            android:clickable="true"
-            app:elevation="6dp"
-            app:pressedTranslationZ="12dp"
-            app:backgroundTint="@color/button_blue"
-            app:layout_anchor="@id/bottom_sheet_details"
-            app:layout_anchorGravity="top|right|end"
-            app:srcCompat="@drawable/ic_add_white_24dp"/>
-        <View
-            android:id = "@+id/empty_view2"
-            android:layout_height = "306dip"
-            android:layout_width = "56dp"
-            android:visibility="invisible"
-            app:layout_anchor="@id/fab_plus"
-            app:layout_anchorGravity="center_horizontal"
-            />
-        <View
-            android:id = "@+id/empty_view1"
-            android:layout_height = "186dip"
-            android:layout_width = "56dp"
-            android:visibility="invisible"
-            app:layout_anchor="@id/fab_plus"
-            app:layout_anchorGravity="center_horizontal"
-            />
-        <View
-            android:id = "@+id/empty_view"
-            android:layout_height = "66dip"
-            android:layout_width = "56dp"
-            android:visibility="invisible"
-            app:layout_anchor="@id/fab_plus"
-            app:layout_anchorGravity="center_horizontal"
-            />
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:fabSize="mini"
-            android:visibility="invisible"
-            app:backgroundTint="@color/main_background_light"
-            app:elevation="6dp"
-            app:pressedTranslationZ="12dp"
-            app:layout_anchor="@id/empty_view1"
-            app:layout_anchorGravity="center_horizontal"
-            app:srcCompat="@drawable/ic_photo_camera_white_24dp"
-            android:tint="@color/button_blue"
-            android:scaleType="center"/>
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_gallery"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:fabSize="mini"
-            android:visibility="invisible"
-            app:backgroundTint="@color/main_background_light"
-            app:elevation="6dp"
-            app:pressedTranslationZ="12dp"
-            app:layout_anchor="@id/empty_view"
-            app:layout_anchorGravity="center_horizontal"
-            app:srcCompat="@drawable/ic_photo_white_24dp"
-            android:tint="@color/button_blue"
-            android:scaleType="center"
-            />
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_commons_page"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:fabSize="mini"
-            android:visibility="invisible"
-            app:backgroundTint="@color/main_background_light"
-            app:elevation="6dp"
-            app:pressedTranslationZ="12dp"
-            app:layout_anchor="@id/empty_view2"
-            app:layout_anchorGravity="center_horizontal"
-            app:srcCompat="@drawable/ic_commons_icon_vector"
-            android:scaleType="center"
-            />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navigation_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:headerLayout="@layout/drawer_header"
-        app:menu="@menu/drawer"/>
-
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_multiple_uploads.xml b/app/src/main/res/layout/activity_multiple_uploads.xml
deleted file mode 100644
index ae54466ba..000000000
--- a/app/src/main/res/layout/activity_multiple_uploads.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include
-            android:id="@+id/toolbar"
-            layout="@layout/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <FrameLayout android:id="@+id/uploadsFragmentContainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
-            android:orientation="vertical" />
-    </RelativeLayout>
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navigation_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:headerLayout="@layout/drawer_header"
-        app:menu="@menu/drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_nearby.xml b/app/src/main/res/layout/activity_nearby.xml
deleted file mode 100644
index 997df517a..000000000
--- a/app/src/main/res/layout/activity_nearby.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/coordinator_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <include
-                android:id="@+id/toolbar"
-                layout="@layout/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/toolbar"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-
-                <ProgressBar
-                    android:id="@+id/progressBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <FrameLayout
-                    android:id="@+id/container"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-            </LinearLayout>
-
-            <View
-                android:id="@+id/transparentView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_below="@id/toolbar"
-                android:background="#aa969696"
-                android:elevation="6dp">
-
-            </View>
-
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/fab_recenter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/toolbar"
-                android:layout_marginRight="12dp"
-                android:layout_marginTop="6dp"
-                android:clickable="true"
-                android:visibility="invisible"
-                app:backgroundTint="@color/main_background_light"
-                app:elevation="6dp"
-                app:fabSize="normal"
-                app:layout_anchorGravity="top|right|end"
-                app:srcCompat="@drawable/ic_my_location_black_24dp" />
-
-
-        </RelativeLayout>
-
-        <include layout="@layout/bottom_sheet_nearby" />
-
-        <include
-            android:id="@+id/bottom_sheet_details"
-            layout="@layout/bottom_sheet_details" />
-
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_plus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginEnd="12dp"
-            android:layout_marginRight="12dp"
-            android:clickable="true"
-            android:visibility="invisible"
-            app:backgroundTint="@color/button_blue"
-            app:elevation="6dp"
-            app:fabSize="normal"
-            app:layout_anchor="@id/bottom_sheet_details"
-            app:layout_anchorGravity="top|right|end"
-            app:pressedTranslationZ="12dp"
-            app:srcCompat="@drawable/ic_add_white_24dp" />
-
-        <View
-            android:id="@+id/empty_view2"
-            android:layout_width="56dp"
-            android:layout_height="306dip"
-            android:visibility="invisible"
-            app:layout_anchor="@id/fab_plus"
-            app:layout_anchorGravity="center_horizontal" />
-
-        <View
-            android:id="@+id/empty_view1"
-            android:layout_width="56dp"
-            android:layout_height="186dip"
-            android:visibility="invisible"
-            app:layout_anchor="@id/fab_plus"
-            app:layout_anchorGravity="center_horizontal" />
-
-        <View
-            android:id="@+id/empty_view"
-            android:layout_width="56dp"
-            android:layout_height="66dip"
-            android:visibility="invisible"
-            app:layout_anchor="@id/fab_plus"
-            app:layout_anchorGravity="center_horizontal" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleType="center"
-            android:tint="@color/button_blue"
-            android:visibility="invisible"
-            app:backgroundTint="@color/main_background_light"
-            app:elevation="6dp"
-            app:fabSize="mini"
-            app:layout_anchor="@id/empty_view1"
-            app:layout_anchorGravity="center_horizontal"
-            app:pressedTranslationZ="12dp"
-            app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_gallery"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleType="center"
-            android:tint="@color/button_blue"
-            android:visibility="invisible"
-            app:backgroundTint="@color/main_background_light"
-            app:elevation="6dp"
-            app:fabSize="mini"
-            app:layout_anchor="@id/empty_view"
-            app:layout_anchorGravity="center_horizontal"
-            app:pressedTranslationZ="12dp"
-            app:srcCompat="@drawable/ic_photo_white_24dp" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_commons_page"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleType="center"
-            android:visibility="invisible"
-            app:backgroundTint="@color/main_background_light"
-            app:elevation="6dp"
-            app:fabSize="mini"
-            app:layout_anchor="@id/empty_view2"
-            app:layout_anchorGravity="center_horizontal"
-            app:pressedTranslationZ="12dp"
-            app:srcCompat="@drawable/ic_commons_icon_vector" />
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navigation_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:headerLayout="@layout/drawer_header"
-        app:menu="@menu/drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
deleted file mode 100644
index 523de2bc6..000000000
--- a/app/src/main/res/layout/activity_share.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include
-            android:id="@+id/toolbar"
-            layout="@layout/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
-            android:background="?attr/mainBackground"
-            android:id="@+id/container">
-
-            <com.facebook.drawee.view.SimpleDraweeView
-                android:id="@+id/backgroundImage"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:actualImageScaleType="fitCenter" />
-
-            <FrameLayout
-                android:id="@+id/single_upload_fragment_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <com.github.chrisbanes.photoview.PhotoView
-                android:id="@+id/expanded_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="invisible" />
-
-        </FrameLayout>
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginRight="@dimen/standard_gap"
-            android:layout_marginBottom="@dimen/standard_gap"
-            app:backgroundTint="@color/button_blue"
-            app:srcCompat="@drawable/ic_keyboard_arrow_up_black_24dp"
-            android:id="@+id/main_fab"/>
-
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:visibility="gone"
-            android:layout_marginRight="@dimen/standard_gap"
-            android:src="@drawable/ic_zoom_in_white_24dp"
-            android:layout_above="@+id/main_fab"
-            android:id="@+id/media_upload_zoom_in"/>
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:visibility="gone"
-            android:layout_marginRight="@dimen/standard_gap"
-            android:layout_marginBottom="@dimen/standard_gap"
-            android:src="@drawable/ic_zoom_out_white_24dp"
-            android:layout_above="@+id/main_fab"
-            android:id="@+id/media_upload_zoom_out"/>
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_above="@+id/media_upload_zoom_in"
-            android:visibility="gone"
-            android:layout_marginRight="@dimen/standard_gap"
-            app:srcCompat="@drawable/ic_map_white_24dp"
-            android:id="@+id/media_map"/>
-
-    </RelativeLayout>
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navigation_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:headerLayout="@layout/drawer_header"
-        app:menu="@menu/drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/dialog_nearby_info.xml b/app/src/main/res/layout/dialog_nearby_info.xml
deleted file mode 100644
index 4010d3615..000000000
--- a/app/src/main/res/layout/dialog_nearby_info.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    app:behavior_peekHeight="@dimen/bottom_peak_height">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:id="@+id/emptyLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:weightSum="1" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@android:color/white">
-        <LinearLayout
-            android:id="@+id/dialogInfoLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:animateLayoutChanges="true"
-            android:minHeight="@dimen/bottom_peak_height"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/link_preview_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:orientation="horizontal"
-                android:minHeight="64dp">
-
-                <TextView
-                    android:id="@+id/link_preview_title"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="@dimen/quarter_standard_height"
-                    android:layout_marginRight="@dimen/quarter_standard_height"
-                    android:layout_marginStart="@dimen/quarter_standard_height"
-                    android:layout_marginEnd="@dimen/quarter_standard_height"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:fontFamily="serif"
-                    android:lineSpacingMultiplier="0.9"
-                    android:maxLines="3"
-                    android:paddingBottom="@dimen/tiny_gap"
-                    android:textColor="@android:color/black"
-                    android:textSize="@dimen/subheading_text_size"
-                    tools:text="Lorem ipsum" />
-
-                <ImageView
-                    android:id="@+id/link_preview_overflow_button"
-                    android:layout_width="@dimen/overflow_button_dimen"
-                    android:layout_height="@dimen/overflow_button_dimen"
-                    android:layout_gravity="center_vertical"
-                    android:padding="@dimen/quarter_standard_height"
-                    android:background="@android:color/white"
-                    android:contentDescription="@string/abc_action_menu_overflow_description"
-                    app:srcCompat="@drawable/ic_more_vert_white_24dp" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:layout_marginLeft="@dimen/standard_gap"
-                android:layout_marginRight="@dimen/standard_gap"
-                android:background="@android:color/black" />
-
-            <TextView
-                android:id="@+id/link_preview_extract"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:lineSpacingMultiplier="1.3"
-                android:paddingLeft="@dimen/standard_gap"
-                android:paddingRight="@dimen/standard_gap"
-                android:paddingTop="@dimen/small_gap"
-                android:textIsSelectable="true"
-                android:textSize="@dimen/normal_text"
-                android:textColor="@android:color/black"
-                tools:text="Lorem ipsum" />
-
-            <View
-                android:id="@+id/link_preview_bottom_padding"
-                android:layout_width="match_parent"
-                android:layout_height="70dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/dialogButtonsLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/dialogInfoLayout"
-            android:layout_gravity="bottom">
-
-            <TextView
-                android:id="@+id/link_preview_directions_button"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:paddingBottom="@dimen/standard_gap"
-                android:paddingTop="@dimen/standard_gap"
-                android:text="@string/get_directions"
-                android:textColor="@android:color/black" />
-
-            <TextView
-                android:id="@+id/link_preview_go_button"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:paddingBottom="@dimen/standard_gap"
-                android:paddingTop="@dimen/standard_gap"
-                android:text="@string/read_article"
-                android:textColor="@android:color/black" />
-
-        </LinearLayout>
-    </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_multiple_uploads_list.xml b/app/src/main/res/layout/fragment_multiple_uploads_list.xml
deleted file mode 100644
index 9323e3c06..000000000
--- a/app/src/main/res/layout/fragment_multiple_uploads_list.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clickable="true"
-    android:focusableInTouchMode="true"
-    >
-
-    <EditText
-        android:id="@+id/multipleBaseTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/multiple_share_base_title"
-        android:imeOptions="flagNoExtractUi"
-        />
-
-    <GridView
-        android:id="@+id/multipleShareBackground"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:stretchMode="columnWidth"
-        android:numColumns="auto_fit"
-        android:listSelector="@null"
-        android:fadingEdge="none"
-        android:fastScrollEnabled="false"
-        />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_no_permissions.xml b/app/src/main/res/layout/fragment_no_permissions.xml
deleted file mode 100644
index 6dd2a6811..000000000
--- a/app/src/main/res/layout/fragment_no_permissions.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="fr.free.nrw.commons.nearby.NoPermissionsFragment">
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:paddingLeft="@dimen/large_gap"
-        android:paddingRight="@dimen/large_gap"
-        android:text="@string/nearby_needs_permissions"
-        android:textAlignment="center"
-        android:textSize="@dimen/subheading_text_size" />
-
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
deleted file mode 100644
index 8851fc64b..000000000
--- a/app/src/main/res/layout/fragment_single_upload.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/fragmentCategorisationBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:nestedScrollingEnabled="false"
-    android:paddingBottom="@dimen/small_gap"
-    android:paddingEnd="@dimen/standard_gap"
-    android:paddingLeft="@dimen/standard_gap"
-    android:paddingRight="@dimen/standard_gap"
-    android:paddingStart="@dimen/standard_gap"
-    android:paddingTop="@dimen/small_gap"
-    android:theme="@style/DarkAppTheme">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="fill"
-        android:orientation="vertical">
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <EditText
-                android:id="@+id/titleEdit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:drawableEnd="@drawable/mapbox_info_icon_default"
-                android:drawableRight="@drawable/mapbox_info_icon_default"
-                android:hint="@string/share_title_hint"
-                android:imeOptions="flagNoExtractUi"
-                android:inputType="text"
-                android:maxLength="80"
-                android:maxLines="1"
-                android:scrollHorizontally="false" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_descriptions"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <LinearLayout
-                android:id="@+id/ll_add_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginTop="4dp"
-                android:gravity="right"
-                android:orientation="horizontal"
-                android:padding="10dp">
-
-                <TextView
-                    style="@style/TextAppearance.AppCompat.Body1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/add_description" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <Spinner
-            android:id="@+id/licenseSpinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="?attr/spinnerTheme" />
-
-        <Button
-            android:id="@+id/titleDescButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/buttonBackground"
-            android:text="@string/use_previous" />
-
-        <TextView
-            android:id="@+id/share_license_summary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/standard_gap"
-            android:clickable="true"
-            android:gravity="center"
-            android:text="@plurals/share_license_summary"
-            android:textColorLink="@color/button_blue" />
-
-        <fr.free.nrw.commons.ui.widget.HtmlTextView
-            android:id="@+id/media_upload_policy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/standard_gap"
-            android:gravity="start"
-            android:text="@string/media_upload_policy" />
-
-    </LinearLayout>
-</ScrollView>
-
diff --git a/app/src/main/res/layout/layout_upload_item.xml b/app/src/main/res/layout/layout_upload_item.xml
deleted file mode 100644
index 155664d91..000000000
--- a/app/src/main/res/layout/layout_upload_item.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="2dp"
-    android:paddingBottom="0dp"
-    android:background="#000000"
-    >
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/uploadImage"
-        android:layout_width="match_parent"
-        android:layout_height="192dp"
-        app:actualImageScaleType="centerCrop"
-        android:scaleType="centerCrop"
-        android:contentDescription="@string/upload_image"
-        />
-
-    <RelativeLayout
-        android:id="@+id/uploadOverlay"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center|bottom"
-        android:background="#77000000"
-        android:padding="@dimen/tiny_gap"
-        >
-
-        <TextView
-            android:id="@+id/uploadTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="#FFFFFFFF"
-            style="?android:textAppearanceSmall"
-            />
-
-    </RelativeLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/light_simple_spinner_dropdown_item.xml b/app/src/main/res/layout/light_simple_spinner_dropdown_item.xml
deleted file mode 100644
index 11f95bf2e..000000000
--- a/app/src/main/res/layout/light_simple_spinner_dropdown_item.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    style="?android:attr/spinnerDropDownItemStyle"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:ellipsize="marquee"
-    android:textColor="@android:color/black"
-    android:background="@android:color/white"
-    />
diff --git a/app/src/main/res/values-v14/dimens.xml b/app/src/main/res/values-v14/dimens.xml
deleted file mode 100644
index 4db8c5906..000000000
--- a/app/src/main/res/values-v14/dimens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-Refer to App Widget Documentation for margin information
-http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-    -->
-    <dimen name="widget_margin">0dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8492401bf..ef9ab3458 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,9 +28,6 @@
     <dimen name="second_fab">25dp</dimen>
     <dimen name="subtitle_text">12sp</dimen>
 
-    <!--
-Refer to App Widget Documentation for margin information
-http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-    -->
-    <dimen name="widget_margin">8dp</dimen>
+    <!-- App widget margin -->
+    <dimen name="widget_margin">0dp</dimen>
 </resources>