diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 4910008c6..9a68fe310 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -222,13 +222,6 @@ void CInfoViewerBB::getBBButtonInfo()
 			icon = NEUTRINO_ICON_BUTTON_RED;
 			frameBuffer->getIconSize(icon.c_str(), &w, &h);
 			mode = CNeutrinoApp::getInstance()->getMode();
-#if 0
-			if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
-				text = g_Locale->getText(LOCALE_LIVESTREAM_RESOLUTION);
-				active = true;
-				break;
-			}
-#endif
 			if (mode == NeutrinoMessages::mode_ts) {
 				text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_red, active, g_settings.infobar_buttons_usertitle);
 				if (!text.empty())
@@ -244,13 +237,6 @@ void CInfoViewerBB::getBBButtonInfo()
 			icon = NEUTRINO_ICON_BUTTON_GREEN;
 			frameBuffer->getIconSize(icon.c_str(), &w, &h);
 			mode = CNeutrinoApp::getInstance()->getMode();
-#if 0
-			if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
-				text = g_Locale->getText(LOCALE_LIVESTREAM_RESOLUTION);
-				active = true;
-				break;
-			}
-#endif
 			if (mode == NeutrinoMessages::mode_ts) {
 				text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active, g_settings.infobar_buttons_usertitle);
 				if (!text.empty())
@@ -266,13 +252,6 @@ void CInfoViewerBB::getBBButtonInfo()
 			icon = NEUTRINO_ICON_BUTTON_YELLOW;
 			frameBuffer->getIconSize(icon.c_str(), &w, &h);
 			mode = CNeutrinoApp::getInstance()->getMode();
-#if 1
-			if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
-				text = g_Locale->getText(LOCALE_LIVESTREAM_RESOLUTION);
-				active = true;
-				break;
-			}
-#endif
 			if (mode == NeutrinoMessages::mode_ts) {
 				text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_yellow, active, g_settings.infobar_buttons_usertitle);
 				if (!text.empty())
@@ -288,13 +267,6 @@ void CInfoViewerBB::getBBButtonInfo()
 			icon = NEUTRINO_ICON_BUTTON_BLUE;
 			frameBuffer->getIconSize(icon.c_str(), &w, &h);
 			mode = CNeutrinoApp::getInstance()->getMode();
-#if 0
-			if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
-				text = g_Locale->getText(LOCALE_LIVESTREAM_RESOLUTION);
-				active = true;
-				break;
-			}
-#endif
 			if (mode == NeutrinoMessages::mode_ts) {
 				text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_blue, active, g_settings.infobar_buttons_usertitle);
 				if (!text.empty())
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index a129fc617..7cd5a19c8 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -525,6 +525,15 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
 			case SNeutrinoSettings::ITEM_NONE:
 			case SNeutrinoSettings::ITEM_BAR:
 			case SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION:
+				if(loc == NONEXISTANT_LOCALE && !text) {
+					/* TODO
+					   get const char *valname from struct
+					   keyval_ext LIVESTREAM_RESOLUTION_OPTIONS
+					*/
+					text = to_string(g_settings.livestreamResolution).c_str();
+				} else
+					return_title = true;
+				active = true;
 				continue;
 			case SNeutrinoSettings::ITEM_EPG_MISC:
 				return_title = true;