diff --git a/internal_filesystem/apps/com.micropythonos.nostr/META-INF/MANIFEST.JSON b/internal_filesystem/apps/com.micropythonos.nostr/META-INF/MANIFEST.JSON
index 8ba7214e..00e89d23 100644
--- a/internal_filesystem/apps/com.micropythonos.nostr/META-INF/MANIFEST.JSON
+++ b/internal_filesystem/apps/com.micropythonos.nostr/META-INF/MANIFEST.JSON
@@ -10,8 +10,8 @@
 "category": "communication",
 "activities": [
     {
-      "entrypoint": "assets/nostr.py",
-      "classname": "Nostr",
+      "entrypoint": "assets/nostr_app.py",
+      "classname": "NostrApp",
       "intent_filters": [
         {
           "action": "main",
diff --git a/internal_filesystem/apps/com.micropythonos.nostr/assets/nostr.py b/internal_filesystem/apps/com.micropythonos.nostr/assets/nostr_app.py
similarity index 90%
rename from internal_filesystem/apps/com.micropythonos.nostr/assets/nostr.py
rename to internal_filesystem/apps/com.micropythonos.nostr/assets/nostr_app.py
index bb0425c4..7a11a895 100644
--- a/internal_filesystem/apps/com.micropythonos.nostr/assets/nostr.py
+++ b/internal_filesystem/apps/com.micropythonos.nostr/assets/nostr_app.py
@@ -5,7 +5,7 @@ from mpos.ui.anim import WidgetAnimator
 
 from fullscreen_qr import FullscreenQR
 
-class Nostr(Activity):
+class NostrApp(Activity):
 
     wallet = None
     receive_qr_data = None
@@ -104,11 +104,11 @@ class Nostr(Activity):
             return
         try:
             from nostr_client import NostrClient
-            self.wallet = NostrClient(self.prefs.get_string("nwc_url"))
-            self.wallet.static_receive_code = self.prefs.get_string("nwc_static_receive_code")
+            self.wallet = NostrClient(self.prefs.get_string("nostr_nsec"))
+            self.wallet.follow_npub = self.prefs.get_string("nostr_follow_npub")
             self.redraw_static_receive_code_cb()
         except Exception as e:
-            self.error_cb(f"Couldn't initialize NWC Wallet because: {e}")
+            self.error_cb(f"Couldn't initialize Nostr client because: {e}")
             import sys
             sys.print_exception(e)
             return
@@ -194,11 +194,9 @@ class Nostr(Activity):
         intent = Intent(activity_class=SettingsActivity)
         intent.putExtra("prefs", self.prefs)
         intent.putExtra("settings", [
-            {"title": "LNBits URL", "key": "lnbits_url", "placeholder": "https://demo.lnpiggy.com", "should_show": self.should_show_setting},
-            {"title": "LNBits Read Key", "key": "lnbits_readkey", "placeholder": "fd92e3f8168ba314dc22e54182784045", "should_show": self.should_show_setting},
-            {"title": "Optional LN Address", "key": "lnbits_static_receive_code", "placeholder": "Will be fetched if empty.", "should_show": self.should_show_setting},
-            {"title": "Nost Wallet Connect", "key": "nwc_url", "placeholder": "nostr+walletconnect://69effe7b...", "should_show": self.should_show_setting},
-            {"title": "Optional LN Address", "key": "nwc_static_receive_code", "placeholder": "Optional if present in NWC URL.", "should_show": self.should_show_setting},
+            {"title": "Nostr Private Key (nsec)", "key": "nostr_nsec", "placeholder": "nsec1...", "should_show": self.should_show_setting},
+            {"title": "Nostr Follow Public Key (npub)", "key": "nostr_follow_npub", "placeholder": "npub1...", "should_show": self.should_show_setting},
+            {"title": "Nostr Relay", "key": "nostr_relay", "placeholder": "wss://relay.example.com", "should_show": self.should_show_setting},
         ])
         self.startActivity(intent)
 
diff --git a/internal_filesystem/apps/com.micropythonos.nostr/res/mipmap-mdpi/icon_64x64.png b/internal_filesystem/apps/com.micropythonos.nostr/res/mipmap-mdpi/icon_64x64.png
deleted file mode 100644
index c0871732..00000000
Binary files a/internal_filesystem/apps/com.micropythonos.nostr/res/mipmap-mdpi/icon_64x64.png and /dev/null differ
diff --git a/internal_filesystem/lib/mpos/ui/display.py b/internal_filesystem/lib/mpos/ui/display.py
index dc2d192b..2e65ed4f 100644
--- a/internal_filesystem/lib/mpos/ui/display.py
+++ b/internal_filesystem/lib/mpos/ui/display.py
@@ -11,7 +11,6 @@ logo_white = "M:builtin/res/mipmap-mdpi/MicroPythonOS-logo-white-long-w240.png"
 # Black text on transparent logo works (for light mode) but can't be inverted (for dark mode)
 # Even when trying different blend modes (SUBTRACTIVE, ADDITIVE, MULTIPLY)
 # Even when it's on a white (instead of transparent) background
-#logo_black = "M:builtin/res/mipmap-mdpi/MicroPythonOS_logo_black_240x35.png"
 #logo_black = "M:builtin/res/mipmap-mdpi/MicroPythonOS-logo-black-long-w240.png"
 
 def init_rootscreen():