diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 5afdc0241..997d53765 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -629,14 +629,14 @@ PRIVATE
     intro/intro_step.h
     intro/intro_widget.cpp
     intro/intro_widget.h
-    kotato/boxes/confirm_box.cpp
-    kotato/boxes/confirm_box.h
-    kotato/boxes/fonts_box.cpp
-    kotato/boxes/fonts_box.h
-    kotato/boxes/radio_box.cpp
-    kotato/boxes/radio_box.h
-    kotato/boxes/unpin_box.cpp
-    kotato/boxes/unpin_box.h
+    kotato/customboxes/confirm_box.cpp
+    kotato/customboxes/confirm_box.h
+    kotato/customboxes/fonts_box.cpp
+    kotato/customboxes/fonts_box.h
+    kotato/customboxes/radio_box.cpp
+    kotato/customboxes/radio_box.h
+    kotato/customboxes/unpin_box.cpp
+    kotato/customboxes/unpin_box.h
     kotato/json_settings.cpp
     kotato/json_settings.h
     kotato/settings_menu.cpp
diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index f8bd3e347..0cac802d2 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwidget.h"
 #include "main/main_session.h"
 #include "boxes/confirm_box.h"
-#include "kotato/boxes/confirm_box.h"
+#include "kotato/customboxes/confirm_box.h"
 #include "base/qthelp_regex.h"
 #include "storage/localstorage.h"
 #include "history/view/history_view_element.h"
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 771c2f9d6..bf0d0b0c1 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -13,8 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/send_files_box.h"
 #include "boxes/share_box.h"
 #include "boxes/edit_caption_box.h"
-#include "kotato/boxes/confirm_box.h"
-#include "kotato/boxes/unpin_box.h"
+#include "kotato/customboxes/confirm_box.h"
+#include "kotato/customboxes/unpin_box.h"
 #include "core/file_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/special_buttons.h"
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
index 25cb3b6eb..14fecedb2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/fireworks_animation.h"
 #include "ui/toast/toast.h"
-#include "kotato/boxes/confirm_box.h"
+#include "kotato/customboxes/confirm_box.h"
 #include "data/data_media_types.h"
 #include "data/data_poll.h"
 #include "data/data_user.h"
diff --git a/Telegram/SourceFiles/kotato/boxes/confirm_box.cpp b/Telegram/SourceFiles/kotato/customboxes/confirm_box.cpp
similarity index 98%
rename from Telegram/SourceFiles/kotato/boxes/confirm_box.cpp
rename to Telegram/SourceFiles/kotato/customboxes/confirm_box.cpp
index c7d7cdda2..803ece751 100644
--- a/Telegram/SourceFiles/kotato/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/kotato/customboxes/confirm_box.cpp
@@ -5,7 +5,7 @@ the unofficial app based on Telegram Desktop.
 For license and copyright information please follow this link:
 https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL
 */
-#include "kotato/boxes/confirm_box.h"
+#include "kotato/customboxes/confirm_box.h"
 
 #include "lang/lang_keys.h"
 #include "ui/widgets/labels.h"
diff --git a/Telegram/SourceFiles/kotato/boxes/confirm_box.h b/Telegram/SourceFiles/kotato/customboxes/confirm_box.h
similarity index 100%
rename from Telegram/SourceFiles/kotato/boxes/confirm_box.h
rename to Telegram/SourceFiles/kotato/customboxes/confirm_box.h
diff --git a/Telegram/SourceFiles/kotato/boxes/fonts_box.cpp b/Telegram/SourceFiles/kotato/customboxes/fonts_box.cpp
similarity index 99%
rename from Telegram/SourceFiles/kotato/boxes/fonts_box.cpp
rename to Telegram/SourceFiles/kotato/customboxes/fonts_box.cpp
index 31c5f0845..a46608fa1 100644
--- a/Telegram/SourceFiles/kotato/boxes/fonts_box.cpp
+++ b/Telegram/SourceFiles/kotato/customboxes/fonts_box.cpp
@@ -5,7 +5,7 @@ the unofficial app based on Telegram Desktop.
 For license and copyright information please follow this link:
 https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL
 */
