diff --git a/briar-android/src/main/res/drawable/ic_settings_share.xml b/briar-android/src/main/res/drawable/ic_settings_share.xml
new file mode 100644
index 000000000..79baee417
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_settings_share.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?android:attr/textColorPrimary"
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0"
+	tools:ignore="NewApi">
+	<path
+		android:fillColor="#FFFFFFFF"
+		android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
+</vector>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 9ada6979e..167c54cdb 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -615,7 +615,8 @@
 	<string name="learn_more">Learn more</string>
 	<string name="disappearing_messages_summary">Make future messages in this conversation automatically disappear after 7\u00A0days.</string>
 
-	<!-- Settings Feedback -->
+	<!-- Settings Actions -->
+	<string name="pref_category_actions">Actions</string>
 	<string name="send_feedback">Send feedback</string>
 
 	<!-- Link Warning -->
diff --git a/briar-android/src/main/res/xml/settings.xml b/briar-android/src/main/res/xml/settings.xml
index b3cbe0e53..3bd775506 100644
--- a/briar-android/src/main/res/xml/settings.xml
+++ b/briar-android/src/main/res/xml/settings.xml
@@ -24,10 +24,24 @@
 		app:fragment="org.briarproject.briar.android.settings.NotificationsFragment"
 		app:icon="@drawable/ic_notifications" />
 
-	<Preference
-		android:key="pref_key_send_feedback"
-		android:title="@string/send_feedback"
-		app:icon="@drawable/ic_feedback" />
+	<PreferenceCategory
+		android:key="pref_key_actions"
+		android:layout="@layout/preferences_category"
+		android:title="@string/pref_category_actions"
+		app:allowDividerAbove="true">
+		<Preference
+			android:key="pref_key_share_app"
+			android:title="@string/hotspot_title"
+			app:icon="@drawable/ic_settings_share">
+			<intent
+				android:targetClass="org.briarproject.briar.android.hotspot.HotspotActivity"
+				android:targetPackage="@string/app_package" />
+		</Preference>
+		<Preference
+			android:key="pref_key_send_feedback"
+			android:title="@string/send_feedback"
+			app:icon="@drawable/ic_feedback" />
+	</PreferenceCategory>
 
 	<PreferenceCategory
 		android:key="pref_key_dev"