diff --git a/Telegram/SourceFiles/boxes/abstractbox.cpp b/Telegram/SourceFiles/boxes/abstractbox.cpp
index 9f59068f9..883a39a21 100644
--- a/Telegram/SourceFiles/boxes/abstractbox.cpp
+++ b/Telegram/SourceFiles/boxes/abstractbox.cpp
@@ -175,16 +175,8 @@ void BoxContent::updateScrollAreaGeometry() {
 		updateInnerVisibleTopBottom();
 
 		auto top = _scroll->scrollTop();
-		if (top > 0 || _innerTopSkip > 0) {
-			_topShadow->showFast();
-		} else {
-			_topShadow->hideFast();
-		}
-		if (top < _scroll->scrollTopMax()) {
-			_bottomShadow->showFast();
-		} else {
-			_bottomShadow->hideFast();
-		}
+		_topShadow->toggleFast(top > 0 || _innerTopSkip > 0);
+		_bottomShadow->toggleFast(top < _scroll->scrollTopMax());
 	}
 }
 
diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp
index 33dcc853b..4287b7d3f 100644
--- a/Telegram/SourceFiles/boxes/contactsbox.cpp
+++ b/Telegram/SourceFiles/boxes/contactsbox.cpp
@@ -140,21 +140,16 @@ void ContactsBox::prepare() {
 		addPeerToMultiSelect(i, true);
 	}
 	_inner->setAllAdminsChangedCallback([this] {
+		_select->toggleAnimated(!_inner->allAdmins());
 		if (_inner->allAdmins()) {
 			_select->entity()->clearQuery();
-			_select->slideUp();
 			_inner->setFocus();
 		} else {
-			_select->slideDown();
 			_select->entity()->setInnerFocus();
 		}
 		updateScrollSkips();
 	});
