diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
index b0c12985e..7910f7d52 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
@@ -417,10 +417,30 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 			s = mService.getErrorText();
 			builder.setSmallIcon(R.drawable.ic_notification_warning);
 			builder.setColor(ContextCompat.getColor(this, R.color.error_text));
-			builder.setContentText(getString(R.string.tap_for_details));
+
+			if (!publicVersion && profile != null)
+			{
+				int retry = mService.getRetryIn();
+				if (retry > 0)
+				{
+					builder.setContentText(getResources().getQuantityString(R.plurals.retry_in, retry, retry));
+					builder.setProgress(mService.getRetryTimeout(), retry, false);
+				}
+
+				Intent intent = new Intent(getApplicationContext(), VpnProfileControlActivity.class);
+				intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+				intent.setAction(VpnProfileControlActivity.START_PROFILE);
+				intent.putExtra(VpnProfileControlActivity.EXTRA_VPN_PROFILE_ID, profile.getUUID().toString());
+				PendingIntent pending = PendingIntent.getActivity(getApplicationContext(), 0, intent,
+																  PendingIntent.FLAG_UPDATE_CURRENT);
+				builder.addAction(R.drawable.ic_notification_connecting, getString(R.string.retry), pending);
+				add_action = true;
+			}
 		}
 		else
 		{
+			builder.setProgress(0, 0, false);
+
 			switch (state)
 			{
 				case CONNECTING:
diff --git a/src/frontends/android/app/src/main/res/values-de/strings.xml b/src/frontends/android/app/src/main/res/values-de/strings.xml
index 4dc812ca2..cc107e60c 100644
--- a/src/frontends/android/app/src/main/res/values-de/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-de/strings.xml
@@ -31,7 +31,6 @@
     <string name="strongswan_shortcut">strongSwan-Verknüpfung</string>
     <string name="permanent_notification_name">VPN Verbindungsstatus</string>
     <string name="permanent_notification_description">Zeigt Informationen zum Verbindungsstatus der VPN Verbindung und dient als permanente Notification dazu, den VPN Dienst im Hintergrund am Laufen zu halten.</string>
-    <string name="tap_for_details">Antippen für Details.</string>
 
     <!-- Settings -->
     <string name="pref_title">Einstellungen</string>
diff --git a/src/frontends/android/app/src/main/res/values-pl/strings.xml b/src/frontends/android/app/src/main/res/values-pl/strings.xml
index d4cf10ef4..b2ee09288 100644
--- a/src/frontends/android/app/src/main/res/values-pl/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-pl/strings.xml
@@ -31,7 +31,6 @@
     <string name="strongswan_shortcut">Skrót strongSwan</string>
     <string name="permanent_notification_name">VPN connection state</string>
     <string name="permanent_notification_description">Provides information about the VPN connection state and serves as permanent notification to keep the VPN service running in the background.</string>
-    <string name="tap_for_details">Tap for details.</string>
 
     <!-- Settings -->
     <string name="pref_title">Settings</string>
diff --git a/src/frontends/android/app/src/main/res/values-ru/strings.xml b/src/frontends/android/app/src/main/res/values-ru/strings.xml
index be34c2d98..5373fdd1f 100644
--- a/src/frontends/android/app/src/main/res/values-ru/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-ru/strings.xml
@@ -28,7 +28,6 @@
     <string name="strongswan_shortcut">Ссылка на strongSwan</string>
     <string name="permanent_notification_name">VPN connection state</string>
     <string name="permanent_notification_description">Provides information about the VPN connection state and serves as permanent notification to keep the VPN service running in the background.</string>
-    <string name="tap_for_details">Tap for details.</string>
 
     <!-- Settings -->
     <string name="pref_title">Settings</string>
diff --git a/src/frontends/android/app/src/main/res/values-ua/strings.xml b/src/frontends/android/app/src/main/res/values-ua/strings.xml
index faad4a758..a9dfbadd4 100644
--- a/src/frontends/android/app/src/main/res/values-ua/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-ua/strings.xml
@@ -29,7 +29,6 @@
     <string name="strongswan_shortcut">strongSwan посилання</string>
     <string name="permanent_notification_name">VPN connection state</string>
     <string name="permanent_notification_description">Provides information about the VPN connection state and serves as permanent notification to keep the VPN service running in the background.</string>
-    <string name="tap_for_details">Tap for details.</string>
 
     <!-- Settings -->
     <string name="pref_title">Settings</string>
diff --git a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
index 5b350facc..501d4bb80 100644
--- a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -28,7 +28,6 @@
     <string name="strongswan_shortcut">strongSwan快捷方式</string>
     <string name="permanent_notification_name">VPN connection state</string>
     <string name="permanent_notification_description">Provides information about the VPN connection state and serves as permanent notification to keep the VPN service running in the background.</string>
-    <string name="tap_for_details">Tap for details.</string>
 
     <!-- Settings -->
     <string name="pref_title">Settings</string>
diff --git a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
index 4d5afc71b..f94efda9d 100644
--- a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -28,7 +28,6 @@
     <string name="strongswan_shortcut">strongSwan快速選單</string>
     <string name="permanent_notification_name">VPN connection state</string>
     <string name="permanent_notification_description">Provides information about the VPN connection state and serves as permanent notification to keep the VPN service running in the background.</string>
-    <string name="tap_for_details">Tap for details.</string>
 
     <!-- Settings -->
     <string name="pref_title">Settings</string>
diff --git a/src/frontends/android/app/src/main/res/values/strings.xml b/src/frontends/android/app/src/main/res/values/strings.xml
index c4b697bcc..79d6e76b9 100644
--- a/src/frontends/android/app/src/main/res/values/strings.xml
+++ b/src/frontends/android/app/src/main/res/values/strings.xml
@@ -31,7 +31,6 @@
     <string name="strongswan_shortcut">strongSwan shortcut</string>
     <string name="permanent_notification_name">VPN connection state</string>
     <string name="permanent_notification_description">Provides information about the VPN connection state and serves as permanent notification to keep the VPN service running in the background.</string>
-    <string name="tap_for_details">Tap for details.</string>
 
     <!-- Settings -->
     <string name="pref_title">Settings</string>