diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index aa0c45103..5321cd305 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -357,6 +357,7 @@ colormenu.osd_preset Monitor Auswahl
 colormenu.osd_resolution OSD-Auflösung
 colormenu.progressbar_active Farbe des aktiven Teil
 colormenu.progressbar_passive Hintergrundfarbe
+colormenu.shadow_color Schattenfarbe
 colormenu.textcolor Textfarbe
 colormenu.themeselect Theme auswählen
 colormenu.timing Timeouts
@@ -1166,6 +1167,7 @@ menu.hint_color_gradient_separator_enable Farbverlauf für Menü-Trennlinien akt
 menu.hint_colored_events Definiert, ob die aktuelle oder nächste Sendung in einer anderen Farbe dargestellt werden soll
 menu.hint_colored_events_textcolor Ändern Sie die Farbe für farbige Events in der Kanalliste und der Infobar
 menu.hint_colors Konfigurieren Sie die Menü-Farben
+menu.hint_colors_shadow Einstellen der Schattenfarbe
 menu.hint_content_back Ändern Sie die Hintergrundfarbe für den Fensterinhalt
 menu.hint_content_textcolor Ändern Sie die Textfarbe für den Fensterinhalt
 menu.hint_dboxinfo Informationen über CPU und Arbeitsspeicher der Box
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 9d373da9d..2216f95d5 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -258,52 +258,52 @@ camd_msg_reset camd will be restarted
 camd_msg_start camd will be started
 camd_msg_stop camd will be stopped
 camd_reset camd restart
-channellist.additional Additional informations
-channellist.additional_off off
-channellist.additional_on on
-channellist.additional_on_minitv on (with MiniTV)
-channellist.current_tp Current transponder
+channellist.additional Additional Informations
+channellist.additional_off Off
+channellist.additional_on On
+channellist.additional_on_minitv On (with MiniTV)
+channellist.current_tp Current Transponder
 channellist.edit Edit
-channellist.epgtext_align_left left
-channellist.epgtext_align_right right
-channellist.extended Show event progress
+channellist.epgtext_align_left Left
+channellist.epgtext_align_right Right
+channellist.extended Show Event Progress
 channellist.extended_colored with colored progressbar
 channellist.extended_simple with simple progressbar
 channellist.favs Favorites
-channellist.foot Channel information
-channellist.foot_freq Sat/Freq info
-channellist.foot_next Next event
-channellist.foot_off off
-channellist.foot_sort_alpha sorted[alpha]
-channellist.foot_sort_chnum sorted[number]
-channellist.foot_sort_freq sorted[freq]
-channellist.foot_sort_sat sorted[sat]
-channellist.head All services
+channellist.foot Channel Information
+channellist.foot_freq Sat/Freq Info
+channellist.foot_next Next Event
+channellist.foot_off Off
+channellist.foot_sort_alpha Sorted[Alpha]
+channellist.foot_sort_chnum Sorted[Number]
+channellist.foot_sort_freq Sorted[Freq]
+channellist.foot_sort_sat Sorted[Sat]
+channellist.head All Services
 channellist.history History
-channellist.history_clear Clear history
-channellist.keep_numbers Persistent channel numbers
+channellist.history_clear Clear History
+channellist.keep_numbers Persistent Channel Numbers
 channellist.make_hdlist Create list of HD channels
 channellist.make_newlist Create list of new channels
 channellist.make_removedlist Create list of removed channels
 channellist.make_webtvlist Create list of WebTV channels
-channellist.new_zap_mode Quickzap in list
-channellist.new_zap_mode_active active
-channellist.new_zap_mode_allow allow
-channellist.new_zap_mode_off off
+channellist.new_zap_mode Quickzap in List
+channellist.new_zap_mode_active Active
+channellist.new_zap_mode_allow Allow
+channellist.new_zap_mode_off Off
 channellist.nonefound No channels were found!\nPlease execute a scan\n(MENU-key -> service)
-channellist.numeric_adjust Numeric zap adjust
+channellist.numeric_adjust Numeric Zap Adjust
 channellist.provs Providers
 channellist.recording_not_possible Recording not possible!
 channellist.remember Last used
 channellist.reset_all Reset 'new' flag for all channels
 channellist.reset_flags Reset 'new' channel flag
 channellist.sats Satellites
-channellist.show_channellogo Show channel logos
-channellist.show_channelnumber Show channel numbers
-channellist.show_empty_favs Show empty favorites bouquets
-channellist.show_infobox Show bottom infobox
-channellist.since since
-channellist.start starts
+channellist.show_channellogo Show Channel Logos
+channellist.show_channelnumber Show Channel Numbers
+channellist.show_empty_favs Show empty Favorites Bouquets
+channellist.show_infobox Show Bottom Infobox
+channellist.since Since
+channellist.start Starts
 ci.clock CI clock (Mhz)
 ci.empty No CAM in slot
 ci.ignore_msg Ignore CA messages