-	if (_inner->chat() && _inner->membersFilter() == MembersFilter::Admins && _inner->allAdmins()) {
-		_select->hideFast();
-	} else {
-		_select->showFast();
-	}
+	_select->toggleFast(!_inner->chat() || (_inner->membersFilter() != MembersFilter::Admins) || !_inner->allAdmins());
 	_select->entity()->setQueryChangedCallback([this](const QString &query) { onFilterUpdate(query); });
 	_select->entity()->setItemRemovedCallback([this](uint64 itemId) {
 		if (auto peer = App::peerLoaded(itemId)) {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 9233109c6..e89dc9b4c 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -154,17 +154,15 @@ void PeerListBox::refreshRows() {
 
 void PeerListBox::setSearchMode(SearchMode mode) {
 	_inner->setSearchMode(mode);
-	if (mode != SearchMode::None) {
-		if (!_select) {
-			_select = createMultiSelect();
-			_select->entity()->setSubmittedCallback([this](bool chtrlShiftEnter) { _inner->submitted(); });
-			_select->entity()->setQueryChangedCallback([this](const QString &query) { searchQueryChanged(query); });
-			_select->resizeToWidth(width());
-			_select->moveToLeft(0, 0);
-		}
-		_select->slideDown();
-	} else if (_select) {
-		_select->slideUp();
+	if (mode != SearchMode::None && !_select) {
+		_select = createMultiSelect();
+		_select->entity()->setSubmittedCallback([this](bool chtrlShiftEnter) { _inner->submitted(); });
+		_select->entity()->setQueryChangedCallback([this](const QString &query) { searchQueryChanged(query); });
+		_select->resizeToWidth(width());
+		_select->moveToLeft(0, 0);
+	}
+	if (_select) {
+		_select->toggleAnimated(mode != SearchMode::None);
 	}
 }
 
diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp
index 2b3445778..d8a17cd5b 100644
--- a/Telegram/SourceFiles/dialogswidget.cpp
+++ b/Telegram/SourceFiles/dialogswidget.cpp
@@ -3054,16 +3054,11 @@ void DialogsWidget::updateLockUnlockVisibility() {
 void DialogsWidget::updateJumpToDateVisibility(bool fast) {
 	if (_a_show.animating()) return;
 
-	if (_searchInPeer && _filter->getLastText().isEmpty()) {
-		if (fast) {
-			_jumpToDate->showFast();
-		} else {
-			_jumpToDate->showAnimated();
-		}
-	} else if (fast) {
-		_jumpToDate->hideFast();
+	auto jumpToDateVisible = (_searchInPeer && _filter->getLastText().isEmpty());
+	if (fast) {
+		_jumpToDate->toggleFast(jumpToDateVisible);
 	} else {
-		_jumpToDate->hideAnimated();
+		_jumpToDate->toggleAnimated(jumpToDateVisible);
 	}
 }
 
diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp
index c172a097c..c4ecd3a40 100644
--- a/Telegram/SourceFiles/intro/introwidget.cpp
+++ b/Telegram/SourceFiles/intro/introwidget.cpp
@@ -276,20 +276,11 @@ void Widget::showControls() {
 	getStep()->show();
 	_next->show();
 	_next->setText(getStep()->nextButtonText());
-	if (getStep()->hasCover()) {
-		_settings->hideFast();
-		if (_update) _update->hideFast();
-		if (_changeLanguage) _changeLanguage->showFast();
-	} else {
-		_settings->showFast();
-		if (_update) _update->showFast();
-		if (_changeLanguage) _changeLanguage->hideFast();
-	}
-	if (getStep()->hasBack()) {
-		_back->showFast();
-	} else {
-		_back->hideFast();
-	}
+	auto hasCover = getStep()->hasCover();
+	_settings->toggleFast(!hasCover);
+	if (_update) _update->toggleFast(!hasCover);
+	if (_changeLanguage) _changeLanguage->toggleFast(hasCover);
+	_back->toggleFast(getStep()->hasBack());
 }
 
 void Widget::hideControls() {
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 14e333d03..c750b5084 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1612,7 +1612,7 @@ void MainWidget::switchToPanelPlayer() {
 	if (_playerUsingPanel) return;
 	_playerUsingPanel = true;
 
-	_player->slideUp();
+	_player->hideAnimated();
 	_playerVolume.destroyDelayed();
 	_playerPlaylist->hideIgnoringEnterEvents();
 
@@ -1626,7 +1626,7 @@ void MainWidget::switchToFixedPlayer() {
 	if (!_player) {
 		createPlayer();
 	} else {
-		_player->slideDown();
+		_player->showAnimated();
 		if (!_playerVolume) {
 			_playerVolume.create(this);
 			_player->entity()->volumeWidgetCreated(_playerVolume);
@@ -1643,7 +1643,7 @@ void MainWidget::closeBothPlayers() {
 		_playerUsingPanel = false;
 		_player.destroyDelayed();
 	} else {
-		_player->slideUp();
+		_player->hideAnimated();
 	}
 	_playerVolume.destroyDelayed();
 
@@ -1667,7 +1667,7 @@ void MainWidget::createPlayer() {
 	} else {
 		_player->hideFast();
 		if (_player) {
-			_player->slideDown();
+			_player->showAnimated();
 			_playerHeight = _contentScrollAddToY = _player->contentHeight();
 			updateControlsGeometry();
 		}
diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
index 83f90bd14..c3e20c9cf 100644
--- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
@@ -88,11 +88,7 @@ void AdvancedWidget::createControls() {
 
 void AdvancedWidget::checkNonDefaultTheme() {
 	if (self()) return;
-	if (Local::hasTheme()) {
-		_useDefaultTheme->slideDown();
-	} else {
-		_useDefaultTheme->slideUp();
-	}
+	_useDefaultTheme->toggleAnimated(Local::hasTheme());
 }
 
 void AdvancedWidget::onManageLocalStorage() {
diff --git a/Telegram/SourceFiles/settings/settings_background_widget.cpp b/Telegram/SourceFiles/settings/settings_background_widget.cpp
index 75bb1e458..30ee78f2d 100644
--- a/Telegram/SourceFiles/settings/settings_background_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_background_widget.cpp
@@ -208,11 +208,7 @@ BackgroundWidget::BackgroundWidget(QWidget *parent, UserData *self) : BlockWidge
 		}
 	});
 	subscribe(Adaptive::Changed(), [this]() {
-		if (Global::AdaptiveChatLayout() == Adaptive::ChatLayout::Wide) {
-			_adaptive->slideDown();
-		} else {
-			_adaptive->slideUp();
-		}
+		_adaptive->toggleAnimated(Global::AdaptiveChatLayout() == Adaptive::ChatLayout::Wide);
 	});
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
index 84dd4d540..eadeeccb3 100644
--- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
@@ -190,11 +190,7 @@ void ChatSettingsWidget::onReplaceEmoji() {
 	cSetReplaceEmojis(_replaceEmoji->checked());
 	Local::writeUserSettings();
 
-	if (_replaceEmoji->checked()) {
-		_viewList->slideDown();
-	} else {
-		_viewList->slideUp();
-	}
+	_viewList->toggleAnimated(_replaceEmoji->checked());
 }
 
 void ChatSettingsWidget::onViewList() {
@@ -205,11 +201,7 @@ void ChatSettingsWidget::onDontAskDownloadPath() {
 	Global::SetAskDownloadPath(!_dontAskDownloadPath->checked());
 	Local::writeUserSettings();
 #ifndef OS_WIN_STORE
-	if (_dontAskDownloadPath->checked()) {
-		_downloadPath->slideDown();
-	} else {
-		_downloadPath->slideUp();
-	}
+	_downloadPath->toggleAnimated(_dontAskDownloadPath->checked());
 #endif // OS_WIN_STORE
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_general_widget.cpp b/Telegram/SourceFiles/settings/settings_general_widget.cpp
index 074cec216..435d3f0cb 100644
--- a/Telegram/SourceFiles/settings/settings_general_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_general_widget.cpp
@@ -250,11 +250,10 @@ void GeneralWidget::onRestart() {
 void GeneralWidget::onUpdateAutomatically() {
 	cSetAutoUpdate(_updateAutomatically->checked());
 	Local::writeSettings();
+	_updateRow->toggleAnimated(cAutoUpdate());
 	if (cAutoUpdate()) {
-		_updateRow->slideDown();
 		Sandbox::startUpdateCheck();
 	} else {
-		_updateRow->slideUp();
 		Sandbox::stopUpdate();
 	}
 }
@@ -290,7 +289,6 @@ void GeneralWidget::onAutoStart() {
 	cSetAutoStart(_autoStart->checked());
 	if (cAutoStart()) {
 		psAutoStart(true);
-		_startMinimized->slideDown();
 		Local::writeSettings();
 	} else {
 		psAutoStart(false);
@@ -299,8 +297,8 @@ void GeneralWidget::onAutoStart() {
 		} else {
 			Local::writeSettings();
 		}
-		_startMinimized->slideUp();
 	}
+	_startMinimized->toggleAnimated(cAutoStart());
 }
 
 void GeneralWidget::onStartMinimized() {
diff --git a/Telegram/SourceFiles/settings/settings_info_widget.cpp b/Telegram/SourceFiles/settings/settings_info_widget.cpp
index 321695471..40fe4a185 100644
--- a/Telegram/SourceFiles/settings/settings_info_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_info_widget.cpp
@@ -115,12 +115,11 @@ void InfoWidget::refreshLink() {
 }
 
 void InfoWidget::setLabeledText(object_ptr<LabeledWrap> &row, const QString &label, const TextWithEntities &textWithEntities, const TextWithEntities &shortTextWithEntities, const QString &copyText) {
-	if (textWithEntities.text.isEmpty()) {
-		row->slideUp();
-	} else {
+	auto nonEmptyText = !textWithEntities.text.isEmpty();
+	if (nonEmptyText) {
 		row->entity()->setLabeledText(label, textWithEntities, shortTextWithEntities, copyText);
-		row->slideDown();
 	}
+	row->toggleAnimated(nonEmptyText);
 }
 
 InfoWidget::LabeledWidget::LabeledWidget(QWidget *parent) : TWidget(parent) {
diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
index 79249548f..fb8fe4b72 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
@@ -106,15 +106,8 @@ void NotificationsWidget::onDesktopNotifications() {
 
 void NotificationsWidget::desktopEnabledUpdated() {
 	_desktopNotifications->setChecked(Global::DesktopNotify());
-	if (Global::DesktopNotify()) {
-		_showSenderName->slideDown();
-		if (_showSenderName->entity()->checked()) {
-			_showMessagePreview->slideDown();
-		}
-	} else {
-		_showSenderName->slideUp();
-		_showMessagePreview->slideUp();
-	}
+	_showSenderName->toggleAnimated(Global::DesktopNotify());
+	_showMessagePreview->toggleAnimated(Global::DesktopNotify() && _showSenderName->entity()->checked());
 }
 
 void NotificationsWidget::onShowSenderName() {
@@ -153,11 +146,7 @@ void NotificationsWidget::onShowMessagePreview() {
 }
 
 void NotificationsWidget::viewParamUpdated() {
-	if (_showSenderName->entity()->checked()) {
-		_showMessagePreview->slideDown();
-	} else {
-		_showMessagePreview->slideUp();
-	}
+	_showMessagePreview->toggleAnimated(_showSenderName->entity()->checked());
 }
 
 void NotificationsWidget::onNativeNotifications() {
@@ -170,11 +159,7 @@ void NotificationsWidget::onNativeNotifications() {
 
 	AuthSession::Current().notifications()->createManager();
 
-	if (Global::NativeNotifications()) {
-		_advanced->slideUp();
-	} else {
-		_advanced->slideDown();
-	}
+	_advanced->toggleAnimated(!Global::NativeNotifications());
 }
 
 void NotificationsWidget::onAdvanced() {
diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
index fa4e79ac8..456ea8df3 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
@@ -189,10 +189,8 @@ void PrivacyWidget::autoLockUpdated() {
 		auto value = (Global::AutoLock() % 3600) ? lng_passcode_autolock_minutes(lt_count, Global::AutoLock() / 60) : lng_passcode_autolock_hours(lt_count, Global::AutoLock() / 3600);
 		_autoLock->entity()->link()->setText(value);
 		resizeToWidth(width());
-		_autoLock->slideDown();
-	} else {
-		_autoLock->slideUp();
 	}
+	_autoLock->toggleAnimated(Global::LocalPasscode());
 }
 
 void PrivacyWidget::onBlockedUsers() {
diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h
index 107e95249..c370fc913 100644
--- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h
+++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h
@@ -86,19 +86,30 @@ public:
 		, bool scaled = false);
 
 	void showAnimated() {
-		_animation.fadeIn(_duration);
+		toggleAnimated(true);
 	}
 	void hideAnimated() {
-		_animation.fadeOut(_duration);
+		toggleAnimated(false);
 	}
-	void showFast() {
-		_animation.show();
-		if (_updateCallback) {
-			_updateCallback();
+	void toggleAnimated(bool visible) {
+		if (visible) {
+			_animation.fadeIn(_duration);
+		} else {
+			_animation.fadeOut(_duration);
 		}
 	}
+	void showFast() {
+		toggleFast(true);
+	}
 	void hideFast() {
-		_animation.hide();
+		toggleFast(false);
+	}
+	void toggleFast(bool visible) {
+		if (visible) {
+			_animation.show();
+		} else {
+			_animation.hide();
+		}
 		if (_updateCallback) {
 			_updateCallback();
 		}
diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp
index f44461531..d8f0856e3 100644
--- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp
+++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp
@@ -39,7 +39,7 @@ WidgetSlideWrap<TWidget>::WidgetSlideWrap(QWidget *parent
 	resizeToWidth(_realSize.width());
 }
 
-void WidgetSlideWrap<TWidget>::slideUp() {
+void WidgetSlideWrap<TWidget>::hideAnimated() {
 	if (isHidden()) {
 		_forceHeight = 0;
 		resizeToWidth(_realSize.width());
@@ -53,7 +53,7 @@ void WidgetSlideWrap<TWidget>::slideUp() {
 	_a_height.start([this] { animationCallback(); }, _realSize.height(), 0., _duration);
 }
 
-void WidgetSlideWrap<TWidget>::slideDown() {
+void WidgetSlideWrap<TWidget>::showAnimated() {
 	if (isHidden()) {
 		show();
 	}
@@ -69,21 +69,12 @@ void WidgetSlideWrap<TWidget>::slideDown() {
 	_a_height.start([this] { animationCallback(); }, 0., _realSize.height(), _duration);
 }
 
-void WidgetSlideWrap<TWidget>::showFast() {
-	show();
+void WidgetSlideWrap<TWidget>::toggleFast(bool visible) {
+	if (visible) show();
 	_a_height.finish();
-	_forceHeight = -1;
+	_forceHeight = visible ? -1 : 0;
 	resizeToWidth(_realSize.width());
-	if (_updateCallback) {
-		_updateCallback();
-	}
-}
-
-void WidgetSlideWrap<TWidget>::hideFast() {
-	_a_height.finish();
-	_forceHeight = 0;
-	resizeToWidth(_realSize.width());
-	hide();
+	if (!visible) hide();
 	if (_updateCallback) {
 		_updateCallback();
 	}
diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h
index 74cc50aa6..215bf735c 100644
--- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h
+++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h
@@ -36,10 +36,22 @@ public:
 		, base::lambda<void()> updateCallback
 		, int duration = st::widgetSlideDuration);
 
-	void slideUp();
-	void slideDown();
-	void showFast();
-	void hideFast();
+	void showAnimated();
+	void hideAnimated();
+	void toggleAnimated(bool visible) {
+		if (visible) {
+			showAnimated();
+		} else {
+			hideAnimated();
+		}
+	}
+	void showFast() {
+		toggleFast(true);
+	}
+	void hideFast() {
+		toggleFast(false);
+	}
+	void toggleFast(bool visible);
 
 	void finishAnimation() {
 		_a_height.finish();