diff --git a/app/admin.apd b/app/admin.apd
deleted file mode 100644
index dbd2f6971..000000000
--- a/app/admin.apd
+++ /dev/null
@@ -1,4 +0,0 @@
-url: $baseurl/admin
-requires: admin
-name: Site Admin
-photo: $baseurl/app/admin.png
diff --git a/app/bookmarks.apd b/app/bookmarks.apd
index 2a04d9bf3..33d663217 100644
--- a/app/bookmarks.apd
+++ b/app/bookmarks.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/bookmarks
 requires: local_channel
 name: View Bookmarks
-photo: $baseurl/app/bookmarks.png
+photo: icon:bookmark
+categories: Productivity
diff --git a/app/bugreport.apd b/app/bugreport.apd
index 6fc9096ab..99cc48bf9 100644
--- a/app/bugreport.apd
+++ b/app/bugreport.apd
@@ -1,3 +1,5 @@
+version: 1
 url: https://github.com/redmatrix/hubzilla/issues
 name: Report Bug
-photo: $baseurl/app/bugreport.png
+photo: icon:bug
+categories: System
diff --git a/app/channel.apd b/app/channel.apd
index a13f9fd8b..ab79e7047 100644
--- a/app/channel.apd
+++ b/app/channel.apd
@@ -3,4 +3,4 @@ url: $baseurl/channel/$nick
 requires: local_channel
 name: Channel Home
 photo: icon:home
-categories: nav_featured_app, Conversation, Personal
+categories: nav_featured_app, Personal
diff --git a/app/chat.apd b/app/chat.apd
index 7ba1cd2c8..597451196 100644
--- a/app/chat.apd
+++ b/app/chat.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/chat/$nick
-requires: local_channel
+requires: local_channel, chat
 name: My Chatrooms
-photo: $baseurl/app/chat.png
+photo: icon:comments-o
+categories: Productivity
diff --git a/app/connections.apd b/app/connections.apd
index 63bc1ef1f..631f093a8 100644
--- a/app/connections.apd
+++ b/app/connections.apd
@@ -3,4 +3,4 @@ url: $baseurl/connections
 requires: local_channel
 name: Connections
 photo: icon:users
-categories: nav_featured_app, Social
+categories: nav_featured_app, Networking
diff --git a/app/directory.apd b/app/directory.apd
index a4efa1831..03a93f042 100644
--- a/app/directory.apd
+++ b/app/directory.apd
@@ -2,4 +2,4 @@ version: 1
 url: $baseurl/directory
 name: Directory
 photo: icon:sitemap
-categories: nav_featured_app, Social
+categories: nav_featured_app, Networking
diff --git a/app/features.apd b/app/features.apd
index 521df4794..bffbdffec 100644
--- a/app/features.apd
+++ b/app/features.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/settings/features
 requires: local_channel
 name: Features
-photo: $baseurl/app/features.png
+photo: icon:cogs
+categories: System
diff --git a/app/grid.apd b/app/grid.apd
index e152c33d0..c826974a4 100644
--- a/app/grid.apd
+++ b/app/grid.apd
@@ -3,4 +3,4 @@ url: $baseurl/network
 requires: local_channel
 name: Grid
 photo: icon:th
-categories: nav_featured_app, Conversation, Social
+categories: nav_featured_app, Networking
diff --git a/app/help.apd b/app/help.apd
index 8c7d2ea83..c81584178 100644
--- a/app/help.apd
+++ b/app/help.apd
@@ -2,4 +2,4 @@ version: 1
 url: $baseurl/help
 name: Help
 photo: icon:question
-categories: nav_featured_app
+categories: nav_featured_app, System
diff --git a/app/invite.apd b/app/invite.apd
index 96bafff14..99c2a4eec 100644
--- a/app/invite.apd
+++ b/app/invite.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/invite
 requires: local_channel
 name: Invite
-photo: $baseurl/app/invite.png
+photo: icon:user-plus
+categories: Networking
diff --git a/app/lang.apd b/app/lang.apd
index afe049866..c30a74654 100644
--- a/app/lang.apd
+++ b/app/lang.apd
@@ -1,3 +1,5 @@
+version: 1
 url: $baseurl/lang
 name: Language
-photo: $baseurl/app/lang.png
+photo: icon:language
+categories: System
diff --git a/app/mail.apd b/app/mail.apd
index cc427500e..9df9139f3 100644
--- a/app/mail.apd
+++ b/app/mail.apd
@@ -3,4 +3,4 @@ url: $baseurl/mail/combined
 requires: local_channel
 name: Mail
 photo: icon:envelope
-categories: nav_featured_app, Conversation
+categories: nav_featured_app, Personal
diff --git a/app/manage.apd b/app/manage.apd
index 27938e4cf..b525efa6c 100644
--- a/app/manage.apd
+++ b/app/manage.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/manage
 requires: local_channel
 name: Channel Manager
-photo: $baseurl/app/manage.png
+photo: icon:id-card-o
+categories: Personal
diff --git a/app/mood.apd b/app/mood.apd
index 6f381fd44..e05606a0e 100644
--- a/app/mood.apd
+++ b/app/mood.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/mood
 requires: local_channel
 name: Mood
-photo: $baseurl/app/mood.png
+photo: icon:smile-o
+categories: Social
diff --git a/app/poke.apd b/app/poke.apd
index 7e3bb4ff0..37b640fb8 100644
--- a/app/poke.apd
+++ b/app/poke.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/poke
 requires: local_channel
 name: Poke
-photo: $baseurl/app/poke.png
+photo: icon:hand-o-right
+categories: Social
diff --git a/app/post.apd b/app/post.apd
index 780eed47e..08e5ccf0c 100644
--- a/app/post.apd
+++ b/app/post.apd
@@ -1,4 +1,6 @@
-url: $baseurl/rpost?f=&body=%0A
+version: 1
+url: $baseurl/rpost?f=&body=
 requires: observer
 name: Post
-photo: $baseurl/app/post.png
+photo: icon:pencil-square
+categories: Productivity
diff --git a/app/probe.apd b/app/probe.apd
index 910e628ba..c7b849ee1 100644
--- a/app/probe.apd
+++ b/app/probe.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/probe
 requires: local_channel
 name: Remote Diagnostics
-photo: $baseurl/app/probe.png
+photo: icon:user-md
+categories: System
diff --git a/app/randprof.apd b/app/randprof.apd
index 9534c77f6..1b2addd5c 100644
--- a/app/randprof.apd
+++ b/app/randprof.apd
@@ -1,6 +1,6 @@
+version: 1
 url: $baseurl/randprof
 name: Random Channel
 target: randprof
-photo: $baseurl/app/randprof.png
-
-
+photo: icon:random
+categories: Networking
diff --git a/app/search.apd b/app/search.apd
index ed48909b4..9eb24ad41 100644
--- a/app/search.apd
+++ b/app/search.apd
@@ -1,3 +1,4 @@
+version: 1
 url: $baseurl/search
 name: Search
-photo: $baseurl/app/search.png
+photo: icon:search
diff --git a/app/settings.apd b/app/settings.apd
index fbb5eacdd..b244f6774 100644
--- a/app/settings.apd
+++ b/app/settings.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/settings
 requires: local_channel
 name: Settings
-photo: $baseurl/app/settings.png
+photo: icon:cog
+categories: System
diff --git a/app/suggest.apd b/app/suggest.apd
index cd94a6d1f..51b555264 100644
--- a/app/suggest.apd
+++ b/app/suggest.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/suggest
 requires: local_channel
 name: Suggest Channels
-photo: $baseurl/app/suggest.png
+photo: icon:lightbulb-o
+categories: Networking
diff --git a/app/webpages.apd b/app/webpages.apd
index 78e7abba8..b00e55cc4 100644
--- a/app/webpages.apd
+++ b/app/webpages.apd
@@ -1,4 +1,6 @@
+version: 1
 url: $baseurl/webpages/$nick
 requires: local_channel, webpages
 name: Webpages
-photo: $baseurl/app/webpages.png
+photo: icon:newspaper-o
+categories: Productivity
diff --git a/app/wiki.apd b/app/wiki.apd
index 94a3e6741..1110f0cc4 100644
--- a/app/wiki.apd
+++ b/app/wiki.apd
@@ -1,6 +1,6 @@
 version: 1
 url: $baseurl/wiki/$nick
-requires: local_channel
+requires: local_channel, wiki
 name: Wiki
 photo: icon:pencil-square-o
 categories: Productivity