diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style
index ceb1eb4e0..e4a21bec8 100644
--- a/Telegram/SourceFiles/history/history.style
+++ b/Telegram/SourceFiles/history/history.style
@@ -213,7 +213,7 @@ historyAttachEmoji: IconButton(historyAttach) {
 	iconOver: icon {{ "send_control_emoji", historyComposeIconFgOver }};
 	iconPosition: point(15px, 15px);
 }
-historyAttachEmojiFgActive: windowBgActive;
+historyAttachEmojiFgActive: windowActiveTextFg;
 historyAttachEmojiActive: icon {{ "send_control_emoji", historyAttachEmojiFgActive }};
 historyAttachEmojiTooltipDelta: 4px;
 historyEmojiCircle: size(20px, 20px);
diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp
index 40b51f6cf..1b04ad295 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.cpp
+++ b/Telegram/SourceFiles/info/info_layer_widget.cpp
@@ -102,6 +102,15 @@ bool LayerWidget::takeToThirdSection() {
 	auto memento = MoveMemento(std::move(_content));
 	localCopy->hideSpecialLayer(anim::type::instant);
 
+	// When creating third section in response to the window
+	// size allowing it to fit without window resize we want
+	// to save that we didn't extend the window while showing
+	// the third section, so that when we close it we won't
+	// shrink the window size.
+	//
+	// See https://github.com/telegramdesktop/tdesktop/issues/4091
+	Auth().data().setThirdSectionExtendedBy(0);
+
 	Auth().data().setThirdSectionInfoEnabled(true);
 	Auth().saveDataDelayed();
 	localCopy->showSection(
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 1d105a530..c1cb87560 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -285,7 +285,7 @@ topBarInfo: IconButton(topBarSearch) {
 	icon: icon {{ "top_bar_profile", menuIconFg }};
 	iconOver: icon {{ "top_bar_profile", menuIconFgOver }};
 }
-topBarInfoActive: icon {{ "top_bar_profile", windowBgActive }};
+topBarInfoActive: icon {{ "top_bar_profile", windowActiveTextFg }};
 topBarSkip: -2px;
 topBarCallSkip: -1px;
 topBarMenuToggle: IconButton(topBarSearch) {