@@ -357,6 +357,7 @@ colormenu.osd_preset TV preset
 colormenu.osd_resolution OSD resolution
 colormenu.progressbar_active Aktive part color
 colormenu.progressbar_passive Background
+colormenu.shadow_color Shadow Color
 colormenu.textcolor Text color
 colormenu.themeselect Select theme
 colormenu.timing Timeouts
@@ -1166,6 +1167,7 @@ menu.hint_color_gradient_separator_enable Disable/enable color gradient for menu
 menu.hint_colored_events Use different color for current or next event
 menu.hint_colored_events_textcolor Change color for colored events in channellist and infobar
 menu.hint_colors Configure GUI colors
+menu.hint_colors_shadow Setup for shadow color.
 menu.hint_content_back Change GUI window background color
 menu.hint_content_textcolor Change GUI window text color
 menu.hint_dboxinfo Information about box cpu and storage
diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp
index ff7ee60f9..e1c42ef32 100644
--- a/src/driver/fb_generic.cpp
+++ b/src/driver/fb_generic.cpp
@@ -207,21 +207,9 @@ nolfb:
 	lbb = lfb = NULL;
 }
 
-
-void CFrameBuffer::clearIconCache()
-{
-	std::map<std::string, rawIcon>::iterator it;
-
-	for(it = icon_cache.begin(); it != icon_cache.end(); ++it) {
-		/* printf("FB: delete cached icon %s: %x\n", it->first.c_str(), (int) it->second.data); */
-		cs_free_uncached(it->second.data);
-	}
-	icon_cache.clear();
-}
-
 CFrameBuffer::~CFrameBuffer()
 {
-	clearIconCache(); //NI
+	clearIconCache();
 
 	if (background) {
 		delete[] background;
@@ -926,6 +914,17 @@ _display:
 	return true;
 }
 
+void CFrameBuffer::clearIconCache()
+{
+	std::map<std::string, rawIcon>::iterator it;
+
+	for(it = icon_cache.begin(); it != icon_cache.end(); ++it) {
+		/* printf("FB: delete cached icon %s: %x\n", it->first.c_str(), (int) it->second.data); */
+		cs_free_uncached(it->second.data);
+	}
+	icon_cache.clear();
+}
+
 void CFrameBuffer::loadPal(const std::string & filename, const unsigned char offset, const unsigned char endidx)
 {
 	if (!getActive())
diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h
index 5b233c61f..a298c9171 100644
--- a/src/driver/fb_generic.h
+++ b/src/driver/fb_generic.h
@@ -239,6 +239,7 @@ class CFrameBuffer : public sigc::trackable
 				const int h = 0, const unsigned char offset = 1, bool paint = true, bool paintBg = false, const fb_pixel_t colBg = 0);
 		bool paintIcon8(const std::string & filename, const int x, const int y, const unsigned char offset = 0);
 		void loadPal   (const std::string & filename, const unsigned char offset = 0, const unsigned char endidx = 255);
+		void clearIconCache();
 
 		bool loadPicture2Mem        (const std::string & filename, fb_pixel_t * const memp);
 		bool loadPicture2FrameBuffer(const std::string & filename);
@@ -286,9 +287,6 @@ class CFrameBuffer : public sigc::trackable
 		std::vector<osd_resolution_t> osd_resolutions;
 		size_t getIndexOsdResolution(uint32_t mode);
 
-		//NI
-		void clearIconCache();
-
 		enum
 			{
 				TM_EMPTY  = 0,
diff --git a/src/gui/buildinfo.cpp b/src/gui/buildinfo.cpp
index 2ffc959c4..fb9d7a3ac 100644
--- a/src/gui/buildinfo.cpp
+++ b/src/gui/buildinfo.cpp
@@ -35,13 +35,13 @@
 
 using namespace std;
 
-CBuildInfo::CBuildInfo(bool show) : CComponentsWindow(0, 0, CCW_PERCENT 90, CCW_PERCENT 90, LOCALE_BUILDINFO_MENU, NEUTRINO_ICON_INFO)
+CBuildInfo::CBuildInfo(bool show) : CComponentsWindow(0, 0, CCW_PERCENT 85, CCW_PERCENT 85, LOCALE_BUILDINFO_MENU, NEUTRINO_ICON_INFO)
 {
 	initVarBuildInfo();
 	if (show)
 		exec(NULL, "");
 	else
-		InitInfoItems();
+		GetData();
 }
 
 //init all var members
@@ -52,7 +52,6 @@ void CBuildInfo::initVarBuildInfo()
 	font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT];
 	setWindowHeaderButtons(CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT);
 
-
 	shadow = CC_SHADOW_ON;
 }
 
@@ -64,13 +63,13 @@ int CBuildInfo::exec(CMenuTarget* parent, const string & /*actionKey*/)
 	if (parent)
 		parent->hide();
 
-	InitInfoItems();
-
 	//exit if no informations available
-	if (!HasData()){
+	if (!GetData()){
 		return res;
 	}
 
+	InitInfoItems();
+
 	//paint window
 	if (!is_painted)
 		paint();
@@ -117,7 +116,7 @@ void CBuildInfo::setFontType(Font* font_text)
 	InitInfoItems();
 }
 
