diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp
index 916f47867d..6d001d4075 100644
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "ui/text/text_utilities.h"
 #include "base/platform/base_platform_info.h"
+#include "core/file_utilities.h"
 #include "core/click_handler_types.h"
 #include "core/update_checker.h"
 #include "core/application.h"
@@ -116,7 +117,7 @@ void AboutBox::showVersionHistory() {
 				"version of Telegram Desktop was copied to the clipboard."),
 			Ui::LayerOption::CloseOther);
 	} else {
-		UrlClickHandler::Open(Core::App().changelogLink());
+		File::OpenUrl(Core::App().changelogLink());
 	}
 }
 
diff --git a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
index 866f98ec27..8c932df6af 100644
--- a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/about_sponsored_box.h"
 
+#include "core/file_utilities.h"
 #include "lang/lang_keys.h"
 #include "ui/layers/generic_box.h"
 #include "ui/widgets/buttons.h"
@@ -14,8 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
 
-#include <QtGui/QDesktopServices>
-
 namespace Ui {
 namespace {
 
@@ -50,7 +49,7 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 				(rowSize.height() - buttonSize.height()) / 2);
 		}, row->lifetime());
 		button->addClickHandler([=] {
-			QDesktopServices::openUrl({ kUrl.utf8() });
+			File::OpenUrl(kUrl.utf8());
 		});
 	};
 
diff --git a/Telegram/SourceFiles/history/history_location_manager.cpp b/Telegram/SourceFiles/history/history_location_manager.cpp
index 17434e8b6e..7810460bdf 100644
--- a/Telegram/SourceFiles/history/history_location_manager.cpp
+++ b/Telegram/SourceFiles/history/history_location_manager.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_location_manager.h"
 
 #include "mainwidget.h"
-#include "core/click_handler_types.h"
+#include "core/file_utilities.h"
 #include "lang/lang_keys.h"
 #include "ui/image/image.h"
 #include "data/data_file_origin.h"
@@ -24,7 +24,7 @@ QString LocationClickHandler::copyToClipboardContextItemText() const {
 
 void LocationClickHandler::onClick(ClickContext context) const {
 	if (!psLaunchMaps(_point)) {
-		UrlClickHandler::Open(_text);
+		File::OpenUrl(_text);
 	}
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index adf4594f42..e239660441 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/username_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "boxes/about_box.h"
+#include "ui/basic_click_handlers.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/padding_wrap.h"
@@ -53,7 +54,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
-#include "core/click_handler_types.h"
+#include "core/file_utilities.h"
 #include "core/application.h"
 #include "base/call_delayed.h"
 #include "base/platform/base_platform_info.h"
@@ -518,7 +519,7 @@ void SetupInterfaceScale(
 }
 
 void OpenFaq() {
-	UrlClickHandler::Open(telegramFaqLink());
+	File::OpenUrl(telegramFaqLink());
 }
 
 void SetupFaq(not_null<Ui::VerticalLayout*> container, bool icon) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 1d4fbc8a29..e3cdee2b53 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -32,7 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
-#include <QtGui/QDesktopServices>
 
 namespace Ui::BotWebView {
 namespace {
@@ -743,7 +742,7 @@ void Panel::openExternalLink(const QJsonObject &args) {
 	if (_mainButtonLastClick
 		&& _mainButtonLastClick + kProcessClickTimeout >= now) {
 		_mainButtonLastClick = 0;
-		QDesktopServices::openUrl(url);
+		File::OpenUrl(url);
 	} else {
 		const auto string = EncodeForJs(url);
 		_webview->window.eval(("window.open(\"" + string + "\");").toUtf8());