diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp
index c95ff6b82..ddf036f27 100644
--- a/src/gui/audio_select.cpp
+++ b/src/gui/audio_select.cpp
@@ -58,7 +58,7 @@ extern CAudioSetupNotifier	* audioSetupNotifier;
 
 CAudioSelectMenuHandler::CAudioSelectMenuHandler()
 {
-	width = w_max (40, 10);
+	width = 40;
 }
 
 CAudioSelectMenuHandler::~CAudioSelectMenuHandler()
diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp
index 031b9f0e3..7f2d02f8f 100644
--- a/src/gui/audio_setup.cpp
+++ b/src/gui/audio_setup.cpp
@@ -56,7 +56,7 @@ CAudioSetup::CAudioSetup(bool wizard_mode)
 {
 	is_wizard = wizard_mode;
 
-	width = w_max (40, 10);
+	width = 40;
 	selected = -1;
 }
 
diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp
index 84fd29cf1..ed10615c5 100644
--- a/src/gui/audioplayer_setup.cpp
+++ b/src/gui/audioplayer_setup.cpp
@@ -54,7 +54,7 @@
 
 CAudioPlayerSetup::CAudioPlayerSetup()
 {
-	width = w_max (40, 10);
+	width = 40;
 }
 
 CAudioPlayerSetup::~CAudioPlayerSetup()
diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp
index ba0c964b9..92b4dd1e8 100644
--- a/src/gui/bookmarkmanager.cpp
+++ b/src/gui/bookmarkmanager.cpp
@@ -225,7 +225,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
 	visible = false;
 	selected = 0;
 	// Max
-	width = w_max( 90, 10 );
+	width = 90;
 	footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8; //initial height value for buttonbar
 	theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
 	fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index af668a5b8..5acc9c610 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -394,7 +394,7 @@ int CBouquetList::show(bool bShowChannelList)
 	CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "");
 	fheight     = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
 
-	width  = w_max (need_width, 20);//500
+	width  = w_max (need_width, 20);
 	height = h_max (16 * fheight, 40);
 
 	footerHeight = std::max(h_max_icon+8, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8);
diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp
index 65c10c9c1..a45587f11 100644
--- a/src/gui/cec_setup.cpp
+++ b/src/gui/cec_setup.cpp
@@ -51,7 +51,7 @@ extern cVideo *videoDecoder;
 
 CCECSetup::CCECSetup()
 {
-	width = w_max (40, 10); //%
+	width = 40;
 	cec1 = NULL;
 	cec2 = NULL;
 }
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index fb0290da2..a87a81eff 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -1239,7 +1239,7 @@ CEventFinderMenu::CEventFinderMenu(	int* 			event,
 	m_search_list       = search_list;
 	m_search_channel_id = search_channel_id;
 	m_search_bouquet_id = search_bouquet_id;
-	width = w_max (40, 10);
+	width = 40;
 	selected = -1;
 }
 
diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index 8e75e27f9..5b3cf5730 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -102,7 +102,7 @@ static int my_filter(const struct dirent * dent)
 
 CHDDMenuHandler::CHDDMenuHandler()
 {
-	width = w_max (58, 10);
+	width = 58;
 	show_menu = false;
 	in_menu = false;
 	lock_refresh = false;
diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp
index c3df84d17..79df911fd 100644
--- a/src/gui/info_menue.cpp
+++ b/src/gui/info_menue.cpp
@@ -50,7 +50,7 @@ extern CCAMMenuHandler * g_CamHandler;
 
 CInfoMenu::CInfoMenu()
 {
-	width = w_max (40, 10);
+	width = 40;
 }
 
 CInfoMenu::~CInfoMenu()
diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index 6bc6da1b8..158a19bde 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -75,7 +75,7 @@ CKeybindSetup::CKeybindSetup()
 {
 	changeNotify(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, NULL);
 
-	width = w_max (40, 10);
+	width = 40;
 }
 
 CKeybindSetup::~CKeybindSetup()
diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp
index f6c89c7ad..0ef9af0b2 100644
--- a/src/gui/mediaplayer.cpp
+++ b/src/gui/mediaplayer.cpp
@@ -60,7 +60,7 @@ CMediaPlayerMenu::CMediaPlayerMenu()
 	setMenuTitel();
 	setUsageMode();
 
-	width = w_max (40, 10); //%
+	width = 40;
 	
 	audioPlayer 	= NULL;
 	inetPlayer 	= NULL;
diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp
index 8f6bd02bf..c2894739d 100644
--- a/src/gui/mediaplayer_setup.cpp
+++ b/src/gui/mediaplayer_setup.cpp
@@ -53,7 +53,7 @@
 
 CMediaPlayerSetup::CMediaPlayerSetup()
 {
-	width = w_max (40, 10);
+	width = 40;
 	selected = -1;
 }
 
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index 7925722e7..8e49bd303 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -62,7 +62,7 @@ extern cVideo *videoDecoder;
 
 CMiscMenue::CMiscMenue()
 {
-	width = w_max (40, 10);
+	width = 40;
 
 	epg_save = NULL;
 	epg_save_standby = NULL;
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index ab5ecd273..69a8f6777 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -3422,7 +3422,7 @@ class CYTHistory : public CMenuTarget
 
 CYTHistory::CYTHistory(MB_SETTINGS &_settings, std::string &_search)
 {
-	width = w_max(40, 10);
+	width = 40;
 	selected = -1;
 	settings = &_settings;
 	search = &_search;
diff --git a/src/gui/network_service.cpp b/src/gui/network_service.cpp
index d7a0ed648..0111f7058 100644
--- a/src/gui/network_service.cpp
+++ b/src/gui/network_service.cpp
@@ -118,7 +118,7 @@ bool CNetworkService::changeNotify(const neutrino_locale_t /*OptionName*/, void
 
 CNetworkServiceSetup::CNetworkServiceSetup()
 {
-	width = w_max (40, 10);
+	width = 40;
 	selected = -1;
 }
 
diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index 7ece99bf1..106f97ce9 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -67,7 +67,7 @@ CNetworkSetup::CNetworkSetup(bool wizard_mode)
 
 	is_wizard = wizard_mode;
 
-	width = w_max (40, 10);
+	width = 40;
 
 	//readNetworkSettings();
 }
diff --git a/src/gui/nfs.cpp b/src/gui/nfs.cpp
index ba1348e74..acecb14a9 100644
--- a/src/gui/nfs.cpp
+++ b/src/gui/nfs.cpp
@@ -65,7 +65,7 @@ CNFSMountGui::CNFSMountGui()
 	m_cifs_sup = CFSMounter::FS_UNPROBED;
 	m_lufs_sup = CFSMounter::FS_UNPROBED;
 	
-	width = w_max (50, 10); //%
+	width = 50;
 }
 
 std::string CNFSMountGui::getEntryString(int i)
diff --git a/src/gui/opkg_manager.cpp b/src/gui/opkg_manager.cpp
index 959dca1c0..28a20fa3f 100644
--- a/src/gui/opkg_manager.cpp
+++ b/src/gui/opkg_manager.cpp
@@ -82,7 +82,7 @@ static const std::string pkg_types[OM_MAX] =
 
 COPKGManager::COPKGManager()
 {
-	width = w_max (80, 10); //%
+	width = 80;
 	pkg_map.clear();
 	list_installed_done = false;
 	list_upgradeable_done = false;
diff --git a/src/gui/osd_progressbar_setup.cpp b/src/gui/osd_progressbar_setup.cpp
index c70946b17..6f2dac976 100644
--- a/src/gui/osd_progressbar_setup.cpp
+++ b/src/gui/osd_progressbar_setup.cpp
@@ -66,7 +66,7 @@ const CMenuOptionChooser::keyval PROGRESSBAR_TIMESCALE_INVERT_OPTIONS[PROGRESSBA
 
 CProgressbarSetup::CProgressbarSetup()
 {
-	width = w_max (40, 10); //%
+	width = 40;
 }
 
 CProgressbarSetup::~CProgressbarSetup()
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 95d2c8494..1aec4df06 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -84,7 +84,7 @@ COsdSetup::COsdSetup(bool wizard_mode)
 
 	is_wizard = wizard_mode;
 
-	width = w_max (40, 10); //%
+	width = 40;
 	show_menu_hints = 0;
 	show_tuner_icon = 0;
 }
@@ -500,7 +500,7 @@ int COsdSetup::showOsdSetup()
 	osd_menu->addItem(mf);
 
 	//fonts
-	CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, w_max(50, 10), MN_WIDGET_ID_OSDSETUP_FONT);
+	CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, 50, MN_WIDGET_ID_OSDSETUP_FONT);
 	showOsdFontSizeSetup(&osd_menu_fonts);
 	mf = new CMenuForwarder(LOCALE_FONTMENU_HEAD, true, NULL, &osd_menu_fonts, NULL, CRCInput::RC_green);
 	mf->setHint("", LOCALE_MENU_HINT_FONTS);
diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp
index e016cdd4e..11bcadcf5 100644
--- a/src/gui/osdlang_setup.cpp
+++ b/src/gui/osdlang_setup.cpp
@@ -59,7 +59,7 @@ COsdLangSetup::COsdLangSetup(bool wizard_mode)
 {
 	is_wizard = wizard_mode;
 
-	width = w_max (45, 10);
+	width = 45;
 	tzNotifier = NULL;
 }
 
diff --git a/src/gui/parentallock_setup.h b/src/gui/parentallock_setup.h
index d2e102782..7938b001f 100644
--- a/src/gui/parentallock_setup.h
+++ b/src/gui/parentallock_setup.h
@@ -53,7 +53,7 @@ class CParentalSetup : public CMenuTarget, public CPINProtection
 		
 		CParentalSetup() : CPINProtection(g_settings.parentallock_pincode)
 		{ 
-			width = w_max (40, 10); //%
+			width = 40;
 			title = LOCALE_PARENTALLOCK_HEAD;
 		};
 		~CParentalSetup();
diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index bbc91728a..453678562 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -324,7 +324,7 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey)
 //the PIN code feature, as well as determine whether or not the EPG menu/Features menu is accessible.
 int CPersonalizeGui::ShowPersonalizationMenu()
 {
-	width = w_max (40, 10);
+	width = 40;
 
 	CMenuWidget* pMenu = new CMenuWidget(g_settings.easymenu ? LOCALE_PARENTALLOCK_MENU : LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE);
 	pMenu->addIntroItems(NONEXISTANT_LOCALE, LOCALE_PERSONALIZE_ACCESS);
diff --git a/src/gui/pictureviewer_setup.cpp b/src/gui/pictureviewer_setup.cpp
index 7d3eb96f8..052299c39 100644
--- a/src/gui/pictureviewer_setup.cpp
+++ b/src/gui/pictureviewer_setup.cpp
@@ -53,7 +53,7 @@
 
 CPictureViewerSetup::CPictureViewerSetup()
 {
-	width = w_max (40, 10);
+	width = 40;
 }
 
 CPictureViewerSetup::~CPictureViewerSetup()
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index 2e6687724..4e5dcaabc 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -67,7 +67,7 @@ CPluginList::CPluginList(const neutrino_locale_t Title, const uint32_t listtype)
 {
 	title = Title;
 	pluginlisttype = listtype;
-	width = w_max (40, 10);
+	width = 40;
 	selected = -1;
 	number = -1;
 }
diff --git a/src/gui/proxyserver_setup.cpp b/src/gui/proxyserver_setup.cpp
index 766ae5c7a..25e889f7f 100644
--- a/src/gui/proxyserver_setup.cpp
+++ b/src/gui/proxyserver_setup.cpp
@@ -50,7 +50,7 @@ CProxySetup::CProxySetup(const neutrino_locale_t title, const char * const IconN
 	menue_title = title;
 	menue_icon = IconName;
 
-	width = w_max (40, 10);
+	width = 40;
 }
 
 CProxySetup::~CProxySetup()
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index b385c2d3f..f7e44d80c 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -59,7 +59,7 @@
 
 CRecordSetup::CRecordSetup()
 {
-	width = w_max (50, 10); //%
+	width = 50;
 }
 
 CRecordSetup::~CRecordSetup()
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 7e266de83..f5cea72b6 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -316,7 +316,7 @@ const CMenuOptionChooser::keyval SATSETUP_FRONTEND_MODE[SATSETUP_FRONTEND_MODE_C
 
 CScanSetup::CScanSetup(bool wizard_mode)
 {
-	width = w_max (40, 10);
+	width = 40;
 	is_wizard = wizard_mode;
 
 	satOnOff	= NULL;
@@ -1938,7 +1938,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
 	static int old_selected = 0;
 	static t_satellite_position old_position = 0;
 
-	int width = w_max (40, 10);
+	int width = 40;
 
 	if (parent)
 		parent->hide();
diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp
index e185f470c..47b312ee4 100644
--- a/src/gui/settings_manager.cpp
+++ b/src/gui/settings_manager.cpp
@@ -50,7 +50,7 @@
 
 CSettingsManager::CSettingsManager()
 {
-	width = w_max (40, 10);
+	width = 40;
 }
 
 
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index a788863fd..91d018d08 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -72,7 +72,7 @@ const struct button_label TestButtons[/*TestButtonsCount*/] =
 
 CTestMenu::CTestMenu()
 {
-	width = w_max (50, 10);
+	width = 50;
 	circle = NULL;
 	sq = NULL;
 	pic = chnl_pic = NULL;
diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp
index 4900194e5..285092b14 100644
--- a/src/gui/themes.cpp
+++ b/src/gui/themes.cpp
@@ -58,7 +58,7 @@
 CThemes::CThemes()
 : themefile('\t')
 {
-	width 	= w_max (40, 10);
+	width = 40;
 	notifier = NULL;
 	hasThemeChanged = false;
 }
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index f5b8fa61e..9198d9559 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -100,7 +100,7 @@ int pinghost  (const std::string &hostname, std::string *ip = NULL);
 CFlashUpdate::CFlashUpdate()
 	:CProgressWindow()
 {
-	width = w_max (40, 10); 
+	width = 40;
 	setTitle(LOCALE_FLASHUPDATE_HEAD);
 	sysfs = CMTDInfo::getInstance()->findMTDsystem();
 	if (sysfs.empty())
@@ -196,7 +196,7 @@ bool CFlashUpdate::selectHttpImage(void)
 	std::string md5;
 	std::vector<std::string> updates_lists, urls, names, versions, descriptions, md5s;
 	char fileTypes[128];
-	int selected = -1, listWidth = w_max (80, 10);
+	int selected = -1, listWidth = 80;
 	int curVer, newVer, newfound = 0;
 
 	CConfigFile _configfile('\t');
@@ -598,7 +598,7 @@ CFlashExpert::CFlashExpert()
 	:CProgressWindow()
 {
 	selectedMTD = -1;
-	width = w_max (40, 10);
+	width = 40;
 #ifdef BOXMODEL_APOLLO
 	forceOtherFilename = false;
 	otherFilename = "";
@@ -976,7 +976,7 @@ int CFlashExpert::exec(CMenuTarget* parent, const std::string & actionKey)
 #ifdef BOXMODEL_APOLLO
 CFlashExpertSetup::CFlashExpertSetup()
 {
-	width = w_max (40, 10);
+	width = 40;
 }
 
 void CFlashExpertSetup::readMTDPart(int mtd, const std::string &fileName)
diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp
index 1978b885f..68c075cf4 100644
--- a/src/gui/update_menue.cpp
+++ b/src/gui/update_menue.cpp
@@ -49,7 +49,7 @@
 
 CSoftwareUpdate::CSoftwareUpdate()
 {
-	width = w_max (40, 10);
+	width = 40;
 	fe = new CFlashExpert();
 }
 
diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp
index 022825290..9497add6a 100644
--- a/src/gui/update_settings.cpp
+++ b/src/gui/update_settings.cpp
@@ -47,7 +47,7 @@
 
 CUpdateSettings::CUpdateSettings()
 {
-	width = w_max (40, 10);
+	width = 40;
 #ifdef USE_SMS_INPUT
 	input_url_file = new CStringInputSMS(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_url_file, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""$%&/()=?-. ");
 #endif
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 79368a759..96a3338e0 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -139,7 +139,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 		return true;
 	}
 
-	width = w_max (40, 10);
+	width = 40;
 
 	CMenuItem* menu_item = NULL;
 	CMenuItem* last_menu_item = NULL;
diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp
index f0922ee2e..fd2d3e3af 100644
--- a/src/gui/user_menue_setup.cpp
+++ b/src/gui/user_menue_setup.cpp
@@ -119,7 +119,7 @@ CUserMenuSetup::CUserMenuSetup(neutrino_locale_t menue_title, int menue_button)
 	local = menue_title;
 	button = menue_button;
 	max_char = 24;
-	width = w_max (40, 10);
+	width = 40;
 	if (menue_button < (int) g_settings.usermenu.size())
 		pref_name = g_settings.usermenu[button]->title; //set current button name as prefered name
 	forwarder = NULL;
diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index f4cf13729..b5148232a 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -52,7 +52,7 @@
 
 CVfdSetup::CVfdSetup()
 {
-	width = w_max (40, 10);
+	width = 40;
 	vfd_enabled = (cs_get_revision() != 10) && (cs_get_revision() != 11);
 }
 
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 829c7fb5e..c91077af4 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -74,7 +74,7 @@ CVideoSettings::CVideoSettings(bool wizard_mode)
 	SyncControlerForwarder = NULL;
 	VcrVideoOutSignalOptionChooser = NULL;
 
-	width = w_max (35, 20);
+	width = 35;
 	selected = -1;
 
 	prev_video_mode = g_settings.video_Mode;
diff --git a/src/gui/webtv_setup.cpp b/src/gui/webtv_setup.cpp
index a74887a6a..4b0b039d6 100644
--- a/src/gui/webtv_setup.cpp
+++ b/src/gui/webtv_setup.cpp
@@ -35,7 +35,7 @@
 
 CWebTVSetup::CWebTVSetup()
 {
-	width = w_max (55, 10);
+	width = 55;
 	selected = -1;
 	item_offset = 0;
 	changed = false;
diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp
index 51880c1d8..f4029afc2 100644
--- a/src/gui/zapit_setup.cpp
+++ b/src/gui/zapit_setup.cpp
@@ -41,7 +41,7 @@
 
 CZapitSetup::CZapitSetup()
 {
-	width = w_max (40, 10); //%
+	width = 40;
 }
 
 CZapitSetup::~CZapitSetup()
@@ -109,7 +109,7 @@ int CZapitSetup::showMenu()
 //select menu
 CSelectChannelWidget::CSelectChannelWidget()
 {
-	width = w_max (40, 10); //%
+	width = 40;
 }
 
 CSelectChannelWidget::~CSelectChannelWidget()