diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 7ba4b8941c..dc2883f85d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -55,49 +55,62 @@ dialogsTextWidthMin: 150px;
 dialogsTextPalette: TextPalette(defaultTextPalette) {
 	linkFg: dialogsTextFgService;
 	monoFg: dialogsTextFg;
+	spoilerFg: dialogsTextFg;
 }
 dialogsTextPaletteOver: TextPalette(defaultTextPalette) {
 	linkFg: dialogsTextFgServiceOver;
 	monoFg: dialogsTextFgOver;
+	spoilerFg: dialogsTextFgOver;
 }
 dialogsTextPaletteActive: TextPalette(defaultTextPalette) {
 	linkFg: dialogsTextFgServiceActive;
 	monoFg: dialogsTextFgActive;
+	spoilerFg: dialogsTextFgActive;
 }
 dialogsTextPaletteDraft: TextPalette(defaultTextPalette) {
 	linkFg: dialogsDraftFg;
 	monoFg: dialogsTextFg;
+	spoilerFg: dialogsTextFg;
 }
 dialogsTextPaletteDraftOver: TextPalette(defaultTextPalette) {
 	linkFg: dialogsDraftFgOver;
 	monoFg: dialogsTextFgOver;
+	spoilerFg: dialogsTextFgOver;
 }
 dialogsTextPaletteDraftActive: TextPalette(defaultTextPalette) {
 	linkFg: dialogsDraftFgActive;
 	monoFg: dialogsTextFgActive;
+	spoilerFg: dialogsTextFgActive;
 }
 dialogsTextPaletteTaken: TextPalette(defaultTextPalette) {
 	linkFg: boxTextFgGood;
+	monoFg: dialogsTextFg;
+	spoilerFg: dialogsTextFg;
 }
 dialogsTextPaletteTakenOver: TextPalette(defaultTextPalette) {
 	linkFg: boxTextFgGood;
 	monoFg: dialogsTextFgOver;
+	spoilerFg: dialogsTextFgOver;
 }
 dialogsTextPaletteTakenActive: TextPalette(defaultTextPalette) {
 	linkFg: dialogsDraftFgActive;
 	monoFg: dialogsTextFgActive;
+	spoilerFg: dialogsTextFgActive;
 }
 dialogsTextPaletteArchive: TextPalette(defaultTextPalette) {
 	linkFg: dialogsArchiveFg;
 	monoFg: dialogsArchiveFg;
+	spoilerFg: dialogsArchiveFg;
 }
 dialogsTextPaletteArchiveOver: TextPalette(defaultTextPalette) {
 	linkFg: dialogsArchiveFgOver;
 	monoFg: dialogsArchiveFgOver;
+	spoilerFg: dialogsArchiveFgOver;
 }
 dialogsTextPaletteArchiveActive: TextPalette(defaultTextPalette) {
 	linkFg: dialogsTextFgActive;
 	monoFg: dialogsTextFgActive;
+	spoilerFg: dialogsTextFgActive;
 }
 
 dialogsEmptyHeight: 160px;
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index f06797b9d4..18006ad479 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -632,9 +632,7 @@ void ChatStyle::make(
 	make(my.selectLinkFg, original.selectLinkFg);
 	make(my.selectMonoFg, original.selectMonoFg);
 	make(my.selectOverlay, original.selectOverlay);
-	make(my.spoilerBg, original.spoilerBg);
-	make(my.spoilerActiveBg, original.spoilerActiveBg);
-	make(my.spoilerActiveFg, original.spoilerActiveFg);
+	make(my.spoilerFg, original.spoilerFg);
 }
 
 void ChatStyle::make(
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index f657dcfb33..cdd8ef4daf 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -987,9 +987,7 @@ void Generator::setTextPalette(const style::TextPalette &st) {
 	_textPalette.selectLinkFg = st.selectLinkFg[_palette].clone();
 	_textPalette.selectMonoFg = st.selectMonoFg[_palette].clone();
 	_textPalette.selectOverlay = st.selectOverlay[_palette].clone();
-	_textPalette.spoilerBg = st.spoilerBg[_palette].clone();
-	_textPalette.spoilerActiveBg = st.spoilerActiveBg[_palette].clone();
-	_textPalette.spoilerActiveFg = st.spoilerActiveFg[_palette].clone();
+	_textPalette.spoilerFg = st.spoilerFg[_palette].clone();
 	_p->setTextPalette(_textPalette);
 }
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index bd7098ef42..4ff5bc5773 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit bd7098ef426886736a2bfde17bf114f5633aa339
+Subproject commit 4ff5bc5773d95b07fd34485a564d1aacc3fb9d1a