diff --git a/img/avatars/icon_blog.png b/img/avatars/icon_blog.png
new file mode 100644
index 00000000..bd3ccaee
Binary files /dev/null and b/img/avatars/icon_blog.png differ
diff --git a/img/avatars/icon_connect.png b/img/avatars/icon_connect.png
new file mode 100644
index 00000000..ca498c77
Binary files /dev/null and b/img/avatars/icon_connect.png differ
diff --git a/img/avatars/icon_cryptpad.png b/img/avatars/icon_cryptpad.png
new file mode 100644
index 00000000..9f0a51ed
Binary files /dev/null and b/img/avatars/icon_cryptpad.png differ
diff --git a/img/avatars/icon_help.png b/img/avatars/icon_help.png
new file mode 100644
index 00000000..8e56a5c2
Binary files /dev/null and b/img/avatars/icon_help.png differ
diff --git a/img/avatars/icon_new_identity.png b/img/avatars/icon_new_identity.png
new file mode 100644
index 00000000..9deb0df7
Binary files /dev/null and b/img/avatars/icon_new_identity.png differ
diff --git a/img/avatars/icon_restart_network.png b/img/avatars/icon_restart_network.png
new file mode 100644
index 00000000..ab9cfd1d
Binary files /dev/null and b/img/avatars/icon_restart_network.png differ
diff --git a/img/avatars/icon_sites.png b/img/avatars/icon_sites.png
new file mode 100644
index 00000000..5fa600b7
Binary files /dev/null and b/img/avatars/icon_sites.png differ
diff --git a/img/avatars/icon_social.png b/img/avatars/icon_social.png
new file mode 100644
index 00000000..3565f89c
Binary files /dev/null and b/img/avatars/icon_social.png differ
diff --git a/img/avatars/icon_users.png b/img/avatars/icon_users.png
new file mode 100644
index 00000000..b4fe5b2c
Binary files /dev/null and b/img/avatars/icon_users.png differ
diff --git a/img/avatars/icon_wifi.png b/img/avatars/icon_wifi.png
new file mode 100644
index 00000000..af80ed65
Binary files /dev/null and b/img/avatars/icon_wifi.png differ
diff --git a/img/avatars/icons_chat.png b/img/avatars/icons_chat.png
new file mode 100644
index 00000000..ba813a72
Binary files /dev/null and b/img/avatars/icons_chat.png differ
diff --git a/img/avatars/icons_invite.png b/img/avatars/icons_invite.png
new file mode 100644
index 00000000..195f07ef
Binary files /dev/null and b/img/avatars/icons_invite.png differ
diff --git a/img/icon_blog.png b/img/icon_blog.png
new file mode 100644
index 00000000..bd3ccaee
Binary files /dev/null and b/img/icon_blog.png differ
diff --git a/img/icon_connect.png b/img/icon_connect.png
new file mode 100644
index 00000000..ca498c77
Binary files /dev/null and b/img/icon_connect.png differ
diff --git a/img/icon_cryptpad.png b/img/icon_cryptpad.png
index 9f7714fe..9f0a51ed 100644
Binary files a/img/icon_cryptpad.png and b/img/icon_cryptpad.png differ
diff --git a/img/icon_help.png b/img/icon_help.png
new file mode 100644
index 00000000..8e56a5c2
Binary files /dev/null and b/img/icon_help.png differ
diff --git a/img/icon_new_identity.png b/img/icon_new_identity.png
new file mode 100644
index 00000000..9deb0df7
Binary files /dev/null and b/img/icon_new_identity.png differ
diff --git a/img/icon_restart_network.png b/img/icon_restart_network.png
new file mode 100644
index 00000000..ab9cfd1d
Binary files /dev/null and b/img/icon_restart_network.png differ
diff --git a/img/icon_sites.png b/img/icon_sites.png
new file mode 100644
index 00000000..5fa600b7
Binary files /dev/null and b/img/icon_sites.png differ
diff --git a/img/icon_social.png b/img/icon_social.png
index 6f51c5ce..3565f89c 100644
Binary files a/img/icon_social.png and b/img/icon_social.png differ
diff --git a/img/icon_users.png b/img/icon_users.png
new file mode 100644
index 00000000..b4fe5b2c
Binary files /dev/null and b/img/icon_users.png differ
diff --git a/img/icon_wifi.png b/img/icon_wifi.png
new file mode 100644
index 00000000..af80ed65
Binary files /dev/null and b/img/icon_wifi.png differ
diff --git a/img/icons_chat.png b/img/icons_chat.png
new file mode 100644
index 00000000..ba813a72
Binary files /dev/null and b/img/icons_chat.png differ
diff --git a/img/icons_invite.png b/img/icons_invite.png
new file mode 100644
index 00000000..195f07ef
Binary files /dev/null and b/img/icons_invite.png differ
diff --git a/img/logo_blue.png b/img/logo_blue.png
new file mode 100644
index 00000000..3ac7ef6b
Binary files /dev/null and b/img/logo_blue.png differ
diff --git a/img/logo_white_large.png b/img/logo_white_large.png
new file mode 100644
index 00000000..9279079b
Binary files /dev/null and b/img/logo_white_large.png differ
diff --git a/img/postactiv_sprite2.png b/img/postactiv_sprite2.png
new file mode 100644
index 00000000..d1621289
Binary files /dev/null and b/img/postactiv_sprite2.png differ
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 2d3fff2b..bbaab7df 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -919,7 +919,7 @@ if [ \$no_of_users -gt 0 ]; then
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/Users.desktop
     echo 'Comment=List of users' >> /home/$MY_USERNAME/Desktop/Users.desktop
     echo 'Exec=bash /home/$MY_USERNAME/showusers' >> /home/$MY_USERNAME/Desktop/Users.desktop
