diff --git a/kmymoney/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney/dialogs/settings/ksettingsgeneraldecl.ui
index 3c5e1eeb4..1576154b8 100644
--- a/kmymoney/dialogs/settings/ksettingsgeneraldecl.ui
+++ b/kmymoney/dialogs/settings/ksettingsgeneraldecl.ui
@@ -1,655 +1,671 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KSettingsGeneralDecl</class>
  <widget class="QWidget" name="KSettingsGeneralDecl">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>600</width>
     <height>499</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>General Settings</string>
   </property>
   <layout class="QVBoxLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget2">
      <property name="currentIndex">
       <number>3</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string comment="@title global settings">Global</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Startup options</string>
+         </property>
+         <layout class="QVBoxLayout" name="startupVerticalLayout">
+          <item>
+           <widget class="QCheckBox" name="kcfg_ShowSplash">
+            <property name="text">
+             <string>Show splash screen</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>Autosave options</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_3">
             <item>
              <widget class="QCheckBox" name="kcfg_AutoSaveFile">
               <property name="text">
                <string>Autosave periodically</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QWidget" name="m_periodFrame" native="true">
               <property name="enabled">
                <bool>false</bool>
               </property>
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                <item>
                 <widget class="QSpinBox" name="kcfg_AutoSavePeriod">
                  <property name="maximum">
                   <number>60</number>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QLabel" name="textLabel3">
                  <property name="text">
                   <string>minutes</string>
                  </property>
                  <property name="wordWrap">
                   <bool>false</bool>
                  </property>
                 </widget>
                </item>
               </layout>
              </widget>
             </item>
             <item>
              <spacer name="spacer3">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeType">
                <enum>QSizePolicy::Expanding</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>308</width>
                 <height>22</height>
                </size>
               </property>
              </spacer>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QCheckBox" name="kcfg_AutoSaveOnClose">
             <property name="text">
              <string>Autosave when file is modified upon close</string>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_6">
             <item>
              <widget class="QSpinBox" name="kcfg_AutoBackupCopies">
               <property name="toolTip">
                <string>Setup number of backups to keep (local file only)</string>
               </property>
               <property name="whatsThis">
                <string>Whenever the current data is saved into a local file, KMyMoney keeps the selected number of previous states of the file.
 
 Set it to 0 to turn the feature off.</string>
               </property>
               <property name="frame">
                <bool>true</bool>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
               <property name="maximum">
                <number>20</number>
               </property>
               <property name="singleStep">
                <number>1</number>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLabel" name="label_2">
               <property name="text">
                <string>Number of backups to keep (0=off)</string>
               </property>
              </widget>
             </item>
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
                 <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Fiscal Year</string>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QLabel" name="textLabel1_2_2">
             <property name="text">
              <string>Your fiscal year starts on</string>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QSpinBox" name="kcfg_FiscalYearBeginDay">
             <property name="maximum">
              <number>366</number>
             </property>
            </widget>
           </item>
           <item>
            <widget class="KComboBox" name="kcfg_FiscalYearBegin">
             <item>
              <property name="text">
               <string>January</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>February</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>March</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>April</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>May</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>June</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>July</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string comment="@item the month August">August</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>September</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>October</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>November</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>December</string>
              </property>
             </item>
            </widget>
           </item>
           <item>
            <spacer name="spacer11">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeType">
              <enum>QSizePolicy::Expanding</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>282</width>
               <height>17</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox_7">
          <property name="title">
           <string>External programs</string>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_5">
           <item>
            <widget class="QLabel" name="label">
             <property name="text">
              <string>Calculator</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="KLineEdit" name="kcfg_ExternalCalculator"/>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="spacer3_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab2">
       <attribute name="title">
        <string>Views</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <item>
         <widget class="QGroupBox" name="kcfg_StartLastViewSelected">
          <property name="title">
           <string>Startup page options</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_8">
           <item>
            <widget class="QRadioButton" name="radioButton1">
             <property name="text">
              <string>Start with ho&amp;mepage</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="radioButton2">
             <property name="text">
              <string>Start with last selected view</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="kcfg_viewType">
          <property name="title">
           <string>Type of the KMyMoney view</string>
          </property>
          <layout class="QGridLayout">
           <item row="0" column="0">
            <widget class="QRadioButton" name="radioButton3">
             <property name="text">
              <string>List</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QRadioButton" name="radioButton4">
             <property name="text">
              <string>Tree</string>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <widget class="QRadioButton" name="radioButton5">
             <property name="text">
              <string>Tabbed</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_showTitleBar">
          <property name="text">
           <string>Show title bar on each page</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_syncLedgerInvestment">
          <property name="text">
           <string>Synchronize account selection of ledger and investment view</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="spacer7">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>319</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="TabPage">
       <attribute name="title">
        <string>Filter</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <item>
         <widget class="QGroupBox" name="groupBox_6">
          <property name="title">
           <string>Accounts / Categories</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <widget class="QCheckBox" name="kcfg_HideUnusedCategory">
             <property name="whatsThis">
              <string>This option hides all categories in the categories view that are not used in at least a single transaction. They are still shown in the category selection lists.</string>
             </property>
             <property name="text">
              <string>Do not show unused categories</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="kcfg_HideClosedAccounts">
             <property name="whatsThis">
              <string>This option hides all accounts that have been closed by the user in views and selection lists.
 
 You can use &lt;b&gt;View/Show all accounts&lt;/b&gt; to temporarily show hidden accounts in the views.</string>
             </property>
             <property name="text">
              <string>Do not show closed accounts</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="kcfg_ExpertMode">
             <property name="text">
              <string>Show equity accounts</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="kcfg_ShowCategoriesInAccountsView">
             <property name="whatsThis">
              <string>This option will display the categories in the accounts view also.</string>
             </property>
             <property name="text">
              <string>Show categories in the accounts list view</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="kcfg_HideZeroBalanceEquities">
             <property name="text">
              <string>Do not show zero balance equities</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox_5">
          <property name="title">
           <string>Schedules</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
            <widget class="QCheckBox" name="kcfg_HideFinishedSchedules">
             <property name="whatsThis">
              <string>This option hides all finished schedules in the schedules view.</string>
             </property>
             <property name="text">
              <string>Do not show finished schedules</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
           <string>Transactions</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <layout class="QHBoxLayout">
             <item>
              <widget class="QLabel" name="textLabel1_3">
               <property name="text">
                <string>Do not show transactions prior to</string>
               </property>
               <property name="wordWrap">
                <bool>false</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="kMyMoneyDateInput" name="m_startDateEdit"/>
             </item>
             <item>
              <widget class="QDateEdit" name="kcfg_StartDate"/>
             </item>
             <item>
              <spacer name="spacer10">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeType">
                <enum>QSizePolicy::Expanding</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>63</width>
                 <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QCheckBox" name="kcfg_HideReconciledTransactions">
             <property name="whatsThis">
              <string>This option hides all reconciled transactions in the ledger view.</string>
             </property>
             <property name="text">
              <string>Do not show reconciled transactions</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="spacer4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>30</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Support</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <item>
         <widget class="QGroupBox" name="groupBox_8">
          <property name="title">
           <string>Logging</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_10">
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_4">
             <item>
              <widget class="QLabel" name="label_3">
               <property name="text">
                <string>Log path</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLineEdit" name="kcfg_logPath">
               <property name="readOnly">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="choosePath">
               <property name="text">
                <string>...</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QLabel" name="label_4">
             <property name="text">
              <string>On choosing a log file path please keep in mind that log files may contain sensitive data (e.g. passwords in clear-text etc).</string>
             </property>
             <property name="wordWrap">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="kcfg_logImportedStatements">
             <property name="text">
              <string>Log imported statements</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="kcfg_logOfxTransactions">
             <property name="text">
              <string>Log OFX transactions</string>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>255</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
    <class>kMyMoneyDateInput</class>
    <extends>QFrame</extends>
    <header>kmymoneydateinput.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>kcfg_AutoSaveFile</sender>
    <signal>toggled(bool)</signal>
    <receiver>m_periodFrame</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>103</x>
      <y>274</y>
     </hint>
     <hint type="destinationlabel">
      <x>188</x>
      <y>263</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/kmymoney/kstartuplogo.cpp b/kmymoney/kstartuplogo.cpp