-#include "kotato/boxes/fonts_box.h"
+#include "kotato/customboxes/fonts_box.h"
 
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
diff --git a/Telegram/SourceFiles/kotato/boxes/fonts_box.h b/Telegram/SourceFiles/kotato/customboxes/fonts_box.h
similarity index 100%
rename from Telegram/SourceFiles/kotato/boxes/fonts_box.h
rename to Telegram/SourceFiles/kotato/customboxes/fonts_box.h
diff --git a/Telegram/SourceFiles/kotato/boxes/radio_box.cpp b/Telegram/SourceFiles/kotato/customboxes/radio_box.cpp
similarity index 97%
rename from Telegram/SourceFiles/kotato/boxes/radio_box.cpp
rename to Telegram/SourceFiles/kotato/customboxes/radio_box.cpp
index f02aa31ee..c16b535a9 100644
--- a/Telegram/SourceFiles/kotato/boxes/radio_box.cpp
+++ b/Telegram/SourceFiles/kotato/customboxes/radio_box.cpp
@@ -5,7 +5,7 @@ the unofficial app based on Telegram Desktop.
 For license and copyright information please follow this link:
 https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL
 */
-#include "kotato/boxes/radio_box.h"
+#include "kotato/customboxes/radio_box.h"
 
 #include "lang/lang_keys.h"
 #include "ui/wrap/vertical_layout.h"
diff --git a/Telegram/SourceFiles/kotato/boxes/radio_box.h b/Telegram/SourceFiles/kotato/customboxes/radio_box.h
similarity index 100%
rename from Telegram/SourceFiles/kotato/boxes/radio_box.h
rename to Telegram/SourceFiles/kotato/customboxes/radio_box.h
diff --git a/Telegram/SourceFiles/kotato/boxes/unpin_box.cpp b/Telegram/SourceFiles/kotato/customboxes/unpin_box.cpp
similarity index 98%
rename from Telegram/SourceFiles/kotato/boxes/unpin_box.cpp
rename to Telegram/SourceFiles/kotato/customboxes/unpin_box.cpp
index fc877c2e3..a044523c2 100644
--- a/Telegram/SourceFiles/kotato/boxes/unpin_box.cpp
+++ b/Telegram/SourceFiles/kotato/customboxes/unpin_box.cpp
@@ -5,7 +5,7 @@ the unofficial app based on Telegram Desktop.
 For license and copyright information please follow this link:
 https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL
 */
-#include "kotato/boxes/unpin_box.h"
+#include "kotato/customboxes/unpin_box.h"
 
 #include "lang/lang_keys.h"
 #include "apiwrap.h"
diff --git a/Telegram/SourceFiles/kotato/boxes/unpin_box.h b/Telegram/SourceFiles/kotato/customboxes/unpin_box.h
similarity index 100%
rename from Telegram/SourceFiles/kotato/boxes/unpin_box.h
rename to Telegram/SourceFiles/kotato/customboxes/unpin_box.h
diff --git a/Telegram/SourceFiles/kotato/settings_menu.cpp b/Telegram/SourceFiles/kotato/settings_menu.cpp
index f2a6868f0..de68eb6b0 100644
--- a/Telegram/SourceFiles/kotato/settings_menu.cpp
+++ b/Telegram/SourceFiles/kotato/settings_menu.cpp
@@ -17,8 +17,8 @@ https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "boxes/connection_box.h"
-#include "kotato/boxes/fonts_box.h"
-#include "kotato/boxes/radio_box.h"
+#include "kotato/customboxes/fonts_box.h"
+#include "kotato/customboxes/radio_box.h"
 #include "boxes/about_box.h"
 #include "boxes/confirm_box.h"
 #include "platform/platform_specific.h"