diff --git a/client/android/release_2.keystore b/client/android/release_2.keystore
new file mode 100755
index 000000000..6f698c76c
Binary files /dev/null and b/client/android/release_2.keystore differ
diff --git a/client/android/res.zip b/client/android/res.zip
new file mode 100644
index 000000000..3e62033d2
Binary files /dev/null and b/client/android/res.zip differ
diff --git a/deploy/data/linux/AmneziaVPN.desktop b/deploy/data/linux/AmneziaVPN.desktop
index d89252c04..05ca774b5 100755
--- a/deploy/data/linux/AmneziaVPN.desktop
+++ b/deploy/data/linux/AmneziaVPN.desktop
@@ -1,10 +1,10 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Type=Application
-Name=AmneziaVPN client
-Version=2.0.10
+Name=AmneziaVPN
+Version=4.0.7
 Comment=Client of your self-hosted VPN
 Exec=AmneziaVPN
-Icon=/usr/share/pixmaps/AmneziaVPN_Logo.png
+Icon=/usr/share/pixmaps/AmneziaVPN.png
 Categories=Network;Qt;Security;
 Terminal=false
diff --git a/deploy/data/linux/AmneziaVPN.png b/deploy/data/linux/AmneziaVPN.png
new file mode 100644
index 000000000..0f104da2a
Binary files /dev/null and b/deploy/data/linux/AmneziaVPN.png differ
diff --git a/deploy/data/linux/client/share/applications/AmneziaVPN.desktop b/deploy/data/linux/client/share/applications/AmneziaVPN.desktop
deleted file mode 100755
index d89252c04..000000000
--- a/deploy/data/linux/client/share/applications/AmneziaVPN.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Name=AmneziaVPN client
-Version=2.0.10
-Comment=Client of your self-hosted VPN
-Exec=AmneziaVPN
-Icon=/usr/share/pixmaps/AmneziaVPN_Logo.png
-Categories=Network;Qt;Security;
-Terminal=false
diff --git a/deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png b/deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png
deleted file mode 100755
index 0e281afb9..000000000
Binary files a/deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png and /dev/null differ
diff --git a/deploy/data/linux/post_install.sh b/deploy/data/linux/post_install.sh
index f69de3d57..b3345bac8 100755
--- a/deploy/data/linux/post_install.sh
+++ b/deploy/data/linux/post_install.sh
@@ -37,6 +37,7 @@ sudo ln -s $APP_PATH/client/$APP_NAME.sh /usr/local/bin/$APP_NAME >> $LOG_FILE
 
 echo "user desktop creation loop started" >> $LOG_FILE
 sudo cp $APP_PATH/$APP_NAME.desktop /usr/share/applications/ >> $LOG_FILE
+sudo cp $APP_PATH/$APP_NAME.png /usr/share/pixmaps/ >> $LOG_FILE
 sudo chmod 555 /usr/share/applications/$APP_NAME.desktop >> $LOG_FILE
 
 echo "user desktop creation loop ended" >> $LOG_FILE
diff --git a/deploy/data/linux/post_uninstall.sh b/deploy/data/linux/post_uninstall.sh
index 029bb7cf6..5849a90e4 100755
--- a/deploy/data/linux/post_uninstall.sh
+++ b/deploy/data/linux/post_uninstall.sh
@@ -54,6 +54,11 @@ if test -f /usr/share/applications/$APP_NAME.desktop; then
 
 fi
 
+if test -f /usr/share/pixmaps/$APP_NAME.png; then
+	sudo rm -f /usr/share/pixmaps/$APP_NAME.png >> $LOG_FILE
+
+fi
+
 date >> $LOG_FILE
 echo "Service after uninstall status:" >> $LOG_FILE
 sudo systemctl status $APP_NAME >> $LOG_FILE
diff --git a/deploy/installer/config/linux.xml.in b/deploy/installer/config/linux.xml.in
index 150c9cc5b..dd91693b5 100644
--- a/deploy/installer/config/linux.xml.in
+++ b/deploy/installer/config/linux.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>AmneziaVPN</Name>
-    <Version>1.6.0.0</Version>
+    <Version>4.0.7.1</Version>
     <Title>AmneziaVPN</Title>
     <Publisher>AmneziaVPN</Publisher>
     <StartMenuDir>AmneziaVPN</StartMenuDir>