index 0077a54b9..e437b464a 100644
--- a/kmymoney/kstartuplogo.cpp
+++ b/kmymoney/kstartuplogo.cpp
@@ -1,73 +1,53 @@
 /***************************************************************************
                           kstartuplogo.cpp
                              -------------------
-    copyright            : (C) 2000 by Michael Edwardes
-    email                : mte@users.sourceforge.net
+    copyright            : (C) 2000 by Michael Edwardes <mte@users.sourceforge.net>
+                           (C) 2017 by Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
+
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "kstartuplogo.h"
 
+
 // ----------------------------------------------------------------------------
 // QT Includes
 
-#include <QPixmap>
 #include <QPainter>
-#include <QStandardPaths>
-#include <QSplashScreen>
+#include <QCoreApplication>
 
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kcolorscheme.h>
-#include <KAboutData>
+#include <KColorScheme>
 #include <KLocalizedString>
 
 // ----------------------------------------------------------------------------
 // Project Includes
 
-#include "kmymoneyglobalsettings.h"
 
-KStartupLogo::KStartupLogo() :
-    QObject(0),
-    m_splash(0)
+std::unique_ptr<QSplashScreen> createStartupLogo()
 {
-  // splash screen setting
-  if (!KMyMoneyGlobalSettings::showSplash())
-    return;
-
-  QString filename = QStandardPaths::locate(QStandardPaths::DataLocation, "pics/startlogo.png");
-  QString localeFilename = KLocalizedString::localizedFilePath(filename);
-  QPixmap logoOverlay(localeFilename);
-
+  KColorScheme scheme(QPalette::Active, KColorScheme::Selection);
+  QPixmap logoOverlay(KLocalizedString::localizedFilePath(
+                        QStandardPaths::locate(QStandardPaths::DataLocation,
+                                               QStringLiteral("pics/startlogo.png"))));
   QPixmap logoPixmap(logoOverlay.size());
-  logoPixmap.fill(KColorScheme(QPalette::Active, KColorScheme::Selection).background(KColorScheme::NormalBackground).color());
+  logoPixmap.fill(scheme.background(KColorScheme::NormalBackground).color());
   QPainter pixmapPainter(&logoPixmap);
   pixmapPainter.drawPixmap(0, 0, logoOverlay, 0, 0, logoOverlay.width(), logoOverlay.height());
-
-  if (!logoOverlay.isNull()) {
-    QSplashScreen* splash = new QSplashScreen(logoPixmap, Qt::WindowStaysOnTopHint);
-    splash->setFixedSize(logoPixmap.size());
-
-    splash->show();
-    splash->showMessage(i18n("Loading %1...", KAboutData::applicationData().version()),  //krazy:exclude=qmethods
-                        Qt::AlignLeft | Qt::AlignBottom,
-                        KColorScheme(QPalette::Active, KColorScheme::Selection)
-                        .foreground(KColorScheme::NormalText).color());
-    m_splash = splash;
-  }
+  std::unique_ptr<QSplashScreen> splash(new QSplashScreen(logoPixmap, Qt::WindowStaysOnTopHint));
+  splash->showMessage(i18n("Loading %1...", QCoreApplication::applicationVersion()),  //krazy:exclude=qmethods
+                      Qt::AlignLeft | Qt::AlignBottom,
+                      scheme.foreground(KColorScheme::NormalText).color());
+  splash->show();
+  return splash;
 }
-
-KStartupLogo::~KStartupLogo()
-{
-  delete m_splash;
-}
-
diff --git a/kmymoney/kstartuplogo.h b/kmymoney/kstartuplogo.h
index b1f8a47dd..fd4ca510b 100644
--- a/kmymoney/kstartuplogo.h
+++ b/kmymoney/kstartuplogo.h
@@ -1,41 +1,34 @@
 /***************************************************************************
                           kstartuplogo.h
                              -------------------
-    copyright            : (C) 2000 by Michael Edwardes
-    email                : mte@users.sourceforge.net
+    copyright            : (C) 2000 by Michael Edwardes <mte@users.sourceforge.net>
+                           (C) 2017 by Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
+
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef KSTARTUPLOGO_H
 #define KSTARTUPLOGO_H
 
+#include <memory>
+
 // ----------------------------------------------------------------------------
 // QT Includes
 
-#include <QWidget>
-#include <QPointer>
+#include <QSplashScreen>
 
 // ----------------------------------------------------------------------------
 // Project Includes
 
-// Simple class that just shows a picture
-class KStartupLogo : public QObject
-{
-  Q_OBJECT
-public:
-  KStartupLogo();
-  ~KStartupLogo();
-
-private:
-  QPointer<QWidget>  m_splash;
-};
+
+std::unique_ptr<QSplashScreen> createStartupLogo();
 
 #endif
diff --git a/kmymoney/main.cpp b/kmymoney/main.cpp
index 360b4b7e0..f62629926 100644
--- a/kmymoney/main.cpp
+++ b/kmymoney/main.cpp
@@ -1,350 +1,348 @@
 /***************************************************************************
                           main.cpp
                              -------------------
     copyright            : (C) 2001 by Michael Edwardes
     email                : mte@users.sourceforge.net
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 #include <config-kmymoney.h>
 #include <config-kmymoney-version.h>
 
-#include <memory>
-
 // ----------------------------------------------------------------------------
 // QT Includes
 
 #include <QWidget>
 #include <QDateTime>
 #include <QStringList>
 #include <QEventLoop>
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QResource>
 #ifdef KMM_DBUS
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #include <QDBusInterface>
 #endif
 // ----------------------------------------------------------------------------
 // KDE Includes
 
 #include <KAboutData>
 #include <KLocalizedString>
 #include <ktip.h>
 #include <KMessageBox>
 #include <Kdelibs4ConfigMigrator>
 
 // ----------------------------------------------------------------------------
 // Project Includes
 
 #include "mymoney/mymoneyfile.h"
 #include "kmymoney.h"
 #include "kstartuplogo.h"
 #include "kmymoneyutils.h"
 #include "kmymoneyglobalsettings.h"
 
 
 bool timersOn = false;
 
 KMyMoneyApp* kmymoney;
 
-static int runKMyMoney(QApplication *a, std::unique_ptr<KStartupLogo> splash, const QUrl & file, bool noFile);
+static int runKMyMoney(QApplication *a, std::unique_ptr<QSplashScreen> splash, const QUrl & file, bool noFile);
 
 int main(int argc, char *argv[])
 {
   KLocalizedString::setApplicationDomain("kmymoney");
 
   {
     // Copy KDE 4 config files to the KF5 location
     Kdelibs4ConfigMigrator migrator(QStringLiteral("kmymoney"));
     migrator.setConfigFiles(QStringList{"kmymoneyrc"});
     migrator.setUiFiles(QStringList{"kmymoneyui.rc"});
     migrator.migrate();
   }
 
   /**
    * Create application first
    */
   QApplication app(argc, argv);
 
   /**
    * construct about data
    */
   QStringList features;
 #ifdef Gpgmepp_FOUND
   features << i18n("GPG encryption");
 #endif
 #ifdef KMM_ADDRESSBOOK_FOUND
   features << i18n("Addressbook integration");
 #endif
 #ifdef KF5Holidays_FOUND
   features << i18n("Holiday regions integration");
 #endif
   QString featuresDescription;
   if (!features.empty())
       featuresDescription = i18n("Compiled with the following optional features:\n%1", features.join(QLatin1Char('\n')));
   KAboutData aboutData(QStringLiteral("kmymoney"), i18n("KMyMoney"), QStringLiteral(VERSION),
                        i18n("\nKMyMoney, the Personal Finance Manager by KDE.\n\nPlease consider contributing to this project with code and/or suggestions."), KAboutLicense::GPL,
                        i18n("(c) 2000-2017 The KMyMoney development team"),
                        featuresDescription,
                        QStringLiteral("http://kmymoney.org/"));
 
   //Temporarily, the product name to report bugs in BKO is different than the application name
   aboutData.setProductName("kmymoney");
 
   aboutData.addAuthor(i18n("Michael Edwardes."), i18n("Initial idea, much initial source code, Project admin"), "mte@users.sourceforge.net");
   aboutData.addAuthor(i18n("Thomas Baumgart"), i18n("Core engine, Release Manager, Project admin"), "ipwizard@users.sourceforge.net");
   aboutData.addAuthor(i18n("Alvaro Soliverez"), i18n("Forecast, Reports"), "asoliverez@gmail.com");
   aboutData.addAuthor(i18n("Cristian Oneț"), i18n("Developer"), "onet.cristian@gmail.com");
   aboutData.addAuthor(i18n("Christian Dávid"), i18n("Developer"), "christian-david@web.de");
   aboutData.addAuthor(i18n("Ace Jones"), i18n("Reporting logic, OFX Import"), "acejones@users.sourceforge.net");
   aboutData.addAuthor(i18n("Tony Bloomfield"), i18n("Database backend, maintainer stable branch"), "tonybloom@users.sourceforge.net");
   aboutData.addAuthor(i18n("Felix Rodriguez"), i18n("Project Admin"), "frodriguez@users.sourceforge.net");
   aboutData.addAuthor(i18n("John C"), i18n("Developer"), "tacoturtle@users.sourceforge.net");
   aboutData.addAuthor(i18n("Fernando Vilas"), i18n("Database backend"), "fvilas@iname.com");
 
   aboutData.addCredit(i18n("Kevin Tambascio"), i18n("Initial investment support"), "ktambascio@users.sourceforge.net");
   aboutData.addCredit(i18n("Javier Campos Morales"), i18n("Developer & Artist"), "javi_c@users.sourceforge.net");
   aboutData.addCredit(i18n("Robert Wadley"), i18n("Icons & splash screen"), "rob@robntina.fastmail.us");
   aboutData.addCredit(i18n("Laurent Montel"), i18n("Patches and port to kde4"), "montel@kde.org");
   aboutData.addCredit(i18n("Wolfgang Rohdewald"), i18n("Patches"), "woro@users.sourceforge.net");
   aboutData.addCredit(i18n("Marko Käning"), i18n("Patches, packaging and KF5-CI for OS X"), "mk-lists@email.de");
   aboutData.addCredit(i18n("Allan Anderson ✝"), i18n("CSV import/export"), "");
   aboutData.addCredit(i18n("Jack Ostroff"), i18n("Documentation and user support"), "ostroffjh@users.sourceforge.net");
   aboutData.setOrganizationDomain("kde.org");
 
   /**
    * register about data
    */
   KAboutData::setApplicationData(aboutData);
 
   /**
    * take component name and org. name from KAboutData
    */
   app.setApplicationName(aboutData.componentName());
   app.setApplicationDisplayName(aboutData.displayName());
   app.setOrganizationDomain(aboutData.organizationDomain());
   app.setApplicationVersion(aboutData.version());
 
   /**
    * enable high dpi icons
    */
   app.setAttribute(Qt::AA_UseHighDpiPixmaps);
 
   /**
    * Create command line parser and feed it with known options
    */
   QCommandLineParser parser;
   aboutData.setupCommandLine(&parser);
   parser.setApplicationDescription(aboutData.shortDescription());
   parser.addHelpOption();
   parser.addVersionOption();
 
   // language
   const QCommandLineOption langOption(QStringLiteral("lang"), i18n("language to be used"));
   parser.addOption(langOption);
 
   // no file
   const QCommandLineOption noFileOption(QStringLiteral("n"), i18n("do not open last used file"));
   parser.addOption(noFileOption);
 
   // timers
   const QCommandLineOption timersOption(QStringLiteral("timers"), i18n("enable performance timers"));
   parser.addOption(timersOption);
 
   // no catch
   const QCommandLineOption noCatchOption(QStringLiteral("nocatch"), i18n("do not globally catch uncaught exceptions"));
   parser.addOption(noCatchOption);
 
 #ifdef KMM_DEBUG
   // The following options are only available when compiled in debug mode
   // trace
   const QCommandLineOption traceOption(QStringLiteral("trace"), i18n("turn on program traces"));
   parser.addOption(traceOption);
 
   // dump actions
   const QCommandLineOption dumpActionsOption(QStringLiteral("dump-actions"), i18n("dump the names of all defined QAction objects to stdout and quit"));
   parser.addOption(dumpActionsOption);
 #endif
 
   // INSERT YOUR COMMANDLINE OPTIONS HERE
   // url to open
   parser.addPositionalArgument(QStringLiteral("url"), i18n("file to open"));
 
   /**
    * do the command line parsing
    */
   parser.process(app);
 
   /**
    * handle standard options
    */
   aboutData.processCommandLine(&parser);
 
   // create the singletons before we start memory checking
   // to avoid false error reports
   MyMoneyFile::instance();
 
   KMyMoneyUtils::checkConstants();
 
   // show startup logo