-    echo 'Icon=/usr/share/$PROJECT_NAME/avatars/otheruser.png' >> /home/$MY_USERNAME/Desktop/Users.desktop
+    echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_users.png' >> /home/$MY_USERNAME/Desktop/Users.desktop
     echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/Users.desktop
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
@@ -930,7 +930,7 @@ if [ \$no_of_users -gt 0 ]; then
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
         echo 'Comment=Realtime collaborative editing of documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
         echo "Exec=$BROWSER http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo "Icon=/etc/cryptpad/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+        echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
         echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
         echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
         chmod +x /home/$MY_USERNAME/Desktop/cryptpad.desktop
@@ -950,7 +950,7 @@ if [ \$no_of_users -gt 0 ]; then
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
         echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop
         echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
-        echo "Icon=/etc/patchwork/icon_patchwork.png" >> /home/$MY_USERNAME/Desktop/social.desktop
+        echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop
         echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
         echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop
         chmod +x /home/$MY_USERNAME/Desktop/social.desktop
@@ -984,7 +984,7 @@ if [ \$no_of_users -gt 0 ]; then
         echo 'Name=Connect Meshes' >> /home/$MY_USERNAME/Desktop/vpn.desktop
         echo 'Comment=Connect to another mesh network via the internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
         echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-connect' >> /home/$MY_USERNAME/Desktop/vpn.desktop
-        echo 'Icon=/usr/share/${PROJECT_NAME}/avatars/connect.jpg' >> /home/$MY_USERNAME/Desktop/vpn.desktop
+        echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_connect.png' >> /home/$MY_USERNAME/Desktop/vpn.desktop
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/vpn.desktop
         chmod +x /home/$MY_USERNAME/Desktop/vpn.desktop
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/vpn.desktop
@@ -996,7 +996,7 @@ if [ \$no_of_users -gt 0 ]; then
         echo "Name=Visit a site" >> /home/$MY_USERNAME/Desktop/sites.desktop
         echo 'Comment=Visit a site' >> /home/$MY_USERNAME/Desktop/sites.desktop
         echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-visit-site' >> /home/$MY_USERNAME/Desktop/sites.desktop
-        echo 'Icon=/usr/share/${PROJECT_NAME}/avatars/ipfs.jpg' >> /home/$MY_USERNAME/Desktop/sites.desktop
+        echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_sites.png' >> /home/$MY_USERNAME/Desktop/sites.desktop
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/sites.desktop
         chmod +x /home/$MY_USERNAME/Desktop/sites.desktop
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/sites.desktop
@@ -1006,7 +1006,7 @@ if [ \$no_of_users -gt 0 ]; then
         echo "Name=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
         echo 'Comment=View or create blog entries' >> /home/$MY_USERNAME/Desktop/blog.desktop
         echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
