diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp
index a3347dff5..e34ad3177 100644
--- a/Linphone/core/App.cpp
+++ b/Linphone/core/App.cpp
@@ -182,6 +182,7 @@ void App::init() {
 						        exit(-1);
 					        }
 					        mMainWindow = qobject_cast<QQuickWindow *>(obj);
+					        QMetaObject::invokeMethod(obj, "initStackViewItem");
 					        Q_ASSERT(mMainWindow);
 				        }
 			        },
diff --git a/Linphone/data/image/splashscreen-logo.svg b/Linphone/data/image/splashscreen-logo.svg
new file mode 100644
index 000000000..1063c01c7
--- /dev/null
+++ b/Linphone/data/image/splashscreen-logo.svg
@@ -0,0 +1,5 @@
+<svg width="395" height="395" viewBox="0 0 395 395" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="197.5" cy="197.5" r="197.5" fill="#FE5E00"/>
+<path d="M95.5011 121.572C95.5011 121.572 70.5342 156.009 74.4084 171.506C74.2745 170.906 90.766 153.426 90.766 153.426C91.627 158.161 131.66 169.784 131.66 169.784C136.975 173.172 138.807 175.605 139.839 180.976V201.638C153.668 210.243 166.371 213.098 197.091 214.983C229.731 213.591 243.212 210.701 255.203 201.638C255.203 201.638 253.912 185.711 255.203 180.115C256.495 174.519 259.361 171.318 263.813 169.784C280.422 165.984 288.621 161.827 304.276 153.857L321.495 171.506C318.879 152.101 314.382 141.36 300.833 122.433C290.076 110.141 283.179 103.694 268.978 93.1612C253.54 84.0396 244.974 80.5564 229.806 76.3731C203.478 70.9824 188.965 70.9989 163.515 76.3731C147.92 81.0747 140.148 84.6223 128.647 93.1612C128.647 93.1612 85.17 68.1943 79.5739 72.4989C73.9779 76.8035 95.5011 121.572 95.5011 121.572Z" fill="#FAFEFF"/>
+<path d="M125.226 254.947C105.228 246.193 94.3931 239.58 75.7227 224.815C80.2119 243.4 84.3973 253.185 94.6631 269.583C105.602 284.386 112.323 290.992 125.226 300.146C139.18 309.723 147.548 313.909 163.537 319.086C177.901 322.539 185.911 323.639 200.127 323.821C214.622 323.095 222.144 321.516 234.564 318.656C248.263 313.197 255.242 309.755 266.849 303.159C286.095 314.024 309.895 326.404 313.339 321.239C316.783 316.073 297.842 274.318 297.842 274.318C310.474 256.225 315.642 244.041 320.657 223.523C303.364 237.088 292.13 245.004 270.723 254.947C244.243 265.392 228.82 268.746 200.127 269.583C166.7 269 150.386 265.692 125.226 254.947Z" fill="#FAFEFF"/>
+</svg>
diff --git a/Linphone/tool/LinphoneEnums.cpp b/Linphone/tool/LinphoneEnums.cpp
index c5dc62423..fb6652a68 100644
--- a/Linphone/tool/LinphoneEnums.cpp
+++ b/Linphone/tool/LinphoneEnums.cpp
@@ -113,6 +113,8 @@ QString LinphoneEnums::toString(const LinphoneEnums::CallStatus &data) {
 			return "AcceptedElsewhere";
 		case LinphoneEnums::CallStatus::DeclinedElsewhere:
 			return "DeclinedElsewhere";
+		default:
+			return QString();
 	}
 }
 
@@ -129,6 +131,8 @@ QString LinphoneEnums::toString(const LinphoneEnums::CallDir &data) {
 			return "Incoming";
 		case LinphoneEnums::CallDir::Outgoing:
 			return "Outgoing";
+		default:
+			return QString();
 	}
 }
 
@@ -268,6 +272,8 @@ QString LinphoneEnums::toString(const LinphoneEnums::TransportType &type) {
 			return "TLS";
 		case TransportType::Dtls:
 			return "DTLS";
+		default:
+			return QString();
 	}
 }
 void LinphoneEnums::fromString(const QString &transportType, LinphoneEnums::TransportType *transport) {
diff --git a/Linphone/view/App/Main.qml b/Linphone/view/App/Main.qml
index 9b8c13091..51be45d9b 100644
--- a/Linphone/view/App/Main.qml
+++ b/Linphone/view/App/Main.qml
@@ -32,17 +32,29 @@ AppWindow {
 		mainWindowStackView.replace(mainPage, StackView.Immediate)
 		mainWindowStackView.currentItem.transferCallSucceed()
 	}
+	function initStackViewItem() {
+		if (accountProxy.haveAccount) mainWindowStackView.replace(mainPage, StackView.Immediate)
+		else if (SettingsCpp.getFirstLaunch()) mainWindowStackView.replace(welcomePage, StackView.Immediate)
+		else mainWindowStackView.replace(loginPage, StackView.Immediate)
+	}
 
 	AccountProxy {
-		// TODO : change this so it does not display the main page for one second
-		// when we fail trying to connect the first account (account is added and
-		// removed shortly after)
 		id: accountProxy
 	}
 	StackView {
 		id: mainWindowStackView
 		anchors.fill: parent
-		initialItem: accountProxy.haveAccount ? mainPage : SettingsCpp.getFirstLaunch() ? welcomePage : loginPage
+		initialItem: splashScreen
+	}
+	Component {
+		id: splashScreen
+		Rectangle {
+			color: DefaultStyle.grey_0
+			Image {
+				anchors.centerIn: parent
+				source: AppIcons.splashscreenLogo
+			}
+		}
 	}
 	Component {
 		id: welcomePage
diff --git a/Linphone/view/Style/AppIcons.qml b/Linphone/view/Style/AppIcons.qml
index 059c241c5..88a57bbf4 100644
--- a/Linphone/view/Style/AppIcons.qml
+++ b/Linphone/view/Style/AppIcons.qml
@@ -7,6 +7,7 @@ QtObject {
 	property string lock: "image://internal/lock.svg"
 	property string lockSimple: "image://internal/lock-simple.svg"
 	property string welcomeOpenSource: "image://internal/open_source.svg"
+	property string splashscreenLogo: "image://internal/splashscreen-logo.svg"
 	property string eyeHide: "image://internal/eye.svg"
 	property string eyeShow: "image://internal/eye-slash.svg"
 	property string downArrow: "image://internal/caret-down.svg"