diff --git a/rootfs/standard/usr/bin/mynode-manage-apps b/rootfs/standard/usr/bin/mynode-manage-apps
index 40c90561..b84afd09 100755
--- a/rootfs/standard/usr/bin/mynode-manage-apps
+++ b/rootfs/standard/usr/bin/mynode-manage-apps
@@ -1,57 +1,10 @@
 #!/usr/local/bin/python3
 
 from argparse import ArgumentParser
+from application_info import *
+import json
 import os
 
-APPLICATIONS_FOLDER = "/usr/share/mynode_apps"
-
-def init_application(app_info):
-    app_name = app_info["short_name"]
-    app_dir = APPLICATIONS_FOLDER + "/" + app_name
-    print(" Loading " + app_name + "...")
-    os.system("cp -f {} {}".format(app_dir+"/app.service", "/etc/systemd/system/"+app_name+".service"))
-    os.system("cp -f {} {}".format(app_dir+"/"+app_name+".png", "/var/www/mynode/static/images/app_icons/"+app_name+".png"))
-    if (os.path.isfile(app_dir+"/scripts/pre_"+app_name+".sh")):
-        os.system("cp -f {} {}".format(app_dir+"/scripts/pre_"+app_name+".sh",      "/usr/bin/service_post/pre_"+app_name+".sh"))
-    if (os.path.isfile(app_dir+"/scripts/post_"+app_name+".sh")):
-        os.system("cp -f {} {}".format(app_dir+"/scripts/post_"+app_name+".sh",     "/usr/bin/service_pre/post_"+app_name+".sh"))
-    if (os.path.isfile(app_dir+"/scripts/install"+app_name+".sh")):
-        os.system("cp -f {} {}".format(app_dir+"/scripts/install_"+app_name+".sh",  "/usr/bin/service_install/install_"+app_name+".sh"))
-    if (os.path.isfile(app_dir+"/scripts/uninstall"+app_name+".sh")):
-        os.system("cp -f {} {}".format(app_dir+"/scripts/uninstall"+app_name+".sh", "/usr/bin/service_uninstall/uninstall_"+app_name+".sh"))
-    
-    print("  TODO: Install data files")
-
-    # For "node" type apps
-    print("  TODO: Need node special files???")
-
-    # For "python" type apps
-    print("  TODO: Need python special files???")
-
-    # For "docker" type apps
-    print("  TODO: Build dockerfile???")
-    print("  TODO: Install dockerfile???")
-
-    print(" Done.")
-
-
-def init_applications():
-    # Loop over each app
-    for app_folder_name in os.listdir(APPLICATIONS_FOLDER):
-        print("Found Application: {}".format(app_folder_name))
-        app_dir = APPLICATIONS_FOLDER + "/" + app_folder_name
-        try:
-            app_json_path = app_dir + "/app.json"
-            with open(app_json_path, 'r') as fp:
-                app_info = json.load(fp)
-                init_application(app_info)
-
-        except Exception as e:
-            print("  ERROR: Error loading app.json file")            
-
-    os.system("systemctl daemon-reload")
-
-
 def main():
     parser = ArgumentParser(prog='mynode-manage-apps')
     action_choices = (
@@ -64,7 +17,7 @@ def main():
     if args.action == "createbasefolders":
         print("createbasefolders - not needed?")
     elif args.action == "init":
-        init_applications()
+        init_dynamic_apps()
     else:
         print("UNKNOWN BASE ACTION")
 
diff --git a/rootfs/standard/usr/share/mynode_apps/lndg/app.json b/rootfs/standard/usr/share/mynode_apps/lndg/app.json
index e69de29b..bf8aa6a0 100644
--- a/rootfs/standard/usr/share/mynode_apps/lndg/app.json
+++ b/rootfs/standard/usr/share/mynode_apps/lndg/app.json
@@ -0,0 +1,13 @@
+{
+    "name": "LNDg",
+    "short_name": "lndg",
+    "requires_lightning": true,
+    "hide_status_icon": false,
+    "app_tile_default_status_text": "Lightning Tool",
+    "app_tile_button_href": "/lndg",
+    "app_tile_button_text": "Info",
+    "can_uninstall": true,
+    "can_enable_disable": false,
+    "show_on_homepage": true,
+    "homepage_order": 99
+}
\ No newline at end of file
diff --git a/rootfs/standard/var/pynode/application_info.py b/rootfs/standard/var/pynode/application_info.py
index 23578202..dd42a064 100644
--- a/rootfs/standard/var/pynode/application_info.py
+++ b/rootfs/standard/var/pynode/application_info.py
@@ -11,6 +11,9 @@ import subprocess
 import re
 import os
 
+# Globals
+DYNAMIC_APPLICATIONS_FOLDER = "/usr/share/mynode_apps"
+
 # Cached data
 JSON_APPLICATION_CACHE_FILE = "/tmp/app_cache.json"
 mynode_applications = None
@@ -157,6 +160,9 @@ def initialize_applications():
             apps[index] = initialize_application_defaults(app)
 
         mynode_applications = copy.deepcopy(apps)
+
+    # TODO: Load all app-specific JSON files
+    # ...
     return
 
 def update_applications(include_status=False):
@@ -420,4 +426,66 @@ def reset_custom_app_version_data():
     os.system("rm -f /usr/share/mynode/mynode_app_versions_custom.sh")
     os.system("rm -f /mnt/hdd/mynode/settings/mynode_app_versions_custom.sh")
     os.system("sync")
-    trigger_application_refresh()
\ No newline at end of file
+    trigger_application_refresh()
+
+######################################################################################
+## Dynamic Apps
+######################################################################################
+def get_dynamic_app_dir():
+    global DYNAMIC_APPLICATIONS_FOLDER
+    return DYNAMIC_APPLICATIONS_FOLDER
+
+def get_dynamic_app_names():
+    app_dir = get_dynamic_app_dir()
+    app_names = []
+    for app_folder_name in os.listdir( app_dir ):
+        if os.path.isdir(app_dir + "/" +app_folder_name):
+            app_names.append(app_folder_name)
+    return app_names
+
+def init_dynamic_app(app_info):
+    app_name = app_info["short_name"]
+    app_dir = DYNAMIC_APPLICATIONS_FOLDER + "/" + app_name
+    log_message(" Loading " + app_name + "...")
+    os.system("cp -f {} {}".format(app_dir+"/app.service", "/etc/systemd/system/"+app_name+".service"))
+    os.system("cp -f {} {}".format(app_dir+"/"+app_name+".png", "/var/www/mynode/static/images/app_icons/"+app_name+".png"))
+    if (os.path.isfile(app_dir+"/scripts/pre_"+app_name+".sh")):
+        os.system("cp -f {} {}".format(app_dir+"/scripts/pre_"+app_name+".sh",      "/usr/bin/service_post/pre_"+app_name+".sh"))
+    if (os.path.isfile(app_dir+"/scripts/post_"+app_name+".sh")):
+        os.system("cp -f {} {}".format(app_dir+"/scripts/post_"+app_name+".sh",     "/usr/bin/service_pre/post_"+app_name+".sh"))
+    if (os.path.isfile(app_dir+"/scripts/install"+app_name+".sh")):
+        os.system("cp -f {} {}".format(app_dir+"/scripts/install_"+app_name+".sh",  "/usr/bin/service_install/install_"+app_name+".sh"))
+    if (os.path.isfile(app_dir+"/scripts/uninstall"+app_name+".sh")):
+        os.system("cp -f {} {}".format(app_dir+"/scripts/uninstall"+app_name+".sh", "/usr/bin/service_uninstall/uninstall_"+app_name+".sh"))
+    
+    log_message("  TODO: Install data files")
+
+    # For "node" type apps
+    log_message("  TODO: Need node special files???")
+
+    # For "python" type apps
+    log_message("  TODO: Need python special files???")
+
+    # For "docker" type apps
+    log_message("  TODO: Build dockerfile???")
+    log_message("  TODO: Install dockerfile???")
+
+    log_message(" Done.")
+
+def init_dynamic_apps():
+    # Loop over each app
+    root_app_dir = get_dynamic_app_dir()
+    app_names = get_dynamic_app_names()
+    for app_name in app_names:
+        log_message("Found Application: {}".format(app_name))
+        app_dir = root_app_dir + "/" + app_name
+        try:
+            app_json_path = app_dir + "/app.json"
+            with open(app_json_path, 'r') as fp:
+                app_info = json.load(fp)
+                init_dynamic_app(app_info)
+
+        except Exception as e:
+            log_message("  ERROR: Error loading app.json file ({})".format(str(e)))            
+
+    os.system("systemctl daemon-reload")
\ No newline at end of file
diff --git a/rootfs/standard/var/www/mynode/static/images/bitcoin.png b/rootfs/standard/var/www/mynode/static/images/app_icons/bitcoin.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/bitcoin.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/bitcoin.png
diff --git a/rootfs/standard/var/www/mynode/static/images/bluewallet.png b/rootfs/standard/var/www/mynode/static/images/app_icons/bluewallet.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/bluewallet.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/bluewallet.png
diff --git a/rootfs/standard/var/www/mynode/static/images/bos.png b/rootfs/standard/var/www/mynode/static/images/app_icons/bos.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/bos.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/bos.png
diff --git a/rootfs/standard/var/www/mynode/static/images/btcpayserver.png b/rootfs/standard/var/www/mynode/static/images/app_icons/btcpayserver.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/btcpayserver.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/btcpayserver.png
diff --git a/rootfs/standard/var/www/mynode/static/images/btcrpcexplorer.png b/rootfs/standard/var/www/mynode/static/images/app_icons/btcrpcexplorer.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/btcrpcexplorer.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/btcrpcexplorer.png
diff --git a/rootfs/standard/var/www/mynode/static/images/caravan.png b/rootfs/standard/var/www/mynode/static/images/app_icons/caravan.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/caravan.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/caravan.png
diff --git a/rootfs/standard/var/www/mynode/static/images/ckbunker.png b/rootfs/standard/var/www/mynode/static/images/app_icons/ckbunker.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/ckbunker.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/ckbunker.png
diff --git a/rootfs/standard/var/www/mynode/static/images/dojo.png b/rootfs/standard/var/www/mynode/static/images/app_icons/dojo.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/dojo.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/dojo.png
diff --git a/rootfs/standard/var/www/mynode/static/images/electrs.png b/rootfs/standard/var/www/mynode/static/images/app_icons/electrs.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/electrs.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/electrs.png
diff --git a/rootfs/standard/var/www/mynode/static/images/fully_noded_logo.png b/rootfs/standard/var/www/mynode/static/images/app_icons/fully_noded.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/fully_noded_logo.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/fully_noded.png
diff --git a/rootfs/standard/var/www/mynode/static/images/joininbox.png b/rootfs/standard/var/www/mynode/static/images/app_icons/joininbox.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/joininbox.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/joininbox.png
diff --git a/rootfs/standard/var/www/mynode/static/images/lightning.png b/rootfs/standard/var/www/mynode/static/images/app_icons/lightning.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/lightning.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/lightning.png
diff --git a/rootfs/standard/var/www/mynode/static/images/lit.png b/rootfs/standard/var/www/mynode/static/images/app_icons/lit.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/lit.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/lit.png
diff --git a/rootfs/standard/var/www/mynode/static/images/lnbits.png b/rootfs/standard/var/www/mynode/static/images/app_icons/lnbits.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/lnbits.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/lnbits.png
diff --git a/rootfs/standard/var/www/mynode/static/images/lnd.png b/rootfs/standard/var/www/mynode/static/images/app_icons/lnd.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/lnd.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/lnd.png
diff --git a/rootfs/standard/var/www/mynode/static/images/lndconnect.png b/rootfs/standard/var/www/mynode/static/images/app_icons/lndconnect.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/lndconnect.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/lndconnect.png
diff --git a/rootfs/standard/var/www/mynode/static/images/lndhub.png b/rootfs/standard/var/www/mynode/static/images/app_icons/lndhub.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/lndhub.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/lndhub.png
diff --git a/rootfs/standard/var/www/mynode/static/images/lndmanage.png b/rootfs/standard/var/www/mynode/static/images/app_icons/lndmanage.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/lndmanage.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/lndmanage.png
diff --git a/rootfs/standard/var/www/mynode/static/images/loop.png b/rootfs/standard/var/www/mynode/static/images/app_icons/loop.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/loop.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/loop.png
diff --git a/rootfs/standard/var/www/mynode/static/images/mempool.png b/rootfs/standard/var/www/mynode/static/images/app_icons/mempool.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/mempool.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/mempool.png
diff --git a/rootfs/standard/var/www/mynode/static/images/netdata.png b/rootfs/standard/var/www/mynode/static/images/app_icons/netdata.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/netdata.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/netdata.png
diff --git a/rootfs/standard/var/www/mynode/static/images/pool.png b/rootfs/standard/var/www/mynode/static/images/app_icons/pool.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/pool.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/pool.png
diff --git a/rootfs/standard/var/www/mynode/static/images/pyblock.png b/rootfs/standard/var/www/mynode/static/images/app_icons/pyblock.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/pyblock.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/pyblock.png
diff --git a/rootfs/standard/var/www/mynode/static/images/rtl.png b/rootfs/standard/var/www/mynode/static/images/app_icons/rtl.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/rtl.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/rtl.png
diff --git a/rootfs/standard/var/www/mynode/static/images/specter.png b/rootfs/standard/var/www/mynode/static/images/app_icons/specter.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/specter.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/specter.png
diff --git a/rootfs/standard/var/www/mynode/static/images/sphinxrelay.png b/rootfs/standard/var/www/mynode/static/images/app_icons/sphinxrelay.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/sphinxrelay.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/sphinxrelay.png
diff --git a/rootfs/standard/var/www/mynode/static/images/thunderhub.png b/rootfs/standard/var/www/mynode/static/images/app_icons/thunderhub.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/thunderhub.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/thunderhub.png
diff --git a/rootfs/standard/var/www/mynode/static/images/tor.png b/rootfs/standard/var/www/mynode/static/images/app_icons/tor.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/tor.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/tor.png
diff --git a/rootfs/standard/var/www/mynode/static/images/vpn.png b/rootfs/standard/var/www/mynode/static/images/app_icons/vpn.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/vpn.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/vpn.png
diff --git a/rootfs/standard/var/www/mynode/static/images/warden.png b/rootfs/standard/var/www/mynode/static/images/app_icons/warden.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/warden.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/warden.png
diff --git a/rootfs/standard/var/www/mynode/static/images/wardenterminal.png b/rootfs/standard/var/www/mynode/static/images/app_icons/wardenterminal.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/wardenterminal.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/wardenterminal.png
diff --git a/rootfs/standard/var/www/mynode/static/images/webssh2.png b/rootfs/standard/var/www/mynode/static/images/app_icons/webssh2.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/webssh2.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/webssh2.png
diff --git a/rootfs/standard/var/www/mynode/static/images/whirlpool.png b/rootfs/standard/var/www/mynode/static/images/app_icons/whirlpool.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/whirlpool.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/whirlpool.png
diff --git a/rootfs/standard/var/www/mynode/static/images/zap.png b/rootfs/standard/var/www/mynode/static/images/app_icons/zap.png
similarity index 100%
rename from rootfs/standard/var/www/mynode/static/images/zap.png
rename to rootfs/standard/var/www/mynode/static/images/app_icons/zap.png
diff --git a/rootfs/standard/var/www/mynode/static/images/lndhub.svg b/rootfs/standard/var/www/mynode/static/images/lndhub.svg
deleted file mode 100644
index 9e06155b..00000000
--- a/rootfs/standard/var/www/mynode/static/images/lndhub.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="153px" height="36px" viewBox="0 0 153 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 52.5 (67469) - http://www.bohemiancoding.com/sketch -->
-    <title>lndhub</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Page-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Desktop-HD" transform="translate(-250.000000, -58.000000)">
-            <g id="lndhub" transform="translate(250.000000, 58.000000)">
-                <path d="M13.6302476,29.5332861 C13.6302476,29.9157243 13.6142724,30.2376049 13.5823213,30.4989377 C13.5503703,30.7602704 13.5024444,30.9769821 13.4385423,31.1490793 C13.3746402,31.3211765 13.2947638,31.445467 13.1989107,31.5219547 C13.1030576,31.5984423 12.9912306,31.6366856 12.8634264,31.6366856 L1.49530143,31.6366856 C1.07354763,31.6366856 0.718896355,31.512395 0.431336951,31.2638102 C0.143777546,31.0152254 0,30.6104844 0,30.0495751 L0,7.58144476 C0,7.45396537 0.0415357354,7.33923564 0.124608452,7.23725212 C0.207681169,7.13526861 0.345068602,7.05240825 0.536774872,6.98866856 C0.728481142,6.92492886 0.987280724,6.87393787 1.31318138,6.83569405 C1.63908204,6.79745023 2.04485423,6.77832861 2.53051011,6.77832861 C3.02894641,6.77832861 3.43791365,6.79745023 3.7574241,6.83569405 C4.07693455,6.87393787 4.33253908,6.92492886 4.52424535,6.98866856 C4.71595162,7.05240825 4.85333905,7.13526861 4.93641177,7.23725212 C5.01948448,7.33923564 5.06102022,7.45396537 5.06102022,7.58144476 L5.06102022,27.4872521 L12.8634264,27.4872521 C12.9912306,27.4872521 13.1030576,27.5223084 13.1989107,27.5924221 C13.2947638,27.6625358 13.3746402,27.7772655 13.4385423,27.9366147 C13.5024444,28.095964 13.5503703,28.3063018 13.5823213,28.5676346 C13.6142724,28.8289673 13.6302476,29.1508479 13.6302476,29.5332861 Z M36.6851648,29.8774788 C36.6851648,30.1706814 36.6340439,30.4320102 36.5318005,30.6614731 C36.4295572,30.890936 36.2921697,31.0821522 36.1196341,31.2351275 C35.9470985,31.3881027 35.7426148,31.4996455 35.5061771,31.5697592 C35.2697394,31.6398729 35.0301101,31.6749292 34.7872822,31.6749292 L32.6401827,31.6749292 C32.1928681,31.6749292 31.8062662,31.6303121 31.4803656,31.5410765 C31.1544649,31.4518409 30.8541296,31.2893071 30.5793506,31.0534703 C30.3045716,30.8176334 30.0393819,30.4989397 29.7837736,30.0973796 C29.5281652,29.6958195 29.2406101,29.1763488 28.9210997,28.5389518 L22.7481886,16.970255 C22.3903369,16.2818662 22.0261005,15.5393099 21.6554684,14.7425637 C21.2848362,13.9458175 20.9525503,13.1713919 20.6586007,12.4192635 L20.6202597,12.4192635 C20.6713813,13.3371151 20.709722,14.251766 20.7352829,15.1632436 C20.7608437,16.0747213 20.7736239,17.0148677 20.7736239,17.983711 L20.7736239,30.9291785 C20.7736239,31.0566579 20.7384783,31.1713876 20.668186,31.2733711 C20.5978937,31.3753546 20.4764816,31.4614019 20.3039459,31.5315156 C20.1314103,31.6016292 19.8981711,31.6558072 19.6042215,31.694051 C19.3102719,31.7322948 18.9332552,31.7514164 18.4731602,31.7514164 C18.0258456,31.7514164 17.655219,31.7322948 17.3612694,31.694051 C17.0673198,31.6558072 16.8372757,31.6016292 16.6711303,31.5315156 C16.5049848,31.4614019 16.3899628,31.3753546 16.3260607,31.2733711 C16.2621586,31.1713876 16.230208,31.0566579 16.230208,30.9291785 L16.230208,8.69050992 C16.230208,8.09135678 16.4059362,7.64199867 16.7573976,7.3424221 C17.1088591,7.04284553 17.5401918,6.89305949 18.0514085,6.89305949 L20.7544534,6.89305949 C21.2401093,6.89305949 21.6490765,6.93448967 21.9813674,7.01735127 C22.3136583,7.10021288 22.6107985,7.23725117 22.8727971,7.42847025 C23.1347957,7.61968934 23.380815,7.88420511 23.6108625,8.2220255 C23.8409101,8.55984588 24.0773442,8.97733462 24.3201722,9.47450425 L29.151146,18.5191218 C29.4323152,19.0672832 29.7102851,19.6058755 29.9850641,20.134915 C30.2598431,20.6639545 30.5250328,21.192986 30.7806412,21.7220255 C31.0362495,22.251065 31.2854639,22.7705357 31.5282919,23.2804533 C31.7711198,23.7903708 32.007554,24.3002807 32.2376015,24.8101983 L32.2567721,24.8101983 C32.2184308,23.9178426 32.1896753,22.987257 32.1705047,22.0184136 C32.1513341,21.0495702 32.1417489,20.1253585 32.1417489,19.2457507 L32.1417489,7.6388102 C32.1417489,7.51133081 32.1800896,7.39660108 32.2567721,7.29461756 C32.3334546,7.19263405 32.4612568,7.10339982 32.6401827,7.02691218 C32.8191085,6.95042455 33.0555427,6.89624662 33.3494923,6.86437677 C33.643442,6.83250692 34.0204586,6.81657224 34.4805537,6.81657224 C34.9150879,6.81657224 35.2793243,6.83250692 35.573274,6.86437677 C35.8672236,6.89624662 36.0940726,6.95042455 36.2538278,7.02691218 C36.413583,7.10339982 36.52541,7.19263405 36.5893121,7.29461756 C36.6532142,7.39660108 36.6851648,7.51133081 36.6851648,7.6388102 L36.6851648,29.8774788 Z M62.3281036,18.9015581 C62.3281036,21.1706912 62.0309633,23.1115358 61.4366739,24.7241501 C60.8423845,26.3367644 59.9893044,27.6529694 58.877408,28.6728045 C57.7655116,29.6926397 56.4140027,30.4415698 54.8228407,30.9196176 C53.2316786,31.3976653 51.3370101,31.6366856 49.1387782,31.6366856 L43.2150841,31.6366856 C42.7933303,31.6366856 42.438679,31.512395 42.1511196,31.2638102 C41.8635602,31.0152254 41.7197826,30.6104844 41.7197826,30.0495751 L41.7197826,8.48016997 C41.7197826,7.91926065 41.8635602,7.51451966 42.1511196,7.26593484 C42.438679,7.01735003 42.7933303,6.89305949 43.2150841,6.89305949 L49.5797004,6.89305949 C51.7907127,6.89305949 53.6662109,7.15120138 55.2062513,7.66749292 C56.7462916,8.18378445 58.0434846,8.94864932 59.0978691,9.96211048 C60.1522536,10.9755716 60.9542128,12.2280379 61.5037708,13.7195467 C62.0533287,15.2110556 62.3281036,16.9383755 62.3281036,18.9015581 Z M57.1137191,19.0736544 C57.1137191,17.900844 56.9763317,16.8109116 56.7015527,15.8038244 C56.4267737,14.7967372 55.9858559,13.9235164 55.3787861,13.184136 C54.7717162,12.4447555 53.9921224,11.8679199 53.0399813,11.4536119 C52.0878401,11.0393039 50.838573,10.832153 49.2921424,10.832153 L46.7424618,10.832153 L46.7424618,27.6593484 L49.3688245,27.6593484 C50.7491097,27.6593484 51.9121103,27.48088 52.8578612,27.1239377 C53.8036121,26.7669954 54.5927911,26.228403 55.2254218,25.5081445 C55.8580525,24.7878859 56.3309209,23.8923566 56.6440411,22.8215297 C56.9571614,21.7507029 57.1137191,20.5014236 57.1137191,19.0736544 Z M111.471923,31.1586402 C111.471923,31.2606237 111.446362,31.346671 111.395241,31.4167847 C111.344119,31.4868984 111.261047,31.5474502 111.146024,31.5984419 C111.031,31.6494337 110.871247,31.6876769 110.66676,31.7131728 C110.462274,31.7386687 110.206669,31.7514164 109.899939,31.7514164 C109.580429,31.7514164 109.318434,31.7386687 109.113947,31.7131728 C108.909461,31.6876769 108.749708,31.6494337 108.634684,31.5984419 C108.51966,31.5474502 108.436589,31.4868984 108.385467,31.4167847 C108.334346,31.346671 108.308785,31.2606237 108.308785,31.1586402 L108.308785,21.0814448 C108.308785,20.0998534 108.232104,19.3094931 108.078739,18.7103399 C107.925374,18.1111868 107.70172,17.594903 107.40777,17.1614731 C107.11382,16.7280432 106.733609,16.3966017 106.267123,16.1671388 C105.800638,15.9376759 105.260674,15.8229462 104.647214,15.8229462 C103.854828,15.8229462 103.062454,16.1033966 102.270068,16.6643059 C101.477682,17.2252153 100.646967,18.047445 99.7778987,19.1310198 L99.7778987,31.1586402 C99.7778987,31.2606237 99.7523382,31.346671 99.7012166,31.4167847 C99.6500949,31.4868984 99.5670234,31.5474502 99.4519997,31.5984419 C99.3369759,31.6494337 99.1772231,31.6876769 98.9727364,31.7131728 C98.7682497,31.7386687 98.5062551,31.7514164 98.1867446,31.7514164 C97.8800146,31.7514164 97.6244101,31.7386687 97.4199234,31.7131728 C97.2154367,31.6876769 97.0524888,31.6494337 96.9310748,31.5984419 C96.8096608,31.5474502 96.7265894,31.4868984 96.6818579,31.4167847 C96.6371265,31.346671 96.6147611,31.2606237 96.6147611,31.1586402 L96.6147611,5.61189802 C96.6147611,5.5099145 96.6371265,5.42068027 96.6818579,5.34419263 C96.7265894,5.267705 96.8096608,5.20396626 96.9310748,5.1529745 C97.0524888,5.10198275 97.2154367,5.0637395 97.4199234,5.03824363 C97.6244101,5.01274775 97.8800146,5 98.1867446,5 C98.5062551,5 98.7682497,5.01274775 98.9727364,5.03824363 C99.1772231,5.0637395 99.3369759,5.10198275 99.4519997,5.1529745 C99.5670234,5.20396626 99.6500949,5.267705 99.7012166,5.34419263 C99.7523382,5.42068027 99.7778987,5.5099145 99.7778987,5.61189802 L99.7778987,15.9185552 C100.685308,14.9624598 101.599095,14.2517729 102.519285,13.7864731 C103.439475,13.3211733 104.366041,13.0885269 105.299012,13.0885269 C106.449249,13.0885269 107.417351,13.2829301 108.203347,13.6717422 C108.989343,14.0605544 109.625159,14.5800251 110.110815,15.23017 C110.596471,15.8803149 110.944732,16.6419928 111.155609,17.5152266 C111.366486,18.3884605 111.471923,19.4433366 111.471923,20.6798867 L111.471923,31.1586402 Z M131.65126,31.1586402 C131.65126,31.2606237 131.628895,31.346671 131.584163,31.4167847 C131.539432,31.4868984 131.459555,31.5474502 131.344532,31.5984419 C131.229508,31.6494337 131.07934,31.6876769 130.894024,31.7131728 C130.708708,31.7386687 130.481859,31.7514164 130.21347,31.7514164 C129.919521,31.7514164 129.679891,31.7386687 129.494575,31.7131728 C129.309259,31.6876769 129.162287,31.6494337 129.053653,31.5984419 C128.94502,31.5474502 128.871533,31.4868984 128.833192,31.4167847 C128.794851,31.346671 128.77568,31.2606237 128.77568,31.1586402 L128.77568,28.8831445 C127.791588,29.9667193 126.820291,30.7570797 125.86176,31.2542493 C124.903228,31.7514189 123.931931,32 122.947839,32 C121.797601,32 120.829499,31.8087838 120.043504,31.4263456 C119.257508,31.0439074 118.621692,30.5244367 118.136036,29.8679178 C117.65038,29.211399 117.302119,28.4465341 117.091242,27.5733003 C116.880365,26.7000665 116.774928,25.6388164 116.774928,24.3895184 L116.774928,13.9490085 C116.774928,13.847025 116.797293,13.7609777 116.842025,13.690864 C116.886756,13.6207504 116.973023,13.5570116 117.100827,13.4996459 C117.228631,13.4422802 117.394774,13.4040369 117.599261,13.384915 C117.803748,13.3657931 118.059352,13.3562323 118.366082,13.3562323 C118.672812,13.3562323 118.928417,13.3657931 119.132903,13.384915 C119.33739,13.4040369 119.500338,13.4422802 119.621752,13.4996459 C119.743166,13.5570116 119.829432,13.6207504 119.880554,13.690864 C119.931676,13.7609777 119.957236,13.847025 119.957236,13.9490085 L119.957236,23.9688385 C119.957236,24.9759257 120.030722,25.7822208 120.177697,26.3877479 C120.324672,26.993275 120.548326,27.5095588 120.848666,27.9366147 C121.149006,28.3636707 121.529217,28.6951121 121.989312,28.930949 C122.449407,29.1667859 122.986177,29.2847025 123.599637,29.2847025 C124.392023,29.2847025 125.181202,29.0042521 125.967198,28.4433428 C126.753193,27.8824335 127.587103,27.0602037 128.468952,25.9766289 L128.468952,13.9490085 C128.468952,13.847025 128.491317,13.7609777 128.536049,13.690864 C128.58078,13.6207504 128.667047,13.5570116 128.794851,13.4996459 C128.922655,13.4422802 129.085603,13.4040369 129.2837,13.384915 C129.481796,13.3657931 129.740596,13.3562323 130.060106,13.3562323 C130.366836,13.3562323 130.622441,13.3657931 130.826927,13.384915 C131.031414,13.4040369 131.191167,13.4422802 131.306191,13.4996459 C131.421214,13.5570116 131.507481,13.6207504 131.564993,13.690864 C131.622505,13.7609777 131.65126,13.847025 131.65126,13.9490085 L131.65126,31.1586402 Z M153,22.3243626 C153,23.8158715 152.837052,25.1575719 152.511151,26.3495042 C152.185251,27.5414366 151.705992,28.5580694 151.073362,29.3994334 C150.440731,30.2407974 149.664332,30.8845587 148.744142,31.3307365 C147.823952,31.7769144 146.769583,32 145.581004,32 C145.031446,32 144.523432,31.9458221 144.056947,31.8374646 C143.590462,31.7291071 143.133569,31.5538256 142.686254,31.3116147 C142.23894,31.0694039 141.791632,30.7634579 141.344317,30.3937677 C140.897002,30.0240775 140.424134,29.5779063 139.925698,29.0552408 L139.925698,31.1586402 C139.925698,31.2606237 139.900137,31.349858 139.849016,31.4263456 C139.797894,31.5028332 139.714822,31.563385 139.599799,31.6080028 C139.484775,31.6526206 139.340997,31.6876769 139.168462,31.7131728 C138.995926,31.7386687 138.775467,31.7514164 138.507078,31.7514164 C138.25147,31.7514164 138.034206,31.7386687 137.85528,31.7131728 C137.676355,31.6876769 137.529382,31.6526206 137.414358,31.6080028 C137.299334,31.563385 137.222653,31.5028332 137.184312,31.4263456 C137.145971,31.349858 137.1268,31.2606237 137.1268,31.1586402 L137.1268,5.61189802 C137.1268,5.5099145 137.149166,5.42068027 137.193897,5.34419263 C137.238629,5.267705 137.3217,5.20396626 137.443114,5.1529745 C137.564528,5.10198275 137.727476,5.0637395 137.931963,5.03824363 C138.136449,5.01274775 138.392054,5 138.698784,5 C139.018294,5 139.280289,5.01274775 139.484776,5.03824363 C139.689262,5.0637395 139.849015,5.10198275 139.964039,5.1529745 C140.079063,5.20396626 140.162134,5.267705 140.213256,5.34419263 C140.264377,5.42068027 140.289938,5.5099145 140.289938,5.61189802 L140.289938,15.9185552 C140.801155,15.3958897 141.296388,14.9560924 141.775654,14.5991501 C142.25492,14.2422078 142.724593,13.9521966 143.184688,13.7291076 C143.644783,13.5060187 144.104871,13.3434849 144.564966,13.2415014 C145.025061,13.1395179 145.51071,13.0885269 146.021927,13.0885269 C147.274408,13.0885269 148.344752,13.337108 149.232991,13.8342776 C150.12123,14.3314472 150.843312,14.9975171 151.399261,15.8325071 C151.955209,16.6674971 152.360981,17.6458867 152.616589,18.7677054 C152.872198,19.889524 153,21.0750646 153,22.3243626 Z M149.664328,22.6876771 C149.664328,21.8080693 149.597231,20.9539701 149.463037,20.1253541 C149.328843,19.2967381 149.095603,18.5637426 148.763313,17.9263456 C148.431022,17.2889487 147.990104,16.7758518 147.440546,16.3870397 C146.890988,15.9982275 146.207246,15.8038244 145.389299,15.8038244 C144.980326,15.8038244 144.577749,15.8611892 144.181556,15.9759207 C143.785363,16.0906521 143.382786,16.2818683 142.973812,16.5495751 C142.564839,16.8172818 142.139896,17.161471 141.698972,17.582153 C141.258047,18.002835 140.788374,18.5318665 140.289938,19.1692635 L140.289938,26.0339943 C141.159006,27.0920733 141.989721,27.8983683 142.782107,28.4529037 C143.574493,29.007439 144.398817,29.2847025 145.255105,29.2847025 C146.047491,29.2847025 146.724843,29.0934863 147.287182,28.7110482 C147.84952,28.32861 148.306413,27.821887 148.657875,27.190864 C149.009336,26.559841 149.264941,25.852341 149.424696,25.0683428 C149.584451,24.2843445 149.664328,23.4907972 149.664328,22.6876771 Z" id="LNDhub" fill="#FFFFFF"></path>
-                <g id="Group" transform="translate(66.000000, 0.000000)" fill="#7ECCDC" fill-rule="nonzero">
-                    <path d="M21.3597561,0.0369747899 C20.9640124,0.0369747899 20.5682687,0.203163557 20.2290599,0.480144835 L1.06375862,17.2652103 C0.554945315,17.7083803 0.385340879,18.4285317 0.611480127,19.0932867 C0.837619374,19.7580418 1.51603712,20.1458156 2.19445486,20.1458156 L8.5263538,20.1458156 L2.8728726,33.4963132 C2.59019854,34.2164645 2.81633779,35.0474083 3.43822072,35.4905784 C3.72089478,35.7121634 4.06010366,35.7675597 4.39931253,35.7675597 C4.79505621,35.7675597 5.24733471,35.6013709 5.53000877,35.3243896 L24.9214493,17.9853616 C25.2606581,17.7083803 25.4867974,17.209814 25.4867974,16.7112477 C25.4867974,15.7695114 24.7518448,15.0493601 23.790753,15.0493601 L17.5719237,15.0493601 L22.9427308,2.30822127 C23.2254049,1.58806995 22.9992657,0.757126113 22.3773827,0.313956068 C22.0381739,0.147767301 21.698965,0.0369747899 21.3597561,0.0369747899 Z" id="Path"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/rootfs/standard/var/www/mynode/static/images/lndhub_old.png b/rootfs/standard/var/www/mynode/static/images/lndhub_old.png
deleted file mode 100644
index af55aead..00000000
Binary files a/rootfs/standard/var/www/mynode/static/images/lndhub_old.png and /dev/null differ
diff --git a/rootfs/standard/var/www/mynode/static/images/specter.svg b/rootfs/standard/var/www/mynode/static/images/specter.svg
deleted file mode 100644
index 59f7fbb8..00000000
--- a/rootfs/standard/var/www/mynode/static/images/specter.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="136px" height="183px" viewBox="0 0 136 183" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
-    <title>Group 2</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Page-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group-2" transform="translate(56.301537, 101.210101) rotate(70.000000) translate(-56.301537, -101.210101) translate(-37.698463, 21.710101)">
-            <path d="M119.379895,40.6029336 C114.608986,25.846267 101.692623,15.2696003 86.5071681,15.2696003 C67.2489863,15.2696003 51.5980772,32.306267 51.5980772,53.2696003 C51.5980772,74.2329336 67.2489863,91.2696003 86.5071681,91.2696003 C101.692623,91.2696003 114.608986,80.6929336 119.379895,65.936267 L144.688986,65.936267 L144.688986,91.2696003 L167.961714,91.2696003 L167.961714,65.936267 L179.598077,65.936267 L179.598077,40.6029336 L119.379895,40.6029336 Z M86.5071681,65.936267 C80.1071681,65.936267 74.8708045,60.236267 74.8708045,53.2696003 C74.8708045,46.3029336 80.1071681,40.6029336 86.5071681,40.6029336 C92.9071681,40.6029336 98.1435318,46.3029336 98.1435318,53.2696003 C98.1435318,60.236267 92.9071681,65.936267 86.5071681,65.936267 Z" id="Shape" fill-opacity="0.53" fill="#FFFFFF" fill-rule="nonzero" transform="translate(115.598077, 53.269600) rotate(-15.000000) translate(-115.598077, -53.269600) "></path>
-            <path d="M109.318138,82.5452222 C104.547229,67.7885555 91.6308655,57.2118888 76.445411,57.2118888 C57.1872292,57.2118888 41.5363201,74.2485555 41.5363201,95.2118888 C41.5363201,116.175222 57.1872292,133.211889 76.445411,133.211889 C91.6308655,133.211889 104.547229,122.635222 109.318138,107.878555 L134.627229,107.878555 L134.627229,133.211889 L157.899956,133.211889 L157.899956,107.878555 L169.53632,107.878555 L169.53632,82.5452222 L109.318138,82.5452222 Z M76.445411,107.878555 C70.045411,107.878555 64.8090473,102.178555 64.8090473,95.2118888 C64.8090473,88.2452222 70.045411,82.5452222 76.445411,82.5452222 C82.845411,82.5452222 88.0817746,88.2452222 88.0817746,95.2118888 C88.0817746,102.178555 82.845411,107.878555 76.445411,107.878555 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero" transform="translate(105.536320, 95.211889) rotate(28.000000) translate(-105.536320, -95.211889) "></path>
-            <circle id="Oval" stroke="#FFFFFF" stroke-width="10" cx="42" cy="64" r="42"></circle>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/rootfs/standard/var/www/mynode/templates/electrum_server.html b/rootfs/standard/var/www/mynode/templates/electrum_server.html
index c8a98944..676ba1fb 100644
--- a/rootfs/standard/var/www/mynode/templates/electrum_server.html
+++ b/rootfs/standard/var/www/mynode/templates/electrum_server.html
@@ -103,7 +103,7 @@
         <div class="app_tile_row">
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/electrs.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/electrs.png")}}"/></div>
                 <div class="app_title">Local<br/>PC Wallet</div>
                 <div class="app_status"></div>
                 <div class="app_contents">
@@ -113,7 +113,7 @@
 
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/electrs.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/electrs.png")}}"/></div>
                 <div class="app_title">Local<br/>Mobile Wallets</div>
                 <div class="app_status"></div>
                 <div class="app_contents">
@@ -123,7 +123,7 @@
 
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/tor.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/tor.png")}}"/></div>
                 <div class="app_title">Remote<br/>PC Wallet</div>
                 <div class="app_status"></div>
                 <div class="app_contents">
@@ -133,7 +133,7 @@
 
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/tor.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/tor.png")}}"/></div>
                 <div class="app_title">Remote<br/>Mobile Wallet</div>
                 <div class="app_status"></div>
                 <div class="app_contents">
diff --git a/rootfs/standard/var/www/mynode/templates/includes/services.html b/rootfs/standard/var/www/mynode/templates/includes/services.html
index 0e5d4d9e..0000ccf7 100644
--- a/rootfs/standard/var/www/mynode/templates/includes/services.html
+++ b/rootfs/standard/var/www/mynode/templates/includes/services.html
@@ -3,7 +3,7 @@
     <div class="app_tile_wide">
         <div style="width: 130px; float: left;">
             <div class="app_status_icon {{ bitcoin_status_color }}" id="bitcoin_status_icon"></div>
-            <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/bitcoin.png")}}"/></div>
+            <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/bitcoin.png")}}"/></div>
             <div class="app_title">Bitcoin</div>
             <div class="app_status" id="bitcoin_status">{{ bitcoin_status }}</div>
             {% if is_testnet_enabled %}
@@ -43,7 +43,7 @@
     <div class="app_tile_wide">
         <div style="width: 130px; float: left;">
             <div class="app_status_icon {{ lnd_status_color }}" id="lnd_status_icon"></div>
-            <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/lightning.png")}}"/></div>
+            <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/lightning.png")}}"/></div>
             <div class="app_title">Lightning</div>
             <div class="app_status" id="lnd_status">{{ lnd_status }}</div>
             {% if is_testnet_enabled %}
diff --git a/rootfs/standard/var/www/mynode/templates/lnd.html b/rootfs/standard/var/www/mynode/templates/lnd.html
index 0c031d3b..f44fbaf2 100644
--- a/rootfs/standard/var/www/mynode/templates/lnd.html
+++ b/rootfs/standard/var/www/mynode/templates/lnd.html
@@ -559,7 +559,7 @@
         <div class="app_tile_row">
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/rtl.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/rtl.png")}}"/></div>
                 <div class="app_title">RTL</div>
                 <div class="app_status"></div>
                 <div class="app_contents">
@@ -570,7 +570,7 @@
 
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/thunderhub.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/thunderhub.png")}}"/></div>
                 <div class="app_title">Thunderhub</div>
                 <div class="app_status"></div>
                 <div class="app_contents">
@@ -584,7 +584,7 @@
 
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/zap.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/zap.png")}}"/></div>
                 <div class="app_title">Zap</div>
                 <div class="app_status"></div>
                 <div class="app_contents">
@@ -594,7 +594,7 @@
 
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/bluewallet.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/bluewallet.png")}}"/></div>
                 <div class="app_title">BlueWallet</div>
                 <div class="app_status"></div>
                 <div class="app_contents">
diff --git a/rootfs/standard/var/www/mynode/templates/tor.html b/rootfs/standard/var/www/mynode/templates/tor.html
index 6b15df32..c92be258 100644
--- a/rootfs/standard/var/www/mynode/templates/tor.html
+++ b/rootfs/standard/var/www/mynode/templates/tor.html
@@ -132,7 +132,7 @@
         <div class="app_tile_row">
             <div class="app_tile_short">
                 <div class="app_status_icon"></div>
-                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/fully_noded_logo.png")}}"/></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/app_icons/fully_noded.png")}}"/></div>
                 <div class="app_title">Fully Noded</div>
                 <div class="app_status"></div>
                 <div class="app_contents">