diff --git a/.travis.yml b/.travis.yml
index ecd8bad..3186481 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,11 @@ before_install:
   - make -j7
   - sudo make install
   - cd -
-  - sudo wget -c "https://github.com/probonopd/AppImageKit/releases/download/6/AppImageAssistant_6-x86_64.AppImage" -O /usr/local/bin/AppImageAssistant
-  - sudo chmod a+x /usr/local/bin/AppImageAssistant
+  - ID=$(wget -q https://api.travis-ci.org/repos/probonopd/appimagetool/builds -O - | head -n 1 | sed -e 's|}|\n|g' | grep '"result":0' | head -n 1 | sed -e 's|,|\n|g' | grep '"id"' | cut -d ":" -f 2)
+  - URL=$(wget -q "https://archive.travis-ci.org/jobs/$((ID+1))/log.txt" -O - | grep "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g')
+  - if [ -z "$URL" ] ; then URL=$(wget -q "https://archive.travis-ci.org/jobs/$((ID+2))/log.txt" -O - | grep "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g') ; fi
+  - sudo wget -c "$RUL" -O /usr/local/bin/appimagetool
+  - sudo chmod a+x /usr/local/bin/appimagetool
   
 install:
   - sudo apt-get -y install qt57base binutils
@@ -26,7 +29,7 @@ script:
   - make -j7
   - mkdir -p linuxdeployqt.AppDir/usr/bin/
   - cp /usr/local/bin/patchelf linuxdeployqt.AppDir/usr/bin/
-  - cp /usr/local/bin/AppImageAssistant linuxdeployqt.AppDir/usr/bin/
+  - cp /usr/local/bin/appimagetool linuxdeployqt.AppDir/usr/bin/
   - # cp $(which qmlimportscanner) linuxdeployqt.AppDir/ # use the one from the Qt to be bundled instead
   - cp ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt
   - ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt -verbose=3 -appimage
diff --git a/shared/shared.cpp b/shared/shared.cpp
index 83732e6..01041fa 100644
--- a/shared/shared.cpp
+++ b/shared/shared.cpp
@@ -1138,6 +1138,8 @@ bool checkAppImagePrerequisites(const QString &appDirPath)
         LogError() << "Icon file missing, creating a default one (you will probably want to edit it)";
         QFile file2(appDirPath + "/default.png");
         file2.open(QIODevice::WriteOnly | QIODevice::Text);
+        QTextStream out2(&file2);
+        out2 << "";
         QTextStream out(&file2);
         file2.close();
     }
@@ -1146,22 +1148,7 @@ bool checkAppImagePrerequisites(const QString &appDirPath)
 
 int createAppImage(const QString &appDirPath)
 {
-    QString appImagePath = appDirPath + ".AppImage";
-
-    QFile appImage(appImagePath);
-    LogDebug() << "appImageName:" << appImagePath;
-
-    if (appImage.exists() && alwaysOwerwriteEnabled){
-        appImage.remove();
-    }
-
-    if (appImage.exists()) {
-        LogError() << "AppImage already exists, skipping .AppImage creation for" << appImage.fileName();
-        LogError() << "use -always-overwrite to overwrite";
-    } else {
-        LogNormal() << "Creating AppImage for" << appDirPath;
-    }
-    QString appImageCommand = "AppImageAssistant '" + appDirPath +"' '" + appImagePath + "'";
+    QString appImageCommand = "appimagetool '" + appDirPath; // +"' '" + appImagePath + "'";
     int ret = system(appImageCommand.toUtf8().constData());
     return WEXITSTATUS(ret);
 }