diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 92fc35d9b0..e0a2483c68 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/session.h"
 #include "mainwindow.h"
 #include "core/click_handler_types.h"
-#include "settings/settings_widget.h"
+#include "old_settings/settings_widget.h"
 
 extern "C" {
 #include <openssl/rsa.h>
@@ -2127,7 +2127,7 @@ void UpdateApplication() {
 		cSetLastUpdateCheck(0);
 		Core::UpdateChecker().start();
 		if (const auto window = App::wnd()) {
-			auto settings = Box<Settings::Widget>();
+			auto settings = Box<OldSettings::Widget>();
 			const auto weak = make_weak(settings.data());
 			window->showSpecialLayer(std::move(settings), anim::type::normal);
 			if (weak) {
diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp
index bafc5215dd..ff311121db 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.cpp
+++ b/Telegram/SourceFiles/info/info_layer_widget.cpp
@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/main_window.h"
 #include "auth_session.h"
 #include "styles/style_info.h"
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "styles/style_window.h"
 #include "styles/style_boxes.h"
 
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 8c1fcbe92b..213e359de6 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -33,7 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mediaview.h"
 #include "storage/localstorage.h"
 #include "apiwrap.h"
-#include "settings/settings_widget.h"
+#include "old_settings/settings_widget.h"
 #include "platform/platform_notifications_manager.h"
 #include "window/layer_widget.h"
 #include "window/notifications_manager.h"
@@ -302,7 +302,7 @@ void MainWindow::setupMain(const MTPUser *self) {
 void MainWindow::showSettings() {
 	if (isHidden()) showFromTray();
 
-	controller()->showSpecialLayer(Box<Settings::Widget>());
+	controller()->showSpecialLayer(Box<OldSettings::Widget>());
 }
 
 void MainWindow::showSpecialLayer(
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/old_settings/old_settings.style
similarity index 100%
rename from Telegram/SourceFiles/settings/settings.style
rename to Telegram/SourceFiles/old_settings/old_settings.style
diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp b/Telegram/SourceFiles/old_settings/settings_advanced_widget.cpp
similarity index 97%
rename from Telegram/SourceFiles/settings/settings_advanced_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_advanced_widget.cpp
index 3d6f01d314..d1d40a0c06 100644
--- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_advanced_widget.cpp
@@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_advanced_widget.h"
+#include "old_settings/settings_advanced_widget.h"
 
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "lang/lang_keys.h"
 #include "boxes/connection_box.h"
 #include "boxes/confirm_box.h"
@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localstorage.h"
 #include "window/themes/window_theme.h"
 
-namespace Settings {
+namespace OldSettings {
 
 AdvancedWidget::AdvancedWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_advanced_settings)) {
 	createControls();
diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.h b/Telegram/SourceFiles/old_settings/settings_advanced_widget.h
similarity index 91%
rename from Telegram/SourceFiles/settings/settings_advanced_widget.h
rename to Telegram/SourceFiles/old_settings/settings_advanced_widget.h
index 1f38592993..00044935bc 100644
--- a/Telegram/SourceFiles/settings/settings_advanced_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_advanced_widget.h
@@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
-#include "settings/settings_chat_settings_widget.h"
+#include "old_settings/settings_block_widget.h"
+#include "old_settings/settings_chat_settings_widget.h"
 
-namespace Settings {
+namespace OldSettings {
 
 class AdvancedWidget : public BlockWidget, public RPCSender {
 	Q_OBJECT
diff --git a/Telegram/SourceFiles/settings/settings_background_widget.cpp b/Telegram/SourceFiles/old_settings/settings_background_widget.cpp
similarity index 98%
rename from Telegram/SourceFiles/settings/settings_background_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_background_widget.cpp
index 4473be1319..6ea3d2ee05 100644
--- a/Telegram/SourceFiles/settings/settings_background_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_background_widget.cpp
@@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_background_widget.h"
+#include "old_settings/settings_background_widget.h"
 
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "boxes/background_box.h"
@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/themes/window_theme_editor.h"
 #include "core/file_utilities.h"
 
-namespace Settings {
+namespace OldSettings {
 
 BackgroundRow::BackgroundRow(QWidget *parent) : RpWidget(parent)
 , _chooseFromGallery(this, lang(lng_settings_bg_from_gallery), st::boxLinkButton)
diff --git a/Telegram/SourceFiles/settings/settings_background_widget.h b/Telegram/SourceFiles/old_settings/settings_background_widget.h
similarity index 95%
rename from Telegram/SourceFiles/settings/settings_background_widget.h
rename to Telegram/SourceFiles/old_settings/settings_background_widget.h
index 3b9b06b387..137e8ba9f7 100644
--- a/Telegram/SourceFiles/settings/settings_background_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_background_widget.h
@@ -7,11 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
+#include "old_settings/settings_block_widget.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/rp_widget.h"
 
-namespace Settings {
+namespace OldSettings {
 
 class BackgroundRow : public Ui::RpWidget, private base::Subscriber {
 	Q_OBJECT
diff --git a/Telegram/SourceFiles/settings/settings_block_widget.cpp b/Telegram/SourceFiles/old_settings/settings_block_widget.cpp
similarity index 96%
rename from Telegram/SourceFiles/settings/settings_block_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_block_widget.cpp
index b13f6ed8cf..546d06e66a 100644
--- a/Telegram/SourceFiles/settings/settings_block_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_block_widget.cpp
@@ -5,14 +5,14 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_block_widget.h"
+#include "old_settings/settings_block_widget.h"
 
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/vertical_layout.h"
 
-namespace Settings {
+namespace OldSettings {
 
 BlockWidget::BlockWidget(QWidget *parent, UserData *self, const QString &title) : RpWidget(parent)
 , _content(this)
diff --git a/Telegram/SourceFiles/settings/settings_block_widget.h b/Telegram/SourceFiles/old_settings/settings_block_widget.h
similarity index 99%
rename from Telegram/SourceFiles/settings/settings_block_widget.h
rename to Telegram/SourceFiles/old_settings/settings_block_widget.h
index 6680a27b00..3834eb9882 100644
--- a/Telegram/SourceFiles/settings/settings_block_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_block_widget.h
@@ -25,7 +25,7 @@ class SlideWrap;
 class VerticalLayout;
 } // namespace Ui
 
-namespace Settings {
+namespace OldSettings {
 
 class BlockWidget : public Ui::RpWidget, protected base::Subscriber {
 public:
diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp b/Telegram/SourceFiles/old_settings/settings_chat_settings_widget.cpp
similarity index 98%
rename from Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_chat_settings_widget.cpp
index 9e13113b27..9adf74110f 100644
--- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_chat_settings_widget.cpp
@@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_chat_settings_widget.h"
+#include "old_settings/settings_chat_settings_widget.h"
 
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "lang/lang_keys.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/checkbox.h"
@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/connection_box.h"
 #include "boxes/confirm_box.h"
 
-namespace Settings {
+namespace OldSettings {
 
 LabeledLink::LabeledLink(QWidget *parent, const QString &label, const QString &text, Type type, const char *slot) : RpWidget(parent)
 , _label(this, label, Ui::FlatLabel::InitType::Simple, (type == Type::Primary) ? st::settingsPrimaryLabel : st::defaultFlatLabel)
diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.h b/Telegram/SourceFiles/old_settings/settings_chat_settings_widget.h
similarity index 97%
rename from Telegram/SourceFiles/settings/settings_chat_settings_widget.h
rename to Telegram/SourceFiles/old_settings/settings_chat_settings_widget.h
index 60316573ac..cf338eb387 100644
--- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_chat_settings_widget.h
@@ -7,14 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
+#include "old_settings/settings_block_widget.h"
 #include "ui/rp_widget.h"
 
 namespace Ui {
 class FlatLabel;
 } // namespace Ui
 
-namespace Settings {
+namespace OldSettings {
 
 class LabeledLink : public Ui::RpWidget {
 public:
diff --git a/Telegram/SourceFiles/settings/settings_cover.cpp b/Telegram/SourceFiles/old_settings/settings_cover.cpp
similarity index 99%
rename from Telegram/SourceFiles/settings/settings_cover.cpp
rename to Telegram/SourceFiles/old_settings/settings_cover.cpp
index d825365fff..64b6e1cc7f 100644
--- a/Telegram/SourceFiles/settings/settings_cover.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_cover.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_cover.h"
+#include "old_settings/settings_cover.h"
 
 #include "data/data_photo.h"
 #include "data/data_session.h"
@@ -22,11 +22,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/confirm_box.h"
 #include "boxes/photo_crop_box.h"
 #include "boxes/add_contact_box.h"
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "styles/style_profile.h" // for divider
 #include "platform/platform_file_utilities.h"
 
-namespace Settings {
+namespace OldSettings {
 
 CoverWidget::CoverWidget(QWidget *parent, UserData *self)
 : BlockWidget(parent, self, QString())
diff --git a/Telegram/SourceFiles/settings/settings_cover.h b/Telegram/SourceFiles/old_settings/settings_cover.h
similarity index 96%
rename from Telegram/SourceFiles/settings/settings_cover.h
rename to Telegram/SourceFiles/old_settings/settings_cover.h
index e33a4e5089..c8da2d570b 100644
--- a/Telegram/SourceFiles/settings/settings_cover.h
+++ b/Telegram/SourceFiles/old_settings/settings_cover.h
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/observer.h"
-#include "settings/settings_block_widget.h"
+#include "old_settings/settings_block_widget.h"
 
 namespace Ui {
 class FlatLabel;
@@ -25,7 +25,7 @@ namespace Profile {
 class CoverDropArea;
 } // namespace Profile
 
-namespace Settings {
+namespace OldSettings {
 
 class CoverWidget : public BlockWidget {
 public:
diff --git a/Telegram/SourceFiles/settings/settings_fixed_bar.cpp b/Telegram/SourceFiles/old_settings/settings_fixed_bar.cpp
similarity index 89%
rename from Telegram/SourceFiles/settings/settings_fixed_bar.cpp
rename to Telegram/SourceFiles/old_settings/settings_fixed_bar.cpp
index 9c531b72f6..b4c5fc181d 100644
--- a/Telegram/SourceFiles/settings/settings_fixed_bar.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_fixed_bar.cpp
@@ -5,13 +5,13 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_fixed_bar.h"
+#include "old_settings/settings_fixed_bar.h"
 
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "styles/style_boxes.h"
 #include "mainwindow.h"
 
-namespace Settings {
+namespace OldSettings {
 
 FixedBar::FixedBar(QWidget *parent) : TWidget(parent) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
diff --git a/Telegram/SourceFiles/settings/settings_fixed_bar.h b/Telegram/SourceFiles/old_settings/settings_fixed_bar.h
similarity index 95%
rename from Telegram/SourceFiles/settings/settings_fixed_bar.h
rename to Telegram/SourceFiles/old_settings/settings_fixed_bar.h
index c4c254e16f..2594ab4bf3 100644
--- a/Telegram/SourceFiles/settings/settings_fixed_bar.h
+++ b/Telegram/SourceFiles/old_settings/settings_fixed_bar.h
@@ -11,7 +11,7 @@ namespace Ui {
 class IconButton;
 } // namespace Ui
 
-namespace Settings {
+namespace OldSettings {
 
 class FixedBar : public TWidget {
 public:
diff --git a/Telegram/SourceFiles/settings/settings_general_widget.cpp b/Telegram/SourceFiles/old_settings/settings_general_widget.cpp
similarity index 98%
rename from Telegram/SourceFiles/settings/settings_general_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_general_widget.cpp
index 9ac1a3b22a..5a6c9266a4 100644
--- a/Telegram/SourceFiles/settings/settings_general_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_general_widget.cpp
@@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_general_widget.h"
+#include "old_settings/settings_general_widget.h"
 
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "lang/lang_keys.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/checkbox.h"
@@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "messenger.h"
 #include "core/update_checker.h"
 
-namespace Settings {
+namespace OldSettings {
 
 UpdateStateRow::UpdateStateRow(QWidget *parent) : RpWidget(parent)
 , _check(this, lang(lng_settings_check_now))
diff --git a/Telegram/SourceFiles/settings/settings_general_widget.h b/Telegram/SourceFiles/old_settings/settings_general_widget.h
similarity index 96%
rename from Telegram/SourceFiles/settings/settings_general_widget.h
rename to Telegram/SourceFiles/old_settings/settings_general_widget.h
index 651737a1b1..082c8e2bd8 100644
--- a/Telegram/SourceFiles/settings/settings_general_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_general_widget.h
@@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
+#include "old_settings/settings_block_widget.h"
 #include "ui/rp_widget.h"
 
-namespace Settings {
+namespace OldSettings {
 
 class UpdateStateRow : public Ui::RpWidget {
 	Q_OBJECT
diff --git a/Telegram/SourceFiles/settings/settings_info_widget.cpp b/Telegram/SourceFiles/old_settings/settings_info_widget.cpp
similarity index 98%
rename from Telegram/SourceFiles/settings/settings_info_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_info_widget.cpp
index 214b065f56..9fcbbcc782 100644
--- a/Telegram/SourceFiles/settings/settings_info_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_info_widget.cpp
@@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_info_widget.h"
+#include "old_settings/settings_info_widget.h"
 
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "lang/lang_keys.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "messenger.h"
 #include "auth_session.h"
 
-namespace Settings {
+namespace OldSettings {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
diff --git a/Telegram/SourceFiles/settings/settings_info_widget.h b/Telegram/SourceFiles/old_settings/settings_info_widget.h
similarity index 96%
rename from Telegram/SourceFiles/settings/settings_info_widget.h
rename to Telegram/SourceFiles/old_settings/settings_info_widget.h
index 0b7f73f66b..9f1a17cd45 100644
--- a/Telegram/SourceFiles/settings/settings_info_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_info_widget.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
+#include "old_settings/settings_block_widget.h"
 #include "ui/rp_widget.h"
 
 namespace Ui {
@@ -18,7 +18,7 @@ namespace Notify {
 struct PeerUpdate;
 } // namespace Notify
 
-namespace Settings {
+namespace OldSettings {
 
 class InfoWidget : public BlockWidget {
 public:
diff --git a/Telegram/SourceFiles/settings/settings_inner_widget.cpp b/Telegram/SourceFiles/old_settings/settings_inner_widget.cpp
similarity index 80%
rename from Telegram/SourceFiles/settings/settings_inner_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_inner_widget.cpp
index 8a9db46936..ba0fd9b88a 100644
--- a/Telegram/SourceFiles/settings/settings_inner_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_inner_widget.cpp
@@ -5,22 +5,22 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_inner_widget.h"
+#include "old_settings/settings_inner_widget.h"
 
 #include "lang/lang_instance.h"
-#include "styles/style_settings.h"
-#include "settings/settings_cover.h"
-#include "settings/settings_block_widget.h"
-#include "settings/settings_info_widget.h"
-#include "settings/settings_notifications_widget.h"
-#include "settings/settings_general_widget.h"
-#include "settings/settings_chat_settings_widget.h"
-#include "settings/settings_scale_widget.h"
-#include "settings/settings_background_widget.h"
-#include "settings/settings_privacy_widget.h"
-#include "settings/settings_advanced_widget.h"
+#include "styles/style_old_settings.h"
+#include "old_settings/settings_cover.h"
+#include "old_settings/settings_block_widget.h"
+#include "old_settings/settings_info_widget.h"
+#include "old_settings/settings_notifications_widget.h"
+#include "old_settings/settings_general_widget.h"
+#include "old_settings/settings_chat_settings_widget.h"
+#include "old_settings/settings_scale_widget.h"
+#include "old_settings/settings_background_widget.h"
+#include "old_settings/settings_privacy_widget.h"
+#include "old_settings/settings_advanced_widget.h"
 
-namespace Settings {
+namespace OldSettings {
 
 InnerWidget::InnerWidget(QWidget *parent) : LayerInner(parent)
 , _blocks(this)
diff --git a/Telegram/SourceFiles/settings/settings_inner_widget.h b/Telegram/SourceFiles/old_settings/settings_inner_widget.h
similarity index 94%
rename from Telegram/SourceFiles/settings/settings_inner_widget.h
rename to Telegram/SourceFiles/old_settings/settings_inner_widget.h
index 99f8b05538..be5f7494d5 100644
--- a/Telegram/SourceFiles/settings/settings_inner_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_inner_widget.h
@@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_layer.h"
+#include "old_settings/settings_layer.h"
 #include "ui/wrap/vertical_layout.h"
 
-namespace Settings {
+namespace OldSettings {
 
 class CoverWidget;
 class BlockWidget;
diff --git a/Telegram/SourceFiles/settings/settings_layer.cpp b/Telegram/SourceFiles/old_settings/settings_layer.cpp
similarity index 94%
rename from Telegram/SourceFiles/settings/settings_layer.cpp
rename to Telegram/SourceFiles/old_settings/settings_layer.cpp
index 7e28deb9e0..f903c2f911 100644
--- a/Telegram/SourceFiles/settings/settings_layer.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_layer.cpp
@@ -5,12 +5,12 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_layer.h"
+#include "old_settings/settings_layer.h"
 
 #include <rpl/mappers.h>
-#include "settings/settings_inner_widget.h"
-#include "settings/settings_fixed_bar.h"
-#include "styles/style_settings.h"
+#include "old_settings/settings_inner_widget.h"
+#include "old_settings/settings_fixed_bar.h"
+#include "styles/style_old_settings.h"
 #include "styles/style_window.h"
 #include "styles/style_boxes.h"
 #include "ui/widgets/scroll_area.h"
@@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/file_utilities.h"
 #include "window/themes/window_theme.h"
 
-namespace Settings {
+namespace OldSettings {
 
 Layer::Layer()
 : _scroll(this, st::settingsScroll)
diff --git a/Telegram/SourceFiles/settings/settings_layer.h b/Telegram/SourceFiles/old_settings/settings_layer.h
similarity index 98%
rename from Telegram/SourceFiles/settings/settings_layer.h
rename to Telegram/SourceFiles/old_settings/settings_layer.h
index 23dab677f4..cdf7f4acb0 100644
--- a/Telegram/SourceFiles/settings/settings_layer.h
+++ b/Telegram/SourceFiles/old_settings/settings_layer.h
@@ -16,7 +16,7 @@ class IconButton;
 class FadeShadow;
 } // namespace Ui
 
-namespace Settings {
+namespace OldSettings {
 
 class FixedBar;
 class LayerInner : public Ui::RpWidget {
diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp b/Telegram/SourceFiles/old_settings/settings_notifications_widget.cpp
similarity index 98%
rename from Telegram/SourceFiles/settings/settings_notifications_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_notifications_widget.cpp
index 62bbe645e1..5c918c085c 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_notifications_widget.cpp
@@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_notifications_widget.h"
+#include "old_settings/settings_notifications_widget.h"
 
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "lang/lang_keys.h"
 #include "storage/localstorage.h"
 #include "ui/wrap/slide_wrap.h"
@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/platform_notifications_manager.h"
 #include "auth_session.h"
 
-namespace Settings {
+namespace OldSettings {
 namespace {
 
 using ChangeType = Window::Notifications::ChangeType;
diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.h b/Telegram/SourceFiles/old_settings/settings_notifications_widget.h
similarity index 93%
rename from Telegram/SourceFiles/settings/settings_notifications_widget.h
rename to Telegram/SourceFiles/old_settings/settings_notifications_widget.h
index a42a9821b2..ac54facf50 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_notifications_widget.h
@@ -7,9 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
+#include "old_settings/settings_block_widget.h"
 
-namespace Settings {
+namespace OldSettings {
 
 class NotificationsWidget : public BlockWidget {
 	Q_OBJECT
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/old_settings/settings_privacy_controllers.cpp
similarity index 99%
rename from Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
rename to Telegram/SourceFiles/old_settings/settings_privacy_controllers.cpp
index 4e664c2262..547a99b5cf 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_privacy_controllers.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_privacy_controllers.h"
+#include "old_settings/settings_privacy_controllers.h"
 
 #include "lang/lang_keys.h"
 #include "apiwrap.h"
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peer_list_controllers.h"
 #include "boxes/confirm_box.h"
 
-namespace Settings {
+namespace OldSettings {
 namespace {
 
 constexpr auto kBlockedPerPage = 40;
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/old_settings/settings_privacy_controllers.h
similarity index 99%
rename from Telegram/SourceFiles/settings/settings_privacy_controllers.h
rename to Telegram/SourceFiles/old_settings/settings_privacy_controllers.h
index 1269c5434a..3ceb803a79 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/old_settings/settings_privacy_controllers.h
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/edit_privacy_box.h"
 #include "mtproto/sender.h"
 
-namespace Settings {
+namespace OldSettings {
 
 class BlockedBoxController : public PeerListController, private base::Subscriber, private MTP::Sender {
 public:
diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp b/Telegram/SourceFiles/old_settings/settings_privacy_widget.cpp
similarity index 98%
rename from Telegram/SourceFiles/settings/settings_privacy_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_privacy_widget.cpp
index 7f40b0cefe..fa72e13c0b 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_privacy_widget.cpp
@@ -5,11 +5,11 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_privacy_widget.h"
+#include "old_settings/settings_privacy_widget.h"
 
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/buttons.h"
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "lang/lang_keys.h"
 #include "application.h"
 #include "auth_session.h"
@@ -24,9 +24,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peer_list_box.h"
 #include "boxes/edit_privacy_box.h"
 #include "boxes/self_destruction_box.h"
-#include "settings/settings_privacy_controllers.h"
+#include "old_settings/settings_privacy_controllers.h"
 
-namespace Settings {
+namespace OldSettings {
 
 LocalPasscodeState::LocalPasscodeState(QWidget *parent) : RpWidget(parent)
 , _edit(this, GetEditPasscodeText(), st::boxLinkButton)
diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.h b/Telegram/SourceFiles/old_settings/settings_privacy_widget.h
similarity index 95%
rename from Telegram/SourceFiles/settings/settings_privacy_widget.h
rename to Telegram/SourceFiles/old_settings/settings_privacy_widget.h
index 7d212c3778..6f1f3aa0d0 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_privacy_widget.h
@@ -7,12 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
-#include "settings/settings_chat_settings_widget.h"
+#include "old_settings/settings_block_widget.h"
+#include "old_settings/settings_chat_settings_widget.h"
 #include "core/core_cloud_password.h"
 #include "ui/rp_widget.h"
 
-namespace Settings {
+namespace OldSettings {
 
 class LocalPasscodeState : public Ui::RpWidget, private base::Subscriber {
 	Q_OBJECT
diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.cpp b/Telegram/SourceFiles/old_settings/settings_scale_widget.cpp
similarity index 96%
rename from Telegram/SourceFiles/settings/settings_scale_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_scale_widget.cpp
index 78d5c6b276..cd29df54d2 100644
--- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_scale_widget.cpp
@@ -5,10 +5,10 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_scale_widget.h"
+#include "old_settings/settings_scale_widget.h"
 
 #include "styles/style_boxes.h"
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "ui/widgets/checkbox.h"
 #include "lang/lang_keys.h"
 #include "storage/localstorage.h"
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "application.h"
 #include "ui/widgets/discrete_sliders.h"
 
-namespace Settings {
+namespace OldSettings {
 namespace {
 
 QString scaleLabel(DBIScale scale) {
diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.h b/Telegram/SourceFiles/old_settings/settings_scale_widget.h
similarity index 90%
rename from Telegram/SourceFiles/settings/settings_scale_widget.h
rename to Telegram/SourceFiles/old_settings/settings_scale_widget.h
index 8eaceee2a1..d7ef0c5007 100644
--- a/Telegram/SourceFiles/settings/settings_scale_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_scale_widget.h
@@ -7,14 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
+#include "old_settings/settings_block_widget.h"
 
 namespace Ui {
 class Checkbox;
 class SettingsSlider;
 } // namespace Ui
 
-namespace Settings {
+namespace OldSettings {
 
 class ScaleWidget : public BlockWidget {
 	Q_OBJECT
diff --git a/Telegram/SourceFiles/settings/settings_widget.cpp b/Telegram/SourceFiles/old_settings/settings_widget.cpp
similarity index 97%
rename from Telegram/SourceFiles/settings/settings_widget.cpp
rename to Telegram/SourceFiles/old_settings/settings_widget.cpp
index ae495ad976..ade50a7521 100644
--- a/Telegram/SourceFiles/settings/settings_widget.cpp
+++ b/Telegram/SourceFiles/old_settings/settings_widget.cpp
@@ -5,10 +5,10 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_widget.h"
+#include "old_settings/settings_widget.h"
 
-#include "settings/settings_inner_widget.h"
-#include "settings/settings_fixed_bar.h"
+#include "old_settings/settings_inner_widget.h"
+#include "old_settings/settings_fixed_bar.h"
 #include "platform/platform_specific.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/buttons.h"
@@ -30,11 +30,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/media_audio_track.h"
 #include "mainwindow.h"
 #include "window/window_controller.h"
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "styles/style_window.h"
 #include "styles/style_boxes.h"
 
-namespace Settings {
+namespace OldSettings {
 namespace {
 
 QString SecretText;
diff --git a/Telegram/SourceFiles/settings/settings_widget.h b/Telegram/SourceFiles/old_settings/settings_widget.h
similarity index 90%
rename from Telegram/SourceFiles/settings/settings_widget.h
rename to Telegram/SourceFiles/old_settings/settings_widget.h
index beb2937f52..0509f25467 100644
--- a/Telegram/SourceFiles/settings/settings_widget.h
+++ b/Telegram/SourceFiles/old_settings/settings_widget.h
@@ -7,9 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "settings/settings_layer.h"
+#include "old_settings/settings_layer.h"
 
-namespace Settings {
+namespace OldSettings {
 
 class InnerWidget;
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
index 2ccca8cb29..1d2f775780 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
@@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localstorage.h"
 #include "boxes/confirm_box.h"
 #include "styles/style_window.h"
-#include "styles/style_settings.h"
+#include "styles/style_old_settings.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_boxes.h"
 #include "ui/widgets/scroll_area.h"
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
index 1cab5ae294..53eb407028 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -36,7 +36,7 @@
         '<(src_loc)/overview/overview.style',
         '<(src_loc)/passport/passport.style',
         '<(src_loc)/profile/profile.style',
-        '<(src_loc)/settings/settings.style',
+        '<(src_loc)/old_settings/old_settings.style',
         '<(src_loc)/chat_helpers/chat_helpers.style',
         '<(src_loc)/ui/widgets/widgets.style',
         '<(src_loc)/window/window.style',
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
index dd4f848db2..02e63f530a 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -532,36 +532,36 @@
 <(src_loc)/profile/profile_channel_controllers.h
 <(src_loc)/profile/profile_cover_drop_area.cpp
 <(src_loc)/profile/profile_cover_drop_area.h
-<(src_loc)/settings/settings_advanced_widget.cpp
-<(src_loc)/settings/settings_advanced_widget.h
-<(src_loc)/settings/settings_background_widget.cpp
-<(src_loc)/settings/settings_background_widget.h
-<(src_loc)/settings/settings_block_widget.cpp
-<(src_loc)/settings/settings_block_widget.h
-<(src_loc)/settings/settings_chat_settings_widget.cpp
-<(src_loc)/settings/settings_chat_settings_widget.h
-<(src_loc)/settings/settings_cover.cpp
-<(src_loc)/settings/settings_cover.h
-<(src_loc)/settings/settings_fixed_bar.cpp
-<(src_loc)/settings/settings_fixed_bar.h
-<(src_loc)/settings/settings_general_widget.cpp
-<(src_loc)/settings/settings_general_widget.h
-<(src_loc)/settings/settings_info_widget.cpp
-<(src_loc)/settings/settings_info_widget.h
-<(src_loc)/settings/settings_inner_widget.cpp
-<(src_loc)/settings/settings_inner_widget.h
-<(src_loc)/settings/settings_layer.cpp
-<(src_loc)/settings/settings_layer.h
-<(src_loc)/settings/settings_notifications_widget.cpp
-<(src_loc)/settings/settings_notifications_widget.h
-<(src_loc)/settings/settings_privacy_controllers.cpp
-<(src_loc)/settings/settings_privacy_controllers.h
-<(src_loc)/settings/settings_privacy_widget.cpp
-<(src_loc)/settings/settings_privacy_widget.h
-<(src_loc)/settings/settings_scale_widget.cpp
-<(src_loc)/settings/settings_scale_widget.h
-<(src_loc)/settings/settings_widget.cpp
-<(src_loc)/settings/settings_widget.h
+<(src_loc)/old_settings/settings_advanced_widget.cpp
+<(src_loc)/old_settings/settings_advanced_widget.h
+<(src_loc)/old_settings/settings_background_widget.cpp
+<(src_loc)/old_settings/settings_background_widget.h
+<(src_loc)/old_settings/settings_block_widget.cpp
+<(src_loc)/old_settings/settings_block_widget.h
+<(src_loc)/old_settings/settings_chat_settings_widget.cpp
+<(src_loc)/old_settings/settings_chat_settings_widget.h
+<(src_loc)/old_settings/settings_cover.cpp
+<(src_loc)/old_settings/settings_cover.h
+<(src_loc)/old_settings/settings_fixed_bar.cpp
+<(src_loc)/old_settings/settings_fixed_bar.h
+<(src_loc)/old_settings/settings_general_widget.cpp
+<(src_loc)/old_settings/settings_general_widget.h
+<(src_loc)/old_settings/settings_info_widget.cpp
+<(src_loc)/old_settings/settings_info_widget.h
+<(src_loc)/old_settings/settings_inner_widget.cpp
+<(src_loc)/old_settings/settings_inner_widget.h
+<(src_loc)/old_settings/settings_layer.cpp
+<(src_loc)/old_settings/settings_layer.h
+<(src_loc)/old_settings/settings_notifications_widget.cpp
+<(src_loc)/old_settings/settings_notifications_widget.h
+<(src_loc)/old_settings/settings_privacy_controllers.cpp
+<(src_loc)/old_settings/settings_privacy_controllers.h
+<(src_loc)/old_settings/settings_privacy_widget.cpp
+<(src_loc)/old_settings/settings_privacy_widget.h
+<(src_loc)/old_settings/settings_scale_widget.cpp
+<(src_loc)/old_settings/settings_scale_widget.h
+<(src_loc)/old_settings/settings_widget.cpp
+<(src_loc)/old_settings/settings_widget.h
 <(src_loc)/storage/file_download.cpp
 <(src_loc)/storage/file_download.h
 <(src_loc)/storage/file_upload.cpp