diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 95c810044..1cfbfec9c 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1012,8 +1012,7 @@ void MainWindow::updateScreenName()
 {
   ui->m_pLabelComputerName->setText(QString("This computer's name: %1 "
                                             R"((<a href="#" style="color: %2">change</a>))")
-                                        .arg(m_AppConfig.screenName())
-                                        .arg(kColorSecondary));
+                                        .arg(m_AppConfig.screenName(), kColorSecondary));
   m_ServerConfig.updateServerName();
 }
 
diff --git a/src/lib/gui/Logger.cpp b/src/lib/gui/Logger.cpp
index bc968a9b8..cd8b7f80c 100644
--- a/src/lib/gui/Logger.cpp
+++ b/src/lib/gui/Logger.cpp
@@ -42,7 +42,7 @@ QString printLine(FILE *out, const QString &type, const QString &message, const
 {
 
   auto datetime = QDateTime::currentDateTime().toString("yyyy-MM-ddTHH:mm:ss");
-  auto logLine = QString("[%1] %2: %3").arg(datetime).arg(type).arg(message);
+  auto logLine = QString("[%1] %2: %3").arg(datetime, type, message);
 
   QTextStream stream(&logLine);
   stream << Qt::endl;
diff --git a/src/lib/gui/VersionChecker.cpp b/src/lib/gui/VersionChecker.cpp
index c69d4a179..157490a2b 100644
--- a/src/lib/gui/VersionChecker.cpp
+++ b/src/lib/gui/VersionChecker.cpp
@@ -42,7 +42,7 @@ void VersionChecker::checkLatest() const
   const QString url = env_vars::versionUrl();
   qDebug("checking for updates at: %s", qPrintable(url));
   auto request = QNetworkRequest(url);
-  auto userAgent = QString("%1 %2 on %3").arg(kAppName).arg(kVersion).arg(QSysInfo::prettyProductName());
+  auto userAgent = QString("%1 %2 on %3").arg(kAppName, kVersion, QSysInfo::prettyProductName());
   request.setHeader(QNetworkRequest::UserAgentHeader, userAgent);
   request.setRawHeader("X-" DESKFLOW_APP_NAME "-Version", kVersion);
   request.setRawHeader("X-" DESKFLOW_APP_NAME "-Language", QLocale::system().name().toStdString().c_str());
diff --git a/src/lib/gui/tls/TlsFingerprint.cpp b/src/lib/gui/tls/TlsFingerprint.cpp
index 5a9d1109c..3f3c751b5 100644
--- a/src/lib/gui/tls/TlsFingerprint.cpp
+++ b/src/lib/gui/tls/TlsFingerprint.cpp
@@ -107,7 +107,7 @@ QString TlsFingerprint::readFirst() const
 QString TlsFingerprint::filePath() const
 {
   QString dir = TlsFingerprint::directoryPath();
-  return QString("%1/%2").arg(dir).arg(m_Filename);
+  return QString("%1/%2").arg(dir, m_Filename);
 }
 
 void TlsFingerprint::persistDirectory()
@@ -123,7 +123,7 @@ QString TlsFingerprint::directoryPath()
   CoreTool coreTool;
   QString profileDir = coreTool.getProfileDir();
 
-  return QString("%1/%2").arg(profileDir).arg(kDirName);
+  return QString("%1/%2").arg(profileDir, kDirName);
 }
 
 TlsFingerprint TlsFingerprint::local()