diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 08e0b449..2cf697ed 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -31,7 +31,8 @@
 
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings"/>
+            android:label="@string/title_activity_settings"
+            android:parentActivityName=".MainActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsActivity.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsActivity.kt
index 3d62bd66..7fb0cf85 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsActivity.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsActivity.kt
@@ -9,6 +9,6 @@ class SettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         DataBindingUtil.setContentView<ActivitySettingsBinding>(this, R.layout.activity_settings)
-                .toolbar.setNavigationOnClickListener({ finish() })
+                .toolbar.setNavigationOnClickListener({ navigateUp() })
     }
 }
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt b/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt
index 76156380..9577dfc5 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt
@@ -5,6 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Bundle
+import android.support.v4.app.TaskStackBuilder
+import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import java.io.InputStream
 
@@ -22,6 +24,13 @@ fun intentFilter(vararg actions: String): IntentFilter {
     return result
 }
 
+fun AppCompatActivity.navigateUp() {
+    val intent = parentActivityIntent
+    if (shouldUpRecreateTask(intent))
+        TaskStackBuilder.create(this).addNextIntentWithParentStack(intent).startActivities()
+    else navigateUpTo(intent)
+}
+
 fun Bundle.put(key: String, map: Array<String>): Bundle {
     putStringArray(key, map)
     return this
diff --git a/mobile/src/main/res/drawable/ic_navigation_close.xml b/mobile/src/main/res/drawable/ic_navigation_close.xml
deleted file mode 100644
index 0a244b99..00000000
--- a/mobile/src/main/res/drawable/ic_navigation_close.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/mobile/src/main/res/layout/activity_settings.xml b/mobile/src/main/res/layout/activity_settings.xml
index 8285794c..131dd9c9 100644
--- a/mobile/src/main/res/layout/activity_settings.xml
+++ b/mobile/src/main/res/layout/activity_settings.xml
@@ -12,7 +12,7 @@
             android:background="?attr/colorPrimary"
             android:elevation="4dp"
             app:title="@string/title_activity_settings"
-            app:navigationIcon="@drawable/ic_navigation_close"
+            app:navigationIcon="?attr/homeAsUpIndicator"
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
             android:id="@+id/toolbar"/>