diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 686ff728..80dd647d 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -31,12 +31,15 @@
         </activity>
         <activity
             android:name=".activities.WebGuiActivity"
-            android:label="@string/web_gui_title">
+            android:label="@string/web_gui_title"
+            android:parentActivityName=".activities.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".activities.MainActivity" />
         </activity>
-        <activity android:name=".activities.SettingsActivity">
+        <activity android:name=".activities.SettingsActivity"
+            android:label="@string/settings_title"
+            android:parentActivityName=".activities.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".activities.MainActivity" />