diff --git a/Code/Lib/Apps.php b/Code/Lib/Apps.php
index 55c1db267..dff9bfc53 100644
--- a/Code/Lib/Apps.php
+++ b/Code/Lib/Apps.php
@@ -76,6 +76,7 @@ class Apps
         }
 
         $default_apps = [
+            'Access Lists',
             'Admin',
             'Channel Home',
             'Connections',
@@ -83,7 +84,6 @@ class Apps
             'Events',
             'Files',
             'Help',
-            'Lists',
             'Photos',
             'Profile Photo',
             'Search',
@@ -343,6 +343,7 @@ class Apps
     public static function translate_system_apps(&$arr)
     {
         $apps = array(
+            'Access Lists' => t('Access Lists'),
             'Admin' => t('Site Admin'),
             'Apps' => t('Apps'),
             'Articles' => t('Articles'),
@@ -377,7 +378,6 @@ class Apps
             'Help' => t('Help'),
             'Invite' => t('Invite'),
             'Language' => t('Language'),
-            'Lists' => t('Lists'),
             'Login' => t('Login'),
             'Mail' => t('Mail'),
             'Markup' => t('Markup'),
diff --git a/Code/Lib/Navbar.php b/Code/Lib/Navbar.php
index fb14ec676..34dedfcf3 100644
--- a/Code/Lib/Navbar.php
+++ b/Code/Lib/Navbar.php
@@ -109,10 +109,6 @@ class Navbar {
                 $nav['manage'] = array('manage', t('Channels'), "", t('Manage your channels'),'manage_nav_btn');
             }
 
-            $nav['group'] = array('lists', t('Lists'),"", t('Manage your access lists'),'group_nav_btn');
-
-            $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn');
-
             $nav['safe'] = array('safe', t('Safe Mode'), ((get_safemode()) ? t('(is on)') : t('(is off)')) , t('Content filtering'),'safe_nav_btn');
 
 
diff --git a/app/lists.apd b/app/lists.apd
new file mode 100644
index 000000000..8d2fdade1
--- /dev/null
+++ b/app/lists.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/lists
+requires: local_channel
+name: Access Lists
+photo: icon:lock
+categories: nav_featured_app, Personal
diff --git a/app/settings.apd b/app/settings.apd
new file mode 100644
index 000000000..8fc8633e5
--- /dev/null
+++ b/app/settings.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/settings
+requires: local_channel
+name: Settings
+photo: icon:gear
+categories: nav_featured_app, Personal
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 4dc1dcf87..df28e90b7 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -27,12 +27,6 @@
 		{{foreach $nav.usermenu as $usermenu}}
 		<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
 		{{/foreach}}
-		{{if $nav.settings}}
-		<a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
-		{{/if}}
-		{{if $nav.group}}
-		<a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a>
-		{{/if}}
 		{{if $nav.manage}}
 		<a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
 		{{/if}}