-  std::unique_ptr<KStartupLogo> splash = std::unique_ptr<KStartupLogo>(new KStartupLogo());
+  std::unique_ptr<QSplashScreen> splash(KMyMoneyGlobalSettings::showSplash() ? createStartupLogo() : nullptr);
   app.processEvents();
 
   // setup the MyMoneyMoney locale settings according to the KDE settings
   MyMoneyMoney::setThousandSeparator(QLocale().groupSeparator());
   MyMoneyMoney::setDecimalSeparator(QLocale().decimalPoint());
   // TODO: port to kf5
   //MyMoneyMoney::setNegativeMonetarySignPosition(static_cast<MyMoneyMoney::signPosition>(KLocale::global()->negativeMonetarySignPosition()));
   //MyMoneyMoney::setPositiveMonetarySignPosition(static_cast<MyMoneyMoney::signPosition>(KLocale::global()->positiveMonetarySignPosition()));
   //MyMoneyMoney::setNegativePrefixCurrencySymbol(KLocale::global()->negativePrefixCurrencySymbol());
   //MyMoneyMoney::setPositivePrefixCurrencySymbol(KLocale::global()->positivePrefixCurrencySymbol());
 
   QString language = parser.value(langOption);
   if (!language.isEmpty()) {
     //if (!KLocale::global()->setLanguage(QStringList() << language)) {
     //  qWarning("Unable to select language '%s'. This has one of two reasons:\n\ta) the standard KDE message catalog is not installed\n\tb) the KMyMoney message catalog is not installed", qPrintable(language));
     //}
   }
 
 #ifdef KMM_DEBUG
   if (parser.isSet(traceOption))
     MyMoneyTracer::on();
   timersOn = parser.isSet(timersOption);
 #endif
 
   kmymoney = new KMyMoneyApp();
 
 #ifdef KMM_DEBUG
   if (parser.isSet(dumpActionsOption)) {
     kmymoney->dumpActions();
 
     // Before we delete the application, we make sure that we destroy all
     // widgets by running the event loop for some time to catch all those
     // widgets that are requested to be destroyed using the deleteLater() method.
     //QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput, 10);
     QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 10);
 
     delete kmymoney;
     exit(0);
   }
 #endif
 
   const QStringList urls = parser.positionalArguments();
   const QUrl url = urls.isEmpty() ? QUrl() : QUrl::fromUserInput(urls.front());
   int rc = 0;
   if (parser.isSet(noCatchOption)) {
     qDebug("Running w/o global try/catch block");
     rc = runKMyMoney(&app, std::move(splash), url, parser.isSet(noFileOption));
   } else {
     try {
       rc = runKMyMoney(&app, std::move(splash), url, parser.isSet(noFileOption));
     } catch (const MyMoneyException &e) {
       KMessageBox::detailedError(0, i18n("Uncaught error. Please report the details to the developers"),
                                  i18n("%1 in file %2 line %3", e.what(), e.file(), e.line()));
       throw e;
     }
   }
 
   return rc;
 }
 
