diff --git a/src/driver/fb_accel_cs_hd2.cpp b/src/driver/fb_accel_cs_hd2.cpp
index cf229002b..28f33d2c1 100644
--- a/src/driver/fb_accel_cs_hd2.cpp
+++ b/src/driver/fb_accel_cs_hd2.cpp
@@ -297,8 +297,10 @@ int CFbAccelCSHD2::scale2Res(int size)
 	   So let's scale these values to other resolutions.
 	*/
 
+#ifdef ENABLE_CHANGE_OSD_RESOLUTION
 	if (screeninfo.xres == 1920)
 		size += size/2;
+#endif
 
 	return size;
 }
diff --git a/src/driver/neutrinofonts.cpp b/src/driver/neutrinofonts.cpp
index d5da1827d..3f35a75ca 100644
--- a/src/driver/neutrinofonts.cpp
+++ b/src/driver/neutrinofonts.cpp
@@ -179,19 +179,11 @@ void CNeutrinoFonts::SetupNeutrinoFonts(bool initRenderClass/*=true*/)
 	int fontSize;
 	for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++) {
 		if (g_Font[i]) delete g_Font[i];
-#ifdef ENABLE_CHANGE_OSD_RESOLUTION
 		fontSize = CFrameBuffer::getInstance()->scale2Res(CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize)) + neutrino_font[i].size_offset * fontDescr.size_offset;
-#else
-		fontSize = CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize) + neutrino_font[i].size_offset * fontDescr.size_offset;
-#endif
 		g_Font[i] = g_fontRenderer->getFont(fontDescr.name.c_str(), fontStyle[neutrino_font[i].style].c_str(), fontSize);
 	}
 	if (g_SignalFont) delete g_SignalFont;
-#ifdef ENABLE_CHANGE_OSD_RESOLUTION
 	fontSize = CFrameBuffer::getInstance()->scale2Res(signal_font.defaultsize) + signal_font.size_offset * fontDescr.size_offset;
-#else
-	fontSize = signal_font.defaultsize + signal_font.size_offset * fontDescr.size_offset;
-#endif
 	g_SignalFont = g_fontRenderer->getFont(fontDescr.name.c_str(), fontStyle[signal_font.style].c_str(), fontSize);
 }
 
diff --git a/src/gui/infoclock.cpp b/src/gui/infoclock.cpp
index c3f2e7168..5e770faac 100644
--- a/src/gui/infoclock.cpp
+++ b/src/gui/infoclock.cpp
@@ -75,10 +75,7 @@ void CInfoClock::initCCLockItems()
 		setClockFormat("%H:%M", "%H %M");
 
 	//set height, NOTE: height is strictly bound to settings
-	height = g_settings.infoClockFontSize;
-#ifdef ENABLE_CHANGE_OSD_RESOLUTION
-	height = CFrameBuffer::getInstance()->scale2Res(height);
-#endif
+	height = CFrameBuffer::getInstance()->scale2Res(g_settings.infoClockFontSize);
 	initClockFont(0, height);
 
 	// set corner radius depending on clock height
diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp
index 6f1f76fe8..1c79b22fa 100644
--- a/src/gui/volumebar.cpp
+++ b/src/gui/volumebar.cpp
@@ -53,10 +53,7 @@ void CVolumeBar::initVarVolumeBar()
 	col_body 	= COL_MENUCONTENT_PLUS_0;
 	corner_rad 	= CORNER_RADIUS_MID;
 	vb_item_offset 	= OFFSET_INNER_SMALL;
-	height 		= g_settings.volume_size; //default height
-#ifdef ENABLE_CHANGE_OSD_RESOLUTION
-	height          = CFrameBuffer::getInstance()->scale2Res(height);
-#endif
+	height          = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size);
 
 	//assume volume value as pointer to global setting
 	vb_vol		= &g_settings.current_volume;
@@ -94,10 +91,7 @@ void CVolumeBar::initVolumeBarSize()
 	//vb_digit_w += corner_rad/2;
 
 	//scale
-	vb_pbw 		= 200;
-#ifdef ENABLE_CHANGE_OSD_RESOLUTION
-	vb_pbw 		= CFrameBuffer::getInstance()->scale2Res(vb_pbw);
-#endif
+	vb_pbw 		= CFrameBuffer::getInstance()->scale2Res(200);
 	vb_pbh 		= height-4*vb_item_offset;
 
 	//result for width
@@ -368,10 +362,7 @@ void CVolumeHelper::initVolBarSize()
 	icon_height		+= 2;
 	icon_width		+= 8;
 	g_settings.volume_size	= max(g_settings.volume_size, icon_height);
-	vol_height		= g_settings.volume_size;
-#ifdef ENABLE_CHANGE_OSD_RESOLUTION
-	vol_height		= CFrameBuffer::getInstance()->scale2Res(vol_height);
-#endif
+	vol_height		= CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size);
 
 	if (g_settings.volume_digits) {
 		CNeutrinoFonts *cnf = CNeutrinoFonts::getInstance();