diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index 60275ddad..7be0b6d2a 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -18,7 +18,7 @@
 
 #include "base/String.h"
 #include "common/Settings.h"
-#include "gui/Constants.h"
+#include "common/UrlConstants.h"
 #include "gui/Diagnostic.h"
 #include "gui/Logger.h"
 #include "gui/Messages.h"
diff --git a/src/apps/deskflow-gui/main.cpp b/src/apps/deskflow-gui/main.cpp
index bf1ebea86..a8a4e3e8a 100644
--- a/src/apps/deskflow-gui/main.cpp
+++ b/src/apps/deskflow-gui/main.cpp
@@ -9,7 +9,7 @@
 #include "MainWindow.h"
 #include "StyleUtils.h"
 #include "common/Constants.h"
-#include "gui/Constants.h"
+#include "common/UrlConstants.h"
 #include "gui/Diagnostic.h"
 #include "gui/DotEnv.h"
 #include "gui/Logger.h"
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index 41530e1df..4df712eef 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(common STATIC
   Settings.cpp
   QSettingsProxy.cpp
   QSettingsProxy.h
+  UrlConstants.h
   ${CMAKE_CURRENT_BINARY_DIR}/Constants.h
 )
 
diff --git a/src/lib/gui/Constants.h b/src/lib/common/UrlConstants.h
similarity index 92%
rename from src/lib/gui/Constants.h
rename to src/lib/common/UrlConstants.h
index 38cfa90ab..550501272 100644
--- a/src/lib/gui/Constants.h
+++ b/src/lib/common/UrlConstants.h
@@ -16,7 +16,7 @@ namespace deskflow::gui {
 const auto kOrgDomain = QStringLiteral("deskflow.org");
 
 const auto kUrlSourceQuery = QStringLiteral("source=gui");
-const auto kUrlApp = QStringLiteral("https://deskflow.org");
+const auto kUrlApp = QStringLiteral("https://%1").arg(kOrgDomain);
 const auto kUrlHelp = QStringLiteral("%1/help?%2").arg(kUrlApp, kUrlSourceQuery);
 const auto kUrlDownload = QStringLiteral("%1/download?%2").arg(kUrlApp, kUrlSourceQuery);
 
diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index 7f7a0a42a..19a51b26a 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/src/lib/gui/CMakeLists.txt
@@ -15,7 +15,6 @@ endif()
 
 add_library(${target} STATIC
   ${platform_sources}
-  Constants.h
   Diagnostic.cpp
   Diagnostic.h
   DotEnv.cpp
diff --git a/src/lib/gui/Messages.cpp b/src/lib/gui/Messages.cpp
index 31c756dfc..4024954bf 100644
--- a/src/lib/gui/Messages.cpp
+++ b/src/lib/gui/Messages.cpp
@@ -6,11 +6,18 @@
 
 #include "Messages.h"
 
+<<<<<<< HEAD
 #include "Constants.h"
 #include "EnvVars.h"
 #include "Logger.h"
 #include "Styles.h"
 #include "common/Constants.h"
+=======
+#include "Logger.h"
+#include "Styles.h"
+#include "common/Settings.h"
+#include "common/UrlConstants.h"
+>>>>>>> 25c5bfa2b (refactor: move lib/gui/Constants.h => lib/common/UrlConstants.h)
 
 #include <QAction>
 #include <QDateTime>