-        echo 'Icon=/usr/share/${PROJECT_NAME}/avatars/blog.png' >> /home/$MY_USERNAME/Desktop/blog.desktop
+        echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_blog.png' >> /home/$MY_USERNAME/Desktop/blog.desktop
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/blog.desktop
         chmod +x /home/$MY_USERNAME/Desktop/blog.desktop
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/blog.desktop
@@ -1028,7 +1028,7 @@ if [ \$no_of_users -gt 0 ]; then
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
         echo 'Comment=Chat, Voice and Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
         echo 'Exec=bash /home/$MY_USERNAME/runtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
-        echo "Icon=/usr/share/$PROJECT_NAME/avatars/chat.png" >> /home/$MY_USERNAME/Desktop/tox.desktop
+        echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_chat.png" >> /home/$MY_USERNAME/Desktop/tox.desktop
         echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
         chmod +x /home/$MY_USERNAME/Desktop/tox.desktop
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/tox.desktop
@@ -1044,7 +1044,7 @@ if [ \$no_of_users -gt 0 ]; then
             echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop
             echo 'Comment=Create an invite for Patchwork or Ferment' >> /home/$MY_USERNAME/Desktop/invite.desktop
             echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
-            echo 'Icon=/usr/share/freedombone/avatars/invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
+            echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
             echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop
             chmod +x /home/$MY_USERNAME/Desktop/invite.desktop
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 7148304a..362983fe 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -282,7 +282,7 @@ function show_desktop_icons {
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/help.desktop
     echo 'Comment=Show help' >> /home/$MY_USERNAME/Desktop/help.desktop
     echo "Exec=bash -c /home/$MY_USERNAME/.showhelp" >> /home/$MY_USERNAME/Desktop/help.desktop
-    echo 'Icon=/usr/share/freedombone/avatars/help.png' >> /home/$MY_USERNAME/Desktop/help.desktop
+    echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_help.png" >> /home/$MY_USERNAME/Desktop/help.desktop
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/help.desktop
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/help.desktop
 
@@ -292,7 +292,7 @@ function show_desktop_icons {
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/wifi.desktop
     echo 'Comment=Check wifi status' >> /home/$MY_USERNAME/Desktop/wifi.desktop
     echo 'Exec=mate-terminal -e "sudo batman monitor"' >> /home/$MY_USERNAME/Desktop/wifi.desktop
-    echo 'Icon=/usr/share/freedombone/avatars/wifi.png' >> /home/$MY_USERNAME/Desktop/wifi.desktop
+    echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_wifi.png" >> /home/$MY_USERNAME/Desktop/wifi.desktop
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/wifi.desktop
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/wifi.desktop
 
@@ -302,7 +302,7 @@ function show_desktop_icons {
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/restart.desktop
     echo 'Comment=Restart batman' >> /home/$MY_USERNAME/Desktop/restart.desktop
     echo 'Exec=mate-terminal -e "sudo batman restart 2> /dev/null"' >> /home/$MY_USERNAME/Desktop/restart.desktop
-    echo 'Icon=/usr/share/freedombone/avatars/restart.png' >> /home/$MY_USERNAME/Desktop/restart.desktop
+    echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_restart_network.png" >> /home/$MY_USERNAME/Desktop/restart.desktop
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/restart.desktop
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/restart.desktop
 
@@ -311,8 +311,8 @@ function show_desktop_icons {
     echo 'Name=New Identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo 'Comment=Create a new identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-    echo 'Exec=mate-terminal -e freedombone-mesh-reset' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-    echo 'Icon=/usr/share/freedombone/avatars/newidentity.png' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo "Exec=mate-terminal -e ${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_new_identity.png" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
 
@@ -321,7 +321,7 @@ function show_desktop_icons {
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
     echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop
     echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
-    echo "Icon=/etc/patchwork/icon_patchwork.png" >> /home/$MY_USERNAME/Desktop/social.desktop
+    echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop