diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index e31447ec..9092fdb2 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -593,6 +593,9 @@ EOF
     echo 'cd /etc/patchwork' >> $rootdir/usr/bin/start_patchwork
     echo 'npm start' >> $rootdir/usr/bin/start_patchwork
     chmod +x $rootdir/usr/bin/start_patchwork
+
+    # Copy icon to an accesible location
+    cp /root/$PROJECT_NAME/img/icon_patchwork.png /etc/patchwork/icon_patchwork.png
 }
 
 initialise_mesh() {
@@ -856,15 +859,21 @@ if [ \$no_of_users -gt 0 ]; then
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
 
-    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
-    echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
-    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=/root/freedombone/img/icon_patchwork.png" >> /home/$MY_USERNAME/Desktop/social.desktop
-    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/social.desktop
-    chmod +x /home/$MY_USERNAME/Desktop/social.desktop
-    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
+    if [ ! -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
+        echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
+        echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
+        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 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/social.desktop
+        chmod +x /home/$MY_USERNAME/Desktop/social.desktop
+        chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
+    else
+        if grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then
+            sed -i 's|Name=.*|Name=Social|g' /home/$MY_USERNAME/Desktop/social.desktop
+        fi
+    fi
 
     if [ -f /tmp/.ipfs-users ]; then
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop