diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
index 39cdfa421..4892f58c7 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -41,7 +41,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 #include <gui/components/cc.h>
-#include <gui/widget/buttons.h>
+
 #include <gui/widget/hintbox.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
@@ -67,7 +67,7 @@ CBEBouquetWidget::CBEBouquetWidget()
 	state = beDefault;
 	Bouquets = NULL;
 	iheight = 0;
-	ButtonHeight = 0;
+	ButtonHeight = footer.getHeight();
 	fheight = 0;
 	theight = 0;
 }
@@ -154,12 +154,14 @@ const struct button_label CBEBouquetWidgetButtons[6] =
 
 void CBEBouquetWidget::paintFoot()
 {
-	::paintButtons(x, y+height, width, 6, CBEBouquetWidgetButtons, width, ButtonHeight);
+	size_t numbuttons = sizeof(CBEBouquetWidgetButtons)/sizeof(CBEBouquetWidgetButtons[0]);
+	footer.paintButtons(x, y+height, width, ButtonHeight, numbuttons, CBEBouquetWidgetButtons, width/numbuttons-20);
 }
 
 void CBEBouquetWidget::hide()
 {
-	frameBuffer->paintBackgroundBoxRel(x,y, width,height+ButtonHeight);
+	frameBuffer->paintBackgroundBoxRel(x,y, width,height);
+	footer.kill();
 }
 
 void CBEBouquetWidget::updateSelection(unsigned int newpos)
@@ -194,7 +196,6 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
 	if (parent)
 		parent->hide();
 
-	ButtonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8;
 	theight     = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
 	fheight     = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
 
diff --git a/src/gui/bedit/bouqueteditor_bouquets.h b/src/gui/bedit/bouqueteditor_bouquets.h
index f7f2c1f8e..1c935b587 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.h
+++ b/src/gui/bedit/bouqueteditor_bouquets.h
@@ -38,7 +38,7 @@
 #include <zapit/client/zapitclient.h>
 #include <zapit/channel.h>
 #include <zapit/bouquets.h>
-
+#include <gui/components/cc.h>
 #include <string>
 
 /* class for handling when bouquets changed.                  */
@@ -57,7 +57,7 @@ class CBEBouquetWidget : public CMenuTarget
 	private:
 
 		CFrameBuffer	*frameBuffer;
-
+		CComponentsFooter footer;
 		enum
 		{
 			beDefault,
diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
index 35d26784d..fadb234cc 100644
--- a/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/src/gui/bedit/bouqueteditor_channels.cpp
@@ -44,7 +44,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 #include "bouqueteditor_chanselect.h"
-#include <gui/widget/buttons.h>
+#include <gui/components/cc.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/keyboard_input.h>
@@ -73,7 +73,7 @@ CBEChannelWidget::CBEChannelWidget(const std::string & Caption, unsigned int Bou
 
 	theight     = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
 	fheight     = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
-	footerHeight= g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6;
+	footerHeight= footer.getHeight();
 
 	frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_YELLOW, &icol_w, &icol_h);
 	iheight = std::max(fheight, icol_h+2);
@@ -196,7 +196,8 @@ const struct button_label CBEChannelWidgetButtons[6] =
 
 void CBEChannelWidget::paintFoot()
 {
-	::paintButtons(x, y + (height-footerHeight), width, 6, CBEChannelWidgetButtons, width, footerHeight);
+	size_t numbuttons = sizeof(CBEChannelWidgetButtons)/sizeof(CBEChannelWidgetButtons[0]);
+	footer.paintButtons(x, y + (height-footerHeight), width, footerHeight, numbuttons, CBEChannelWidgetButtons, width/numbuttons-20);
 }
 
 std::string CBEChannelWidget::getInfoText(int index)
diff --git a/src/gui/bedit/bouqueteditor_channels.h b/src/gui/bedit/bouqueteditor_channels.h
index 6b834cf7a..fd17636fb 100644
--- a/src/gui/bedit/bouqueteditor_channels.h
+++ b/src/gui/bedit/bouqueteditor_channels.h
@@ -49,7 +49,7 @@ class CBEChannelWidget : public CMenuTarget
 		CFrameBuffer	*frameBuffer;
 		CComponentsDetailLine *dline;
 		CComponentsInfoBox *ibox;
-		
+		CComponentsFooter footer;
 		enum state_
 		{
 			beDefault,
diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp
index 1c6b08cfc..0875d657b 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.cpp
+++ b/src/gui/bedit/bouqueteditor_chanselect.cpp
@@ -41,7 +41,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 #include <gui/widget/icons.h>
-#include <gui/widget/buttons.h>
+
 
 #include <zapit/zapit.h>
 #include <zapit/getservices.h>
@@ -59,7 +59,7 @@ CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, CZap
 	info_height =  0;
 	theight     = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
 	fheight     = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
-	footerHeight= g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6;
+	footerHeight= footer.getHeight();
 
 	frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_GREEN, &icol_w, &icol_h);
 	iheight = std::max(fheight, icol_h+2);
@@ -251,7 +251,8 @@ void CBEChannelSelectWidget::paintFoot()
 			Button[0].locale = LOCALE_CHANNELLIST_FOOT_SORT_ALPHA;
 		break;
 	}
-	::paintButtons(x, y + (height-footerHeight), width, numbuttons, Button, width, footerHeight);
+
+	footer.paintButtons(x, y + (height-footerHeight), width, footerHeight, numbuttons, Button, width/numbuttons-20);
 }
 
 std::string CBEChannelSelectWidget::getInfoText(int index)
diff --git a/src/gui/bedit/bouqueteditor_chanselect.h b/src/gui/bedit/bouqueteditor_chanselect.h
index af5ce6743..a4d2ccaeb 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.h
+++ b/src/gui/bedit/bouqueteditor_chanselect.h
@@ -52,7 +52,7 @@ class CBEChannelSelectWidget : public CListBox
 		bool isChannelInBouquet( int index);
 		CComponentsDetailLine *dline;
 		CComponentsInfoBox *ibox;
-
+		CComponentsFooter footer;
 		uint	getItemCount();
 		void paintItem(uint32_t itemNr, int paintNr, bool selected);
 		void paintDetails(int index);