diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp
index 24b2d8917..e67bd73b6 100644
--- a/src/gui/components/cc_frm_button.cpp
+++ b/src/gui/components/cc_frm_button.cpp
@@ -100,7 +100,7 @@ void CComponentsButton::initVarButton(	const int& x_pos, const int& y_pos, const
 	width 		= w;
 	height	 	= h;
 	shadow		= shadow_mode;
-	shadow_w	= SHADOW_OFFSET/2; //buttons are mostly small elements, so these elements should have a reasonable shadow width
+	shadow_w	= shadow ? SHADOW_OFFSET/2 : 0; //buttons are mostly small elements, so these elements should have a reasonable shadow width
 
 	cc_body_gradient_enable = CC_COLGRAD_OFF/*g_settings.gradiant*/; //TODO: gradient is prepared for use but disabled at the moment till some other parts of gui parts are provide gradient
 	setColBodyGradient(cc_body_gradient_enable/*CColorGradient::gradientLight2Dark*/, CFrameBuffer::gradientVertical, CColorGradient::light);
@@ -127,8 +127,8 @@ void CComponentsButton::initVarButton(	const int& x_pos, const int& y_pos, const
 	cc_btn_result	= -1;
 	cc_btn_alias	= -1;
 
-	initParent(parent);
 	initCCBtnItems();
+	initParent(parent);
 }
 
 void CComponentsButton::initIcon()
diff --git a/src/gui/components/cc_frm_footer.cpp b/src/gui/components/cc_frm_footer.cpp
index e80c22177..bd483f9fd 100644
--- a/src/gui/components/cc_frm_footer.cpp
+++ b/src/gui/components/cc_frm_footer.cpp
@@ -68,7 +68,6 @@ void CComponentsFooter::initVarFooter(	const int& x_pos, const int& y_pos, const
 	width 	= w == 0 ? frameBuffer->getScreenWidth(true) : w;
 
 	//init footer height
-	cch_font 	= g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT];
 	height 		= max(h, cch_font->getHeight());
 
 	shadow		= shadow_mode;
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index 249167b2a..00a9eab22 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -86,6 +86,7 @@ void CComponentsHeader::initVarHeader(	const int& x_pos, const int& y_pos, const
 					fb_pixel_t color_shadow)
 {
 	cc_item_type 		= CC_ITEMTYPE_FRM_HEADER;
+	clear();
 	cc_txt_save_screen	= false;
 	x	= x_old = x_pos;
 	y	= y_old = y_pos;
@@ -194,7 +195,7 @@ void CComponentsHeader::setIcon(const char* icon_name)
 
 void CComponentsHeader::setIcon(const std::string& icon_name)
 {
-	cch_icon_name 	= icon_name;
+	cch_icon_name = icon_name;
 	initIcon();
 }
 
@@ -203,10 +204,8 @@ void CComponentsHeader::initIcon()
 	//init cch_icon_obj only if an icon available
 	if (cch_icon_name.empty()) {
 		cch_icon_w = 0;
-		if (cch_icon_obj){
-			delete cch_icon_obj;
-			cch_icon_obj = NULL;
-		}
+		if (cch_icon_obj)
+			removeCCItem(cch_icon_obj);
 		return;
 	}
 
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 7d6102423..d9e97b9a5 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -273,7 +273,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text
 			}
 			CComponentsShapeSquare col(stringstartposOption, y + 2, dx - stringstartposOption + x - 2, item_height - 4, NULL, false, right_frame_col, right_bg_col);
 			col.setFrameThickness(1); //NI
-			col.setCorner(RADIUS_LARGE);
+			col.setCorner(RADIUS_SMALL);
 			col.paint(false);
 		}
 		if (*right_text) {