diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 6f1b4bc67..e47956351 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -700,7 +700,8 @@ void CBouquetList::paintItem(int pos)
 
 void CBouquetList::paintHead()
 {
-	CComponentsHeader header(x, y, width, theight, name);
+	std::string icon = "";
+	CComponentsHeader header(x, y, width, theight, name, icon, CComponentsHeader::CC_BTN_LEFT | CComponentsHeader::CC_BTN_RIGHT | CComponentsHeader::CC_BTN_MENU);
 	header.paint(CC_SAVE_SCREEN_NO);
 }
 
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index c9c29c075..c7485ec83 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -275,14 +275,14 @@ void CComponentsHeader::addContextButton(const int& buttons)
 		addContextButton(NEUTRINO_ICON_BUTTON_OKAY);
 	if (buttons & CC_BTN_MUTE)
 		addContextButton(NEUTRINO_ICON_BUTTON_MUTE);
-	if (buttons & CC_BTN_TOP)
-		addContextButton(NEUTRINO_ICON_BUTTON_TOP);
+	if (buttons & CC_BTN_UP)
+		addContextButton(NEUTRINO_ICON_BUTTON_UP);
 	if (buttons & CC_BTN_DOWN)
 		addContextButton(NEUTRINO_ICON_BUTTON_DOWN);
-	if (buttons & CC_BTN_RIGHT)
-		addContextButton(NEUTRINO_ICON_BUTTON_RIGHT);
 	if (buttons & CC_BTN_LEFT)
 		addContextButton(NEUTRINO_ICON_BUTTON_LEFT);
+	if (buttons & CC_BTN_RIGHT)
+		addContextButton(NEUTRINO_ICON_BUTTON_RIGHT);
 	if (buttons & CC_BTN_FORWARD)
 		addContextButton(NEUTRINO_ICON_BUTTON_FORWARD);
 	if (buttons & CC_BTN_BACKWARD)
diff --git a/src/gui/components/cc_frm_header.h b/src/gui/components/cc_frm_header.h
index 74201268e..b3f185e68 100644
--- a/src/gui/components/cc_frm_header.h
+++ b/src/gui/components/cc_frm_header.h
@@ -182,10 +182,10 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
 			CC_BTN_MUTE_ZAP_INACTIVE 	= 0x200,
 			CC_BTN_OKAY			= 0x400,
 			CC_BTN_MUTE			= 0x800,
-			CC_BTN_TOP			= 0x1000,
+			CC_BTN_UP			= 0x1000,
 			CC_BTN_DOWN			= 0x2000,
-			CC_BTN_RIGHT			= 0x4000,
-			CC_BTN_LEFT			= 0x8000,
+			CC_BTN_LEFT			= 0x4000,
+			CC_BTN_RIGHT			= 0x8000,
 			CC_BTN_FORWARD			= 0x10000,
 			CC_BTN_BACKWARD			= 0x20000,
 			CC_BTN_PAUSE			= 0x40000,
diff --git a/src/gui/components/cc_frm_scrollbar.cpp b/src/gui/components/cc_frm_scrollbar.cpp
index 7157e9625..dc277f6be 100644
--- a/src/gui/components/cc_frm_scrollbar.cpp
+++ b/src/gui/components/cc_frm_scrollbar.cpp
@@ -82,7 +82,7 @@ void CComponentsScrollBar::initVarSbForm(const int& count)
 	sb_up_obj 	= sb_down_obj = NULL;
 	sb_segments_obj = NULL;
 
-	sb_up_icon	= frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_TOP) ;
+	sb_up_icon	= frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ;
 	sb_down_icon	= frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_DOWN);
 
 	sb_segments_count = count;
diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp
index 438e3eebe..ed159f368 100644
--- a/src/gui/motorcontrol.cpp
+++ b/src/gui/motorcontrol.cpp
@@ -542,7 +542,7 @@ void CMotorControl::paintMenu()
 	paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_9,
 			installerMenue ? g_Locale->getText(LOCALE_MOTORCONTROL_CALC_POSITIONS) : g_Locale->getText(LOCALE_MOTORCONTROL_STEP_DECREASE));
 
-	paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_TOP, g_Locale->getText(LOCALE_MOTORCONTROL_POS_INCREASE));
+	paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_UP, g_Locale->getText(LOCALE_MOTORCONTROL_POS_INCREASE));
 	paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_DOWN, g_Locale->getText(LOCALE_MOTORCONTROL_POS_DECREASE));
 	paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_BLUE, g_Locale->getText(LOCALE_MOTORCONTROL_STEP_DRIVE));
 	paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_INFO_SMALL, g_Locale->getText(LOCALE_MOTORCONTROL_NETWORK));
diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp
index 6d64e7fc1..52728f3c1 100644
--- a/src/gui/widget/hintbox.cpp
+++ b/src/gui/widget/hintbox.cpp
@@ -273,7 +273,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
 	/* add scroll mode if needed */
 	if (h_lines > h_hint_obj){
 		txt_mode = text_mode | CTextBox::SCROLL;
-		ccw_buttons = ccw_buttons | CComponentsHeader::CC_BTN_TOP | CComponentsHeader::CC_BTN_DOWN;
+		ccw_buttons = ccw_buttons | CComponentsHeader::CC_BTN_UP | CComponentsHeader::CC_BTN_DOWN;
 	}
 
 	/* define y start position of infobox inside body */
diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h
index 5494aaaf4..0d19fafa6 100644
--- a/src/gui/widget/icons.h
+++ b/src/gui/widget/icons.h
@@ -57,8 +57,8 @@
 #define NEUTRINO_ICON_BUTTON_8		"8"
 #define NEUTRINO_ICON_BUTTON_9		"9"
 
-#define NEUTRINO_ICON_BUTTON_TOP	"up"
-#define NEUTRINO_ICON_BUTTON_TOP_SMALL	"up_small"
+#define NEUTRINO_ICON_BUTTON_UP	"up"
+#define NEUTRINO_ICON_BUTTON_UP_SMALL	"up_small"
 #define NEUTRINO_ICON_BUTTON_RIGHT	"right"
 #define NEUTRINO_ICON_BUTTON_DOWN	"down"
 #define NEUTRINO_ICON_BUTTON_DOWN_SMALL	"down_small"