-bool CBuildInfo::HasData()
+bool CBuildInfo::GetData()
 {
 	v_info.clear();
 
@@ -166,20 +165,20 @@ bool CBuildInfo::HasData()
 void CBuildInfo::InitInfoItems()
 {
 	//get and checkup required informations
-	if (!HasData())
+	if (!GetData())
 		return;
 
 	//ensure a clean body
 	ccw_body->clear();
 
 	//define size and position
-	int x_info = 10;
+	int x_info = OFFSET_INNER_MID;
 	int h_info = ccw_body->getHeight()/v_info.size(); //default height
 	int w_info = width-2*x_info;
 
 	//init info texts
 	for(size_t i=0; i<v_info.size(); i++){
-		CComponentsExtTextForm *info = new CComponentsExtTextForm(10, CC_APPEND, w_info, h_info, g_Locale->getText(v_info[i].caption), v_info[i].info_text, NULL, ccw_body);
+		CComponentsExtTextForm *info = new CComponentsExtTextForm(OFFSET_INNER_MID, CC_APPEND, w_info, h_info, g_Locale->getText(v_info[i].caption), v_info[i].info_text, NULL, ccw_body);
 		info->setLabelAndTextFont(font);
 		info->setTextModes(CTextBox::TOP , CTextBox::AUTO_HIGH | CTextBox::TOP | CTextBox::AUTO_LINEBREAK_NO_BREAKCHARS);
 		info->doPaintBg(false);
diff --git a/src/gui/buildinfo.h b/src/gui/buildinfo.h
index 154cba8bb..30a1033be 100644
--- a/src/gui/buildinfo.h
+++ b/src/gui/buildinfo.h
@@ -52,7 +52,7 @@ class CBuildInfo :  public CMenuTarget, public CComponentsWindow
 		void initVarBuildInfo();
 		void InitInfoItems();
 		
-		bool HasData();
+		bool GetData();
 	public:
 		
 		//type_id's for infos
diff --git a/src/gui/components/cc_draw.cpp b/src/gui/components/cc_draw.cpp
index 39ca711d8..0ac6128c0 100644
--- a/src/gui/components/cc_draw.cpp
+++ b/src/gui/components/cc_draw.cpp
@@ -35,8 +35,8 @@ CCDraw::CCDraw() : COSDFader(g_settings.theme.menu_Content_alpha)
 {
 	frameBuffer 		= CFrameBuffer::getInstance();
 
-	x = cc_xr = x_old	= 0;
-	y = cc_yr = y_old	= 0;
+	x = cc_xr = cc_xr_old = x_old	= 0;
+	y = cc_yr = cc_yr_old = y_old	= 0;
 	height	= height_old	= CC_HEIGHT_MIN;
 	width	= width_old	= CC_WIDTH_MIN;
 
@@ -95,14 +95,16 @@ CCDraw::~CCDraw()
 inline bool CCDraw::applyPosChanges()
 {
 	bool ret = false;
-	if (x != x_old){
-		dprintf(DEBUG_INFO, "\033[33m[CCDraw]\t[%s - %d], Pos changes x %d != x_old %d...\033[0m\n", __func__, __LINE__, x, x_old);
+	if (x != x_old || cc_xr != cc_xr_old){
+		dprintf(DEBUG_INFO, "\033[33m[CCDraw]\t[%s - %d], Pos changes x %d != x_old %d... [cc_xr = %d cc_xr_old = %d]\033[0m\n", __func__, __LINE__, x, x_old, cc_xr, cc_xr_old);
 		x_old = x;
+		cc_xr_old = cc_xr;
 		ret = true;
 	}
-	if (y != y_old){
-		dprintf(DEBUG_INFO, "\033[33m[CCDraw]\t[%s - %d], Pos changes y %d != y_old %d...\033[0m\n", __func__, __LINE__, y, y_old);
+	if (y != y_old || cc_yr != cc_yr_old){
+		dprintf(DEBUG_INFO, "\033[33m[CCDraw]\t[%s - %d], Pos changes y %d != y_old %d... [cc_yr = %d cc_yr_old = %d]\033[0m\n", __func__, __LINE__, y, y_old, cc_yr, cc_yr_old);
 		y_old = y;
+		cc_yr_old = cc_yr;
 		ret = true;
 	}
 
diff --git a/src/gui/components/cc_draw.h b/src/gui/components/cc_draw.h
index ab7400ca8..76b047f4c 100644
--- a/src/gui/components/cc_draw.h
+++ b/src/gui/components/cc_draw.h
@@ -62,9 +62,9 @@ class CCDraw : public COSDFader, public CComponentsSignals
 		///property: y-position on screen, to alter setPos() or setDimensionsAll(), see also defines CC_APPEND, CC_CENTERED
 		int y, y_old;
 		///property: contains real x-position on screen
-		int cc_xr;
+		int cc_xr, cc_xr_old;
 		///property: contains real y-position on screen
-		int cc_yr;
+		int cc_yr, cc_yr_old;
 		///property: height-dimension on screen, to alter with setHeight() or setDimensionsAll()
 		int height, height_old;
 		///property: width-dimension on screen, to alter with setWidth() or setDimensionsAll()
@@ -184,17 +184,6 @@ class CCDraw : public COSDFader, public CComponentsSignals
 		///to set the real screen position, look at setRealPos()
 		virtual void setPos(const int& xpos, const int& ypos){setXPos(xpos); setYPos(ypos);}
 
-		///sets real x position on screen. Use this, if item is added to a parent form
-		virtual void setRealXPos(const int& xr){cc_xr = xr;}
-		///sets real y position on screen. Use this, if item is added to a parent form
-		virtual void setRealYPos(const int& yr){cc_yr = yr;}
-		///sets real x and y position on screen at once. Use this, if item is added to a parent form
-		virtual void setRealPos(const int& xr, const int& yr){cc_xr = xr; cc_yr = yr;}
-		///get real x-position on screen. Use this, if item contains own render methods and item is bound to a form
-		virtual int getRealXPos(){return cc_xr;}
-		///get real y-position on screen. Use this, if item contains own render methods and item is bound to a form
-		virtual int getRealYPos(){return cc_yr;}
-		
 		///set height of component on screen
 		virtual void setHeight(const int& h);
 		///set width of component on screen
diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp
index 33dd15c94..defe1433c 100644
--- a/src/gui/components/cc_frm.cpp
+++ b/src/gui/components/cc_frm.cpp
@@ -257,6 +257,16 @@ CComponentsItem* CComponentsForm::getCCItem(const uint& cc_item_id)
 	return NULL;
 }
 
+CComponentsItem* CComponentsForm::getPrevCCItem(CComponentsItem* current_cc_item)
+{
+	return getCCItem(getCCItemId(current_cc_item) - 1);
+}
+
+CComponentsItem* CComponentsForm::getNextCCItem(CComponentsItem* current_cc_item)
+{
+	return getCCItem(getCCItemId(current_cc_item) + 1);
+}
+
 void CComponentsForm::replaceCCItem(const uint& cc_item_id, CComponentsItem* new_cc_Item)
 {
 	if (!v_cc_items.empty()){
@@ -685,3 +695,21 @@ bool CComponentsForm::enableColBodyGradient(const int& enable_mode, const fb_pix
 	}
 	return false;
 }
+
+int CComponentsForm::getUsedDY()
+{
+	int y_res = 0;
+	for (size_t i= 0; i< v_cc_items.size(); i++)
+		y_res  = max(v_cc_items[i]->getYPos() + v_cc_items[i]->getHeight(), y_res);
+
+	return y_res;
+}
+
+int CComponentsForm::getUsedDX()
+{
+	int x_res = 0;
+	for (size_t i= 0; i< v_cc_items.size(); i++)
+		x_res  = max(v_cc_items[i]->getXPos() + v_cc_items[i]->getWidth(), x_res);
+
+	return x_res;
+}
diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index 0b7b74401..ca8daa31f 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -106,8 +106,39 @@ class CComponentsForm : public CComponentsItem
 		virtual void replaceCCItem(CComponentsItem* old_cc_Item, CComponentsItem* new_cc_Item);
 		virtual void exchangeCCItem(const uint& item_id_a, const uint& item_id_b);
 		virtual void exchangeCCItem(CComponentsItem* item_a, CComponentsItem* item_b);
-		virtual int getCCItemId(CComponentsItem* cc_Item);
-		virtual CComponentsItem* getCCItem(const uint& cc_item_id);
+
+		/**Function to get current item id from passed item.
+		* @param[in]  cc_Item
+		* 	@li CComponentsItem*
+		* @return
+		*	int, in case of not found item returns -1
+		*/
+		int getCCItemId(CComponentsItem* cc_Item);
+
+		/**Function to get current item from item collection.
+		* @param[in]  cc_item_id
+		* 	@li item id as unsigned int
+		* @return
+		*	CComponentsItem*, in case of not found item returns NULL
+		*/
+		CComponentsItem* getCCItem(const uint& cc_item_id);
+
+		/**Function to get previous item from item collection.
+		* @param[in]  current_cc_item
+		* 	@li CComponentsItem*
+		* @return
+		*	CComponentsItem*, in case of not found item returns NULL
+		*/
+		CComponentsItem* getPrevCCItem(CComponentsItem* current_cc_item);
+
+		/**Function to get next item from item collection.
+		* @param[in]  current_cc_item
+		* 	@li CComponentsItem*
+		* @return
+		*	CComponentsItem*, in case of not found item returns NULL
+		*/
+		CComponentsItem* getNextCCItem(CComponentsItem* current_cc_item);
+
 		virtual void paintCCItems();
 
 		///clean up and deallocate existant items from v_cc_items at once
@@ -152,6 +183,31 @@ class CComponentsForm : public CComponentsItem
 		virtual void setScrollBarWidth(const int& scrollbar_width){w_sb = scrollbar_width;};
 		///returns id of selected item, return value as int, returns -1: if is nothing selected
 		virtual int getSelectedItem();
+
+		/**Function to get consumed  space of items inside form in y direction.
+		* @return
+		*	int, used lines
+		*/
+		int getUsedDY();
+
+		/**Function to get consumed  space of items inside form in x direction.
+		* @return
+		*	int, used lines
+		*/
+		int getUsedDX();
+
+		/**Function to get free usable space of items inside form in y direction.
+		* @return
+		*	int, free lines
+		*/
+		int getFreeDY(){return height - getUsedDY();}
+
+		/**Function to get free usable space of items inside form in x direction.
+		* @return
+		*	int, free lines
+		*/
+		int getFreeDX(){return width - getUsedDX();}
+
 		///returns pointer to selected item, return value as CComponentsItem*, returns NULL: if is nothing selected
 		virtual CComponentsItem* getSelectedItemObject();
 		///select a definied item, parameter1 as size_t
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index a74875e72..2a8d82db8 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -273,6 +273,7 @@ void CComponentsHeader::initIcon()
 
 void CComponentsHeader::initLogo()
 {
+	// init logo with required height and logo
 	int h_logo = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_MIN : cch_logo.dy_max;
 
 	if(!cch_logo_obj)
@@ -291,70 +292,71 @@ void CComponentsHeader::initLogo()
 			h_logo = dy_orig;
 	}
 
-	//cch_logo_obj->setWidth(1, true);
+	// manage logo position
 	if (cch_logo_obj->hasLogo()){
 		cch_logo_obj->setHeight(h_logo, true);
 
-		// set id of logo item depends of neighbor items
+		/* Detect next and previous items,
+		 * current item is logo item.
+		*/
 		int logo_id = getCCItemId(cch_logo_obj);
-		int prev_id = logo_id - 1;
+		CComponentsItem *prev_item = getCCItem((cch_caption_align & CC_TITLE_RIGHT) ? logo_id - 2 : logo_id - 1);
+		CComponentsItem *next_item = getCCItem((cch_caption_align & CC_TITLE_RIGHT) ? logo_id - 1 : logo_id + 1);
 
-		//right end
-		int x_logo_right = width - cch_logo_obj->getWidth();
-		if (!(cch_caption_align & CC_TITLE_RIGHT)){
-			if (cch_btn_obj)
-				x_logo_right -= cch_btn_obj->getWidth();
-			if (cch_cl_obj)
-				x_logo_right -= cch_cl_obj->getWidth();
-		}else{
-			if (cch_icon_obj)
-				x_logo_right += cch_icon_obj->getWidth();
+		/*
+		 * FIXME: Workaround to fix next item in case of wrong order of items.
+		*/
+		if (next_item){
+			if (next_item->getItemType() == CC_ITEMTYPE_FRM_ICONFORM)
+				next_item = cch_cl_obj;
 		}
 
-		//left end
-		int x_logo_left = cch_offset;
-		if (!(cch_caption_align & CC_TITLE_RIGHT))
-			x_logo_left = getCCItem(prev_id) ? getCCItem(prev_id)->getXPos() + getCCItem(prev_id)->getWidth() : 0;
-		else
-			if (cch_icon_obj)
-				x_logo_left += cch_icon_obj->getWidth();
+		/*
+		 * Adjust usable space for logo.
+		*/
+		int x_logo_left = prev_item ? prev_item->getXPos() + prev_item->getWidth() : cch_offset;
+		int x_logo_right = next_item ? next_item->getXPos() : width - cch_offset;
+		int logo_space = x_logo_right - x_logo_left;
 
-		//calculate available space
-		int logo_space = x_logo_right + cch_logo_obj->getWidth() - x_logo_left;
-
-		//reduce logo width if logo space too small
+		/*
+		 * Reduce logo width if logo space too small
+		 * and adjust logo new width if required.
+		*/
 		int w_logo = min(cch_logo_obj->getWidth(), logo_space);
 		cch_logo_obj->setWidth(w_logo, true);
 
-		//set final logo position
-		int x_logo = 0;
-		if (cch_logo.Align & CC_LOGO_RIGHT){
-			if (cch_caption_align & CC_TITLE_RIGHT){
-				if (cch_text_obj)
-					x_logo = cch_text_obj->getXPos() - cch_logo_obj->getWidth();
-			}else
-				x_logo = x_logo_right;
-		}
+		/*
+		 * Adjust logo x position depends of align parameters.
+		*/
+		int x_logo = x_logo_left;
+		if (cch_logo.Align & CC_LOGO_RIGHT)
+			x_logo = x_logo_right - w_logo;
+
 		if (cch_logo.Align & CC_LOGO_LEFT)
 			x_logo = x_logo_left;
+
 		if (cch_logo.Align & CC_LOGO_CENTER){
-			x_logo = width/2 - cch_logo_obj->getWidth()/2;
-			//fallback if adjacent item and logo are overlapping
-			if (!(cch_caption_align & CC_TITLE_RIGHT)){
-				if (getCCItem(prev_id)){
-					int x_tmp = x_logo_left + logo_space/2 - cch_logo_obj->getWidth()/2;
-					if (x_logo <= x_logo_left)
-						x_logo = x_tmp;
-				}
-			}else{
-				if (cch_text_obj){
-					if (x_logo + cch_logo_obj->getWidth() >= cch_text_obj->getXPos()){
-						x_logo = (x_logo_left + cch_text_obj->getXPos())/2 - cch_logo_obj->getWidth()/2;
-					}
-				}
+			x_logo = logo_space/2 - w_logo/2;
+			/*
+			* We are using centered mode as default,
+			* but we must notice possible overlapp
+			* with previous or next item.
+			*/
+			if (cch_caption_align & CC_TITLE_LEFT){
+				int left_tag = prev_item->getXPos() + prev_item->getWidth();
+				if (x_logo <= left_tag)
+					x_logo = left_tag + logo_space/2 - w_logo/2;
+			}
+
+			if (cch_caption_align & CC_TITLE_RIGHT){
+				if (x_logo + w_logo >= next_item->getXPos())
+					x_logo = next_item->getXPos() - logo_space/2 - w_logo/2;
 			}
 		}
 
+		/*
+		 * Finally set logo x position
+		*/
 		cch_logo_obj->setXPos(x_logo);
 		cch_logo_obj->setYPos(height/2 - cch_logo_obj->getHeight()/2);
 	}
@@ -505,6 +507,7 @@ void CComponentsHeader::initClock()
 	if (cch_cl_obj == NULL){
 		dprintf(DEBUG_DEBUG, "[CComponentsHeader]\n    [%s - %d] init clock...\n", __func__, __LINE__);
 		cch_cl_obj = new CComponentsFrmClock(0, cch_items_y, cch_font, cch_cl_format, NULL, false, 1, this);
+		cch_cl_obj->disableForceSegmentPaint();
 		cch_cl_obj->doPaintBg(false);
 	}
 
@@ -547,7 +550,7 @@ void CComponentsHeader::initCaption()
 	}
 
 	//calc width of text object in header
-	cc_text_w = width-cch_text_x-cch_offset;
+	cc_text_w = width-cch_text_x/*-cch_offset*/;
 
 	//context buttons
 	int buttons_w = 0;
@@ -601,15 +604,15 @@ void CComponentsHeader::initCaption()
 		int w_free = cc_text_w;
 
 		//recalc caption width
-		cc_text_w = min(cc_text_w, cch_font->getRenderWidth(cch_text)+ OFFSET_INNER_MID);
+		cc_text_w = min(cc_text_w, cch_font->getRenderWidth(cch_text)) + cch_offset;
 
 		//set alignment of text item in dependency from text alignment
 		if (cch_caption_align & CC_TITLE_CENTER)
 			cch_text_x = width/2 - cc_text_w/2;
 
-		if (cch_caption_align & CC_TITLE_RIGHT){
+		if (cch_caption_align & CC_TITLE_RIGHT){ //FIXME: does not work correct with some conditions, but still not used at the moment
 			cch_text_x += w_free;
-			cch_text_x -= max(cc_text_w, cch_font->getRenderWidth(cch_text)+ OFFSET_INNER_MID);
+			cch_text_x -= max(cc_text_w, cch_font->getRenderWidth(cch_text));
 		}
 
 		//assign general properties
diff --git a/src/gui/components/cc_frm_header.h b/src/gui/components/cc_frm_header.h
index d054bf886..234b89393 100644
--- a/src/gui/components/cc_frm_header.h
+++ b/src/gui/components/cc_frm_header.h
@@ -32,7 +32,7 @@
 #include "cc_frm_clock.h"
 #include <driver/colorgradient.h>
 
-#define DEFAULT_LOGO_ALIGN CCHeaderTypes::CC_LOGO_RIGHT //NI
+#define DEFAULT_LOGO_ALIGN CCHeaderTypes::CC_LOGO_RIGHT
 #define DEFAULT_TITLE_ALIGN CCHeaderTypes::CC_TITLE_LEFT
 
 class CCHeaderTypes
diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp
index 39aaffbf8..5c05a19ed 100644
--- a/src/gui/components/cc_frm_window.cpp
+++ b/src/gui/components/cc_frm_window.cpp
@@ -153,7 +153,7 @@ void CComponentsWindow::initVarWindow(	const int& x_pos, const int& y_pos, const
 	ccw_align_mode	= DEFAULT_TITLE_ALIGN;
 	ccw_show_l_sideber = false;
 	ccw_show_r_sideber = false;
-	ccw_w_sidebar	= 40;
+	ccw_w_sidebar	= SIDEBAR_WIDTH;
 	ccw_col_head 	= COL_MENUHEAD_PLUS_0;
 	ccw_col_head_text = COL_MENUHEAD_TEXT;
 	ccw_col_footer	= COL_MENUFOOT_PLUS_0;
diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp
index 54c335c9a..be2e6678a 100644
--- a/src/gui/components/cc_item.cpp
+++ b/src/gui/components/cc_item.cpp
@@ -265,14 +265,14 @@ void CComponentsItem::setXPos(const int& xpos)
 {
 	CCDraw::setXPos(xpos);
 	if (cc_parent)
-		cc_xr = cc_parent->getXPos() + x;
+		cc_xr = cc_parent->getRealXPos() + x;
 }
 
 void CComponentsItem::setYPos(const int& ypos)
 {
 	CCDraw::setYPos(ypos);
 	if (cc_parent)
-		cc_yr = cc_parent->getYPos() + y;
+		cc_yr = cc_parent->getRealYPos() + y;
 }
 
 void CComponentsItem::setXPosP(const uint8_t& xpos_percent)
diff --git a/src/gui/components/cc_item.h b/src/gui/components/cc_item.h
index d168c3832..d76684020 100644
--- a/src/gui/components/cc_item.h
+++ b/src/gui/components/cc_item.h
@@ -146,6 +146,17 @@ class CComponentsItem : public CComponents
 		///set x and y position as percent value related to current parent form or screen dimensions at once
 		virtual void setPosP(const uint8_t& xpos_percent, const uint8_t& ypos_percent);
 
+		///sets real x position on screen. Use this, if item is added to a parent form
+		virtual void setRealXPos(const int& xr){cc_xr = xr;}
+		///sets real y position on screen. Use this, if item is added to a parent form
+		virtual void setRealYPos(const int& yr){cc_yr = yr;}
+		///sets real x and y position on screen at once. Use this, if item is added to a parent form
+		virtual void setRealPos(const int& xr, const int& yr){cc_xr = xr; cc_yr = yr;}
+		///get real x-position on screen. Use this, if item contains own render methods and item is bound to a form
+		virtual int getRealXPos(){return cc_parent ? cc_xr : x;}
+		///get real y-position on screen. Use this, if item contains own render methods and item is bound to a form
+		virtual int getRealYPos(){return cc_parent ? cc_yr : y;}
+
 		///do center item on screen or within a parent form, parameter along_mode assigns direction of centering
 		virtual void setCenterPos(int along_mode = CC_ALONG_X | CC_ALONG_Y);
 
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 34b6cfee0..6ae03fe20 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -694,6 +694,7 @@ int COsdSetup::showOsdSetup()
 			COsdHelpers::getInstance()->isVideoSystem1080(videoSystem) &&
 			(g_settings.video_Mode != VIDEO_STD_AUTO));
 	CMenuOptionChooser * osd_res = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_RESOLUTION, &g_settings.osd_resolution, kext, resCount, enable, this);
+	osd_res->OnAfterChangeOption.connect(sigc::mem_fun(frameBuffer->getInstance(), &CFrameBuffer::clearIconCache));
 	osd_res->setHint("", LOCALE_MENU_HINT_OSD_RESOLUTION);
 	osd_menu->addItem(osd_res);
 #endif
@@ -824,6 +825,8 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
 			&t.menu_Foot_alpha, colorSetupNotifier);
 	CColorChooser* chFootTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Foot_Text_red, &t.menu_Foot_Text_green, &t.menu_Foot_Text_blue,
 			NULL, colorSetupNotifier);
+	CColorChooser* chShadowColor = new CColorChooser(LOCALE_COLORMENU_SHADOW_COLOR, &t.shadow_red, &t.shadow_green, &t.shadow_blue,
+			&t.menu_Head_alpha, colorSetupNotifier);
 	//NI
 	CColorChooser* chProgressbar_passive = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, &t.progressbar_passive_red, &t.progressbar_passive_green, &t.progressbar_passive_blue,
 			NULL, colorSetupNotifier);
@@ -996,6 +999,13 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
 	oj->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS);
 	menu_colors->addItem(oj);
 
+	// shadow
+	menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE));
+
+	mf = new CMenuDForwarder(LOCALE_COLORMENU_SHADOW_COLOR, true, NULL, chShadowColor );
+	mf->setHint("", LOCALE_MENU_HINT_COLORS_SHADOW);
+	menu_colors->addItem(mf);
+
 	//NI progressbar
 	menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR));
 
diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp
index 8281c5d38..8c93d3f65 100644
--- a/src/gui/themes.cpp
+++ b/src/gui/themes.cpp
@@ -330,6 +330,11 @@ void CThemes::setTheme(CConfigFile &configfile)
 	configfile.setInt32( "progressbar_timescale_yellow", t.progressbar_timescale_yellow);
 	configfile.setInt32( "progressbar_timescale_invert", t.progressbar_timescale_invert);
 
+	configfile.setInt32( "shadow_alpha", t.shadow_alpha );
+	configfile.setInt32( "shadow_red", t.shadow_red );
+	configfile.setInt32( "shadow_green", t.shadow_green );
+	configfile.setInt32( "shadow_blue", t.shadow_blue );
+
 	//NI
 	configfile.setInt32( "progressbar_active_red", t.progressbar_active_red );
 	configfile.setInt32( "progressbar_active_green", t.progressbar_active_green );
@@ -437,6 +442,11 @@ void CThemes::getTheme(CConfigFile &configfile)
 	t.progressbar_timescale_yellow = configfile.getInt32("progressbar_timescale_yellow", 70);
 	t.progressbar_timescale_invert = configfile.getInt32("progressbar_timescale_invert", 0);
 
+	t.shadow_alpha = configfile.getInt32( "shadow_alpha", 0 );
+	t.shadow_red = configfile.getInt32( "shadow_red", 8 );
+	t.shadow_green = configfile.getInt32( "shadow_green", 8);
+	t.shadow_blue = configfile.getInt32( "shadow_blue", 8 );
+
 	//NI
 	t.progressbar_active_red = configfile.getInt32( "progressbar_active_red", 62 );
 	t.progressbar_active_green = configfile.getInt32( "progressbar_active_green", 62 );