-int runKMyMoney(QApplication *a, std::unique_ptr<KStartupLogo> splash, const QUrl & file, bool noFile)
+int runKMyMoney(QApplication *a, std::unique_ptr<QSplashScreen> splash, const QUrl & file, bool noFile)
 {
 #ifdef KMM_DBUS
   if (QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.kmymoney")) {
     const QList<QString> instances = kmymoney->instanceList();
     if (instances.count() > 0) {
 
       // If the user launches a second copy of the app and includes a file to
       // open, they are probably attempting a "WebConnect" session.  In this case,
       // we'll check to make sure it's an importable file that's passed in, and if so, we'll
       // notify the primary instance of the file and kill ourselves.
 
       if (file.isValid()) {
         if (kmymoney->isImportableFile(file)) {
           // if there are multiple instances, we'll send this to the first one
           QString primary = instances[0];
 
           // send a message to the primary client to import this file
           QDBusInterface remoteApp(primary, "/KMymoney", "org.kde.kmymoney");
           // TODO: port ot kf5
           //remoteApp.call("webConnect", file.path(), KStartupInfo::startupId());
 
           // Before we delete the application, we make sure that we destroy all
           // widgets by running the event loop for some time to catch all those
           // widgets that are requested to be destroyed using the deleteLater() method.
           QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 10);
 
           delete kmymoney;
           return 0;
         }
       }
 
       if (KMessageBox::questionYesNo(0, i18n("Another instance of KMyMoney is already running. Do you want to quit?")) == KMessageBox::Yes) {
         delete kmymoney;
         return 1;
       }
     }
   } else {
     qDebug("D-Bus registration failed. Some functions are not available.");
   }
 #else
   qDebug("D-Bus disabled. Some functions are not available.");
 #endif
   kmymoney->show();
   kmymoney->centralWidget()->setEnabled(false);
 
   splash.reset();
 
   // force complete paint of widgets
   qApp->processEvents();
 
   QString importfile;
   QUrl url;
   // make sure, we take the file provided on the command
   // line before we go and open the last one used
   if (file.isValid()) {
     // Check to see if this is an importable file, as opposed to a loadable
     // file.  If it is importable, what we really want to do is load the
     // last used file anyway and then immediately import this file.  This
     // implements a "web connect" session where there is not already an
     // instance of the program running.
 
     if (kmymoney->isImportableFile(file)) {
       importfile = file.path();
       url = QUrl::fromUserInput(kmymoney->readLastUsedFile());
     }
 
   } else {
     url = QUrl::fromUserInput(kmymoney->readLastUsedFile());
   }
 
   KTipDialog::showTip(kmymoney, "", false);
   if (url.isValid() && !noFile) {
     kmymoney->slotFileOpenRecent(url);
   } else if (KMyMoneyGlobalSettings::firstTimeRun()) {
     kmymoney->slotFileNew();
   }
   KMyMoneyGlobalSettings::setFirstTimeRun(false);
 
   // TODO: port to kf5
   //if (!importfile.isEmpty())
   //  kmymoney->webConnect(importfile, KStartupInfo::startupId());
 
   kmymoney->updateCaption();
   kmymoney->centralWidget()->setEnabled(true);
 
   const int rc = a->exec();
   return rc;
 }