diff --git a/app/src/main/java/ch/dissem/apps/abit/MainActivity.java b/app/src/main/java/ch/dissem/apps/abit/MainActivity.java
index d52afe5..2384b48 100644
--- a/app/src/main/java/ch/dissem/apps/abit/MainActivity.java
+++ b/app/src/main/java/ch/dissem/apps/abit/MainActivity.java
@@ -479,7 +479,7 @@ public class MainActivity extends AppCompatActivity
             i.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    i.nodeSwitch.withChecked(i.bmc.isRunning());
+                    i.nodeSwitch.withChecked(Preferences.isFullNodeActive(i));
                     i.drawer.updateStickyFooterItem(i.nodeSwitch);
                 }
             });
diff --git a/app/src/main/res/layout/dialog_full_node.xml b/app/src/main/res/layout/dialog_full_node.xml
index 9c8edd9..450c969 100644
--- a/app/src/main/res/layout/dialog_full_node.xml
+++ b/app/src/main/res/layout/dialog_full_node.xml
@@ -38,12 +38,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="8dp"
-        android:text="@string/startup_node"
+        android:text="@string/use_mobile_network"
         android:textColor="@color/colorAccent"
-        app:layout_constraintEnd_toEndOf="@+id/description"
+        app:layout_constraintEnd_toEndOf="@id/description"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintTop_toBottomOf="@+id/description"
-        tools:layout_editor_absoluteX="184dp"/>
+        tools:layout_editor_absoluteX="8dp"/>
 
     <Button
         android:id="@+id/dismiss"
@@ -51,10 +51,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="8dp"
-        android:text="@string/cancel"
+        android:text="@string/wait_for_wifi"
         android:textColor="@color/colorAccent"
-        app:layout_constraintEnd_toStartOf="@+id/ok"
-        app:layout_constraintTop_toBottomOf="@+id/description"
-        tools:ignore="RtlSymmetry"
-        tools:layout_editor_absoluteX="87dp"/>
+        app:layout_constraintEnd_toEndOf="@id/description"
+        app:layout_constraintTop_toBottomOf="@+id/ok"
+        tools:layout_editor_absoluteX="8dp"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4d03c23..1fa2b69 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -98,7 +98,7 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
     <string name="import_input_description">Du kannst einfach den Inhalt eines Exports oder einer ‘keys.dat’-Datei einfügen</string>
     <string name="full_node_restart">Knoten starten</string>
     <string name="full_node_stop">Knoten beenden</string>
-    <string name="startup_node">Knoten starten</string>
+    <string name="use_mobile_network">Mobilfunknetz benutzen</string>
     <string name="personal_message">Nachricht</string>
     <string name="no_identity_warning">Bitte versuchs nochmals wenn eine Identität verfügbar ist.</string>
     <string name="title_chan_detail">Chan</string>
@@ -117,4 +117,5 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
     <string name="cleanup_notification_start">Aufräumarbeiten gestartet</string>
     <string name="cleanup_notification_end">Aufräumarbeiten beendet</string>
     <string name="cleanup_summary">Veraltete Inventareinträge werden entfernt</string>
+    <string name="wait_for_wifi">Auf W-LAN warten</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96037f6..ac64a6d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,7 +100,7 @@ As an alternative you could configure a trusted node in the settings, but as of
     <string name="import_input_description">You can just paste the contents of an export or a ‘keys.dat’ file</string>
     <string name="full_node_stop">shutdown node</string>
     <string name="full_node_restart">restart node</string>
-    <string name="startup_node">Startup node</string>
+    <string name="use_mobile_network">Use mobile network</string>
     <string name="personal_message">Message</string>
     <string name="no_identity_warning">Please try again once an identity is available.</string>
     <string name="status_public_key">public key requested</string>
@@ -116,4 +116,5 @@ As an alternative you could configure a trusted node in the settings, but as of
     <string name="cleanup_summary">Remove outdated inventory entries</string>
     <string name="cleanup_notification_start">Cleanup started</string>
     <string name="cleanup_notification_end">Cleanup finished</string>
+    <string name="wait_for_wifi">Wait for Wi-Fi</string>
 </resources>