diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java
index c229cfc0e..173586337 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java
@@ -65,7 +65,7 @@ public abstract class AbstractTabsFragment extends Fragment {
 		viewPager.setAdapter(tabAdapter);
 		TabLayout tabLayout = view.findViewById(R.id.tabLayout);
 		new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
-			// tabs are set in XML, but just dummies that don't get not added
+			// tabs are set in XML, but are just dummies that don't get added
 			if (position == 0) {
 				tab.setText(R.string.hotspot_tab_manual);
 				tab.setIcon(R.drawable.forum_item_create_white);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java
index 98d3a9575..8ce56bac4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java
@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import static android.view.View.INVISIBLE;
+import static android.view.View.GONE;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -22,7 +22,7 @@ public class WebsiteFragment extends AbstractTabsFragment {
 	public void onViewCreated(@NonNull View view,
 			@Nullable Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
-		connectedButton.setVisibility(INVISIBLE);
+		connectedButton.setVisibility(GONE);
 	}
 
 	@Override
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_manual.xml b/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
index cf92b01b7..c35087421 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_manual.xml
@@ -1,88 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:fillViewport="true">
 
-	<TextView
-		android:id="@+id/manualIntroView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:text="@string/hotspot_manual_site"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-	<TextView
-		android:id="@+id/ssidLabelView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:text="@string/hotspot_manual_wifi_ssid"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/manualIntroView" />
+		<TextView
+			android:id="@+id/manualIntroView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_margin="16dp"
+			android:text="@string/hotspot_manual_site"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
 
-	<TextView
-		android:id="@+id/ssidView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginTop="6dp"
-		android:layout_marginEnd="16dp"
-		android:layout_marginRight="16dp"
-		android:background="@color/briar_primary"
-		android:padding="8dp"
-		android:textColor="@color/briar_text_primary_inverse"
-		android:typeface="monospace"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/ssidLabelView"
-		tools:text="DIRECT-42-dfoln3lncsoij23" />
+		<TextView
+			android:id="@+id/ssidLabelView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_margin="16dp"
+			android:text="@string/hotspot_manual_wifi_ssid"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/manualIntroView" />
 
-	<TextView
-		android:id="@+id/passwordLabelView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="16dp"
-		android:layout_marginRight="16dp"
-		android:text="@string/enter_password"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/ssidView" />
+		<TextView
+			android:id="@+id/ssidView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginLeft="16dp"
+			android:layout_marginTop="6dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp"
+			android:background="@color/briar_primary"
+			android:padding="8dp"
+			android:textColor="@color/briar_text_primary_inverse"
+			android:typeface="monospace"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/ssidLabelView"
+			tools:text="DIRECT-42-dfoln3lncsoij23" />
 
-	<TextView
-		android:id="@+id/passwordView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginTop="6dp"
-		android:layout_marginEnd="16dp"
-		android:layout_marginRight="16dp"
-		android:background="@color/briar_primary"
-		android:padding="8dp"
-		android:textColor="@color/briar_text_primary_inverse"
-		android:typeface="monospace"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/passwordLabelView"
-		tools:text="sdfsdgt2334rfw" />
+		<TextView
+			android:id="@+id/passwordLabelView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginLeft="16dp"
+			android:layout_marginTop="8dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp"
+			android:text="@string/enter_password"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/ssidView" />
 
-	<TextView
-		android:id="@+id/altView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:text="@string/hotspot_manual_site_alt"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/passwordView" />
+		<TextView
+			android:id="@+id/passwordView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginLeft="16dp"
+			android:layout_marginTop="6dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp"
+			android:background="@color/briar_primary"
+			android:padding="8dp"
+			android:textColor="@color/briar_text_primary_inverse"
+			android:typeface="monospace"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/passwordLabelView"
+			tools:text="sdfsdgt2334rfw" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+		<TextView
+			android:id="@+id/altView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_margin="16dp"
+			android:text="@string/hotspot_manual_site_alt"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/passwordView" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_qr.xml b/briar-android/src/main/res/layout/fragment_hotspot_qr.xml
index bb1dfd2fb..2cfa4932e 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_qr.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_qr.xml
@@ -1,46 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:fillViewport="true">
 
-	<TextView
-		android:id="@+id/qrIntroView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:text="@string/hotspot_qr_wifi"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/cardView"
-		app:layout_constraintTop_toTopOf="parent" />
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-	<androidx.cardview.widget.CardView
-		android:id="@+id/cardView"
-		android:layout_width="0dp"
-		android:layout_height="0dp"
-		android:layout_marginStart="64dp"
-		android:layout_marginLeft="64dp"
-		android:layout_marginTop="32dp"
-		android:layout_marginEnd="64dp"
-		android:layout_marginBottom="32dp"
-		app:cardCornerRadius="16dp"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintDimensionRatio="1,1"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/qrIntroView"
-		app:layout_constraintVertical_chainStyle="spread_inside">
+		<TextView
+			android:id="@+id/qrIntroView"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_margin="16dp"
+			android:text="@string/hotspot_qr_wifi"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0.5"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/cardView"
+			app:layout_constraintTop_toTopOf="parent" />
 
-		<ImageView
-			android:id="@+id/qrCodeView"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			app:srcCompat="@drawable/ic_qr_code"
-			tools:ignore="ContentDescription" />
+		<androidx.cardview.widget.CardView
+			android:id="@+id/cardView"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_marginStart="64dp"
+			android:layout_marginLeft="64dp"
+			android:layout_marginTop="32dp"
+			android:layout_marginEnd="64dp"
+			android:layout_marginRight="64dp"
+			android:layout_marginBottom="32dp"
+			app:cardCornerRadius="16dp"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintDimensionRatio="1,1"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/qrIntroView"
+			app:layout_constraintVertical_chainStyle="spread_inside">
 
-	</androidx.cardview.widget.CardView>
+			<ImageView
+				android:id="@+id/qrCodeView"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				app:srcCompat="@drawable/ic_qr_code"
+				tools:ignore="ContentDescription" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+		</androidx.cardview.widget.CardView>
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml b/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
index 3620bb00c..108ca44dd 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
@@ -5,61 +5,59 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<com.google.android.material.tabs.TabLayout
-		android:id="@+id/tabLayout"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:tabBackground="@color/briar_primary"
-		app:tabGravity="fill"
-		app:tabIconTint="@color/action_bar_text"
-		app:tabIndicatorColor="@color/briar_lime_400"
-		app:tabIndicatorHeight="4dp"
-		app:tabInlineLabel="true"
-		app:tabMaxWidth="0dp"
-		app:tabMode="fixed"
-		app:tabTextColor="@color/action_bar_text">
-
-		<com.google.android.material.tabs.TabItem
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:icon="@drawable/forum_item_create_white"
-			android:text="@string/hotspot_tab_manual" />
-
-		<com.google.android.material.tabs.TabItem
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:icon="@drawable/ic_qr_code"
-			android:text="@string/qr_code" />
-	</com.google.android.material.tabs.TabLayout>
-
-	<androidx.viewpager2.widget.ViewPager2
-		android:id="@+id/pager"
-		android:layout_width="0dp"
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
+		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		app:layout_constraintBottom_toTopOf="@+id/stopButton"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
-
-	<Button
-		android:id="@+id/stopButton"
-		style="@style/BriarButton"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:drawableStart="@drawable/ic_portable_wifi_off"
-		android:drawableLeft="@drawable/ic_portable_wifi_off"
-		android:drawablePadding="6dp"
-		android:text="@string/hotspot_button_stop_sharing"
-		app:backgroundTint="@color/briar_red_500"
-		app:drawableTint="@color/button_text"
 		app:layout_constraintBottom_toTopOf="@+id/connectedButton"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		tools:visibility="visible" />
+		app:layout_constraintTop_toTopOf="parent">
+
+		<com.google.android.material.appbar.AppBarLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<com.google.android.material.tabs.TabLayout
+				android:id="@+id/tabLayout"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				app:layout_scrollFlags="scroll|enterAlways"
+				app:tabBackground="@color/briar_primary"
+				app:tabGravity="fill"
+				app:tabIconTint="@color/action_bar_text"
+				app:tabIndicatorColor="@color/briar_lime_400"
+				app:tabIndicatorHeight="4dp"
+				app:tabInlineLabel="true"
+				app:tabMaxWidth="0dp"
+				app:tabMode="fixed"
+				app:tabTextColor="@color/action_bar_text">
+
+				<com.google.android.material.tabs.TabItem
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:icon="@drawable/forum_item_create_white"
+					android:text="@string/hotspot_tab_manual" />
+
+				<com.google.android.material.tabs.TabItem
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:icon="@drawable/ic_qr_code"
+					android:text="@string/qr_code" />
+			</com.google.android.material.tabs.TabLayout>
+
+		</com.google.android.material.appbar.AppBarLayout>
+
+		<androidx.viewpager2.widget.ViewPager2
+			android:id="@+id/pager"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:layout_behavior="@string/appbar_scrolling_view_behavior"
+			app:layout_constraintBottom_toTopOf="@+id/connectedButton"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
+
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 	<Button
 		android:id="@+id/connectedButton"
@@ -67,10 +65,25 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_margin="16dp"
-		android:drawableStart="@drawable/ic_check_white"
-		android:drawableLeft="@drawable/ic_check_white"
-		android:drawablePadding="6dp"
 		android:text="@string/hotspot_button_connected"
+		app:drawableLeftCompat="@drawable/ic_check_white"
+		app:drawableStartCompat="@drawable/ic_check_white"
+		app:drawableTint="@color/button_text"
+		app:layout_constraintBottom_toTopOf="@+id/stopButton"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		tools:visibility="visible" />
+
+	<Button
+		android:id="@+id/stopButton"
+		style="@style/BriarButton"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:text="@string/hotspot_button_stop_sharing"
+		app:backgroundTint="@color/briar_red_500"
+		app:drawableLeftCompat="@drawable/ic_portable_wifi_off"
+		app:drawableStartCompat="@drawable/ic_portable_wifi_off"
 		app:drawableTint="@color/button_text"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"