diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 597bf0fbf1..97a3c9295b 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -1453,24 +1453,17 @@ void Panel::stateChanged(State state) {
 void Panel::refreshAnswerHangupRedialLabel() {
 	Expects(_answerHangupRedialState.has_value());
 
-	_answerHangupRedial->setText([&] {
+	const auto phrase = [&] {
 		switch (*_answerHangupRedialState) {
-		case AnswerHangupRedialState::Answer: return tr::lng_call_accept();
-		case AnswerHangupRedialState::Hangup: return tr::lng_call_end_call();
-		case AnswerHangupRedialState::Redial: return tr::lng_call_redial();
-		case AnswerHangupRedialState::StartCall: return tr::lng_call_start();
+		case AnswerHangupRedialState::Answer: return tr::lng_call_accept;
+		case AnswerHangupRedialState::Hangup: return tr::lng_call_end_call;
+		case AnswerHangupRedialState::Redial: return tr::lng_call_redial;
+		case AnswerHangupRedialState::StartCall: return tr::lng_call_start;
 		}
 		Unexpected("AnswerHangupRedialState value.");
-	}());
-	_answerHangupRedial->setAccessibleName([&] {
-		switch (*_answerHangupRedialState) {
-		case AnswerHangupRedialState::Answer: return tr::lng_call_accept(tr::now);
-		case AnswerHangupRedialState::Hangup: return tr::lng_call_end_call(tr::now);
-		case AnswerHangupRedialState::Redial: return tr::lng_call_redial(tr::now);
-		case AnswerHangupRedialState::StartCall: return tr::lng_call_start(tr::now);
-		}
-		Unexpected("AnswerHangupRedialState value.");
-	}());
+	}();
+	_answerHangupRedial->setText(phrase());
+	_answerHangupRedial->setAccessibleName(phrase(tr::now));
 }
 
 void Panel::updateStatusText(State state) {
diff --git a/Telegram/SourceFiles/data/data_birthday.cpp b/Telegram/SourceFiles/data/data_birthday.cpp
index 408c731429..f41e251bff 100644
--- a/Telegram/SourceFiles/data/data_birthday.cpp
+++ b/Telegram/SourceFiles/data/data_birthday.cpp
@@ -70,15 +70,14 @@ int Birthday::year() const {
 }
 
 QString BirthdayText(Birthday date, bool fullMonth) {
-	const auto monthText = (fullMonth
-		? Lang::MonthDay(date.month())
-		: Lang::MonthSmall(date.month()))(tr::now);
-
+	const auto wrapMonth = fullMonth
+		? Lang::MonthDay
+		: Lang::MonthSmall;
 	if (const auto year = date.year()) {
 		return tr::lng_month_day_year(
 			tr::now,
 			lt_month,
-			monthText,
+			wrapMonth(date.month())(tr::now),
 			lt_day,
 			QString::number(date.day()),
 			lt_year,
@@ -87,7 +86,7 @@ QString BirthdayText(Birthday date, bool fullMonth) {
 		return tr::lng_month_day(
 			tr::now,
 			lt_month,
-			monthText,
+			wrapMonth(date.month())(tr::now),
 			lt_day,
 			QString::number(date.day()));
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 3ea3626233..295300e03b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -622,7 +622,6 @@ Widget::Widget(
 			controller->closeForum();
 		}
 	});
-	_searchForNarrowLayout->setAccessibleName(tr::lng_dlg_filter(tr::now));
 
 	setAcceptDrops(true);