diff --git a/src/swiftdata/main.cpp b/src/swiftdata/main.cpp
index 50d0feaed..9d6eadd09 100644
--- a/src/swiftdata/main.cpp
+++ b/src/swiftdata/main.cpp
@@ -27,6 +27,9 @@ int main(int argc, char *argv[])
     QApplication qa(argc, argv);
     Q_UNUSED(qa);
     CGuiApplication a("swift mapping tool", CGuiApplication::MappingTool, CIcons::swiftDatabase48());
+    a.setSignalStartupAutomatically(false); // application will signal startup on its own
+    // Todo: Replace texture with a higher quality one
+    a.splashScreen(":/own/icons/own/swift/swift128Database.png");
     a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forMappingTool());
     if (!a.start()) { return EXIT_FAILURE; }
     CSwiftData w;
diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index 498b5c6f5..770df4fd4 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -105,6 +105,8 @@ void CSwiftData::init()
         t += s.getDbHomePageUrl().toQString(true);
         this->setWindowTitle(t);
     }
+
+    sGui->startUpCompleted(true);
 }
 
 void CSwiftData::initLogDisplay()