diff --git a/src/system/locals.h b/src/system/locals.h
index d335df81a..83a40bd06 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -384,6 +384,7 @@ typedef enum
 	LOCALE_COLORMENU_OSD_RESOLUTION,
 	LOCALE_COLORMENU_PROGRESSBAR_ACTIVE,
 	LOCALE_COLORMENU_PROGRESSBAR_PASSIVE,
+	LOCALE_COLORMENU_SHADOW_COLOR,
 	LOCALE_COLORMENU_TEXTCOLOR,
 	LOCALE_COLORMENU_THEMESELECT,
 	LOCALE_COLORMENU_TIMING,
@@ -1193,6 +1194,7 @@ typedef enum
 	LOCALE_MENU_HINT_COLORED_EVENTS,
 	LOCALE_MENU_HINT_COLORED_EVENTS_TEXTCOLOR,
 	LOCALE_MENU_HINT_COLORS,
+	LOCALE_MENU_HINT_COLORS_SHADOW,
 	LOCALE_MENU_HINT_CONTENT_BACK,
 	LOCALE_MENU_HINT_CONTENT_TEXTCOLOR,
 	LOCALE_MENU_HINT_DBOXINFO,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 3b72a57d1..ae019c62e 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -384,6 +384,7 @@ const char * locale_real_names[] =
 	"colormenu.osd_resolution",
 	"colormenu.progressbar_active",
 	"colormenu.progressbar_passive",
+	"colormenu.shadow_color",
 	"colormenu.textcolor",
 	"colormenu.themeselect",
 	"colormenu.timing",
@@ -1193,6 +1194,7 @@ const char * locale_real_names[] =
 	"menu.hint_colored_events",
 	"menu.hint_colored_events_textcolor",
 	"menu.hint_colors",
+	"menu.hint_colors_shadow",
 	"menu.hint_content_back",
 	"menu.hint_content_textcolor",
 	"menu.hint_dboxinfo",
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index d8c596f0f..f0d696180 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -179,9 +179,9 @@ void CColorSetupNotifier::setPalette()
 	                              8, convertSetupAlpha2Alpha(t.infobar_alpha) );
 
 	frameBuffer->paletteGenFade(COL_SHADOW,
-	                              convertSetupColor2RGB(int(t.infobar_red*0.4), int(t.infobar_green*0.4), int(t.infobar_blue*0.4)),
-	                              convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue),
-	                              8, convertSetupAlpha2Alpha(t.infobar_alpha) );
+	                              convertSetupColor2RGB(int(t.shadow_red), int(t.shadow_green), int(t.shadow_blue)),
+	                              convertSetupColor2RGB(t.shadow_red, t.shadow_green, t.shadow_blue),
+	                              8, convertSetupAlpha2Alpha(t.shadow_alpha) );
 
 	frameBuffer->paletteGenFade(COL_INFOBAR_CASYSTEM,
 	                              convertSetupColor2RGB(t.infobar_casystem_red, t.infobar_casystem_green, t.infobar_casystem_blue),
diff --git a/src/system/settings.h b/src/system/settings.h
index 41165e531..d05e295d3 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -154,6 +154,11 @@ struct SNeutrinoTheme
 	int progressbar_timescale_yellow;
 	int progressbar_timescale_invert;
 
+	unsigned char shadow_alpha;
+	unsigned char shadow_red;
+	unsigned char shadow_green;
+	unsigned char shadow_blue;
+
 	//NI
 	unsigned char progressbar_active_red;
 	unsigned char progressbar_active_green;
@@ -1009,6 +1014,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
 
 #define DETAILSLINE_WIDTH	CFrameBuffer::getInstance()->scale2Res(16)
 
+#define SIDEBAR_WIDTH		CFrameBuffer::getInstance()->scale2Res(40)
+
 #define BIGFONT_FACTOR		1.5
 
 struct SglobalInfo