diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index ebf51f016..ebb30405c 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -3446,7 +3446,7 @@ int CMenuSelector::exec(CMenuTarget* /*parent*/)
 	return menu_return::RETURN_EXIT;
 };
 
-int CMenuSelector::paint(bool selected, bool /*last*/)
+int CMenuSelector::paint(bool selected)
 {
 	CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();
 
diff --git a/src/gui/moviebrowser.h b/src/gui/moviebrowser.h
index d12180ba5..50db7dc1c 100644
--- a/src/gui/moviebrowser.h
+++ b/src/gui/moviebrowser.h
@@ -439,7 +439,7 @@ class CMenuSelector : public CMenuItem
 		CMenuSelector(const char * OptionName, const bool Active = true, char * OptionValue = NULL, int* ReturnInt = NULL,int ReturnIntValue = 0);
 		CMenuSelector(const char * OptionName, const bool Active , std::string & OptionValue, int* ReturnInt = NULL,int ReturnIntValue = 0);
 		int exec(CMenuTarget* parent);
-		int paint(bool selected, bool last = 0);
+		int paint(bool selected);
 		int getHeight(void) const{return height;};
 		bool isSelectable(void) const {	return active;}
 };
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 029e6d3c1..f752bf8ec 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -130,8 +130,6 @@ void CMenuItem::paintItemBackground (const bool select_mode, const int &item_hei
 	
 	if(select_mode)
 		frameBuffer->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE);
-	//else if(last) ?? Why do we need this?
-		//frameBuffer->paintBoxRel(x, y, dx, item_height, i_bgcolor, RADIUS_LARGE, CORNER_BOTTOM); //FIXME 
 	else
 		frameBuffer->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE);
 }
@@ -510,7 +508,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 			CMenuItem* titem = items[i];
 			if ((titem->directKey != CRCInput::RC_nokey) && (titem->directKey == msg)) {
 				if (titem->isSelectable()) {
-					items[selected]->paint( false, (i == items.size()-1) );
+					items[selected]->paint( false );
 					selected= i;
 					msg= CRCInput::RC_ok;
 				} else {
@@ -561,8 +559,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 								CMenuItem* item = items[pos];
 								if ( item->isSelectable() ) {
 									if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) {
-										items[selected]->paint( false, (pos == (int) items.size()-1) );
-										item->paint( true , (count == items.size()-1));
+										items[selected]->paint( false );
+										item->paint( true );
 										selected = pos;
 									} else {
 										selected=pos;
@@ -578,8 +576,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 								CMenuItem* item = items[pos];
 								if ( item->isSelectable() ) {
 									if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) {
-										items[selected]->paint( false, (count == items.size()-1) );
-										item->paint( true, (count == items.size()-1) );
+										items[selected]->paint( false );
+										item->paint( true );
 										selected = pos;
 									} else {
 										selected=pos;
@@ -632,7 +630,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 								if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page]))
 								{ // Item is currently on screen
 									//clear prev. selected
-									items[selected]->paint( false, (selected == (int) (page_start[current_page + 1]-1)) );
+									items[selected]->paint( false );
 									//select new
 									item->paint( true );
 									selected = pos;
@@ -1061,7 +1059,7 @@ int CMenuOptionNumberChooser::exec(CMenuTarget*)
 	return menu_return::RETURN_NONE;
 }
 
-int CMenuOptionNumberChooser::paint(bool selected, bool /*last*/)
+int CMenuOptionNumberChooser::paint(bool selected)
 {
 	const char * l_option;
 	char option_value[11];
@@ -1249,7 +1247,7 @@ int CMenuOptionChooser::exec(CMenuTarget*)
 	return ret;
 }
 
-int CMenuOptionChooser::paint( bool selected , bool /*last*/)
+int CMenuOptionChooser::paint( bool selected)
 {
 	if(optionName != NONEXISTANT_LOCALE)
 		optionNameString  = g_Locale->getText(optionName);
@@ -1403,7 +1401,7 @@ int CMenuOptionStringChooser::exec(CMenuTarget* parent)
 	return ret;
 }
 
-int CMenuOptionStringChooser::paint( bool selected, bool /*last*/ )
+int CMenuOptionStringChooser::paint( bool selected )
 {
 	const char * l_optionName = g_Locale->getText(optionName);
 	
@@ -1468,7 +1466,7 @@ int CMenuOptionLanguageChooser::exec(CMenuTarget*)
 		return menu_return::RETURN_NONE;
 }
 
-int CMenuOptionLanguageChooser::paint( bool selected, bool /*last*/ )
+int CMenuOptionLanguageChooser::paint( bool selected )
 {
 	active = true;
 		
@@ -1589,7 +1587,7 @@ const char * CMenuForwarder::getName(void)
 	return g_Locale->getText(text);
 }
 
-int CMenuForwarder::paint(bool selected, bool /*last*/)
+int CMenuForwarder::paint(bool selected)
 {
 	int height = getHeight();
  	const char * l_text = getName();
@@ -1684,7 +1682,7 @@ int CMenuSeparator::getWidth(void)
 	return w;
 }
 
-int CMenuSeparator::paint(bool selected, bool /*last*/)
+int CMenuSeparator::paint(bool selected)
 {
 	int height;
 	CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 4359aff54..dc501fa6a 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -106,7 +106,7 @@ class CMenuItem
 		
 		virtual void init(const int X, const int Y, const int DX, const int OFFX);
 
-		virtual int paint (bool selected = false, bool last = false) = 0;
+		virtual int paint (bool selected = false) = 0;
 		virtual int getHeight(void) const = 0;
 		virtual int getWidth(void)
 		{
@@ -162,7 +162,7 @@ class CMenuSeparator : public CMenuItem
 		CMenuSeparator(const int Type = 0, const neutrino_locale_t Text = NONEXISTANT_LOCALE);
 		virtual ~CMenuSeparator(){}
 
-		int paint(bool selected=false, bool last = false);
+		int paint(bool selected=false);
 		int getHeight(void) const;
 		int getWidth(void);
 
@@ -191,7 +191,7 @@ class CMenuForwarder : public CMenuItem
 
 	virtual ~CMenuForwarder(){}
 
-	int paint(bool selected=false, bool last = false);
+	int paint(bool selected=false);
 	int getHeight(void) const;
 	int getWidth(void);
 	void setOption(const char *Option);
@@ -262,7 +262,7 @@ private:
  public:
 	CMenuOptionNumberChooser(const neutrino_locale_t name, int * const OptionValue, const bool Active, const int min_value, const int max_value, CChangeObserver * const Observ = NULL, const int print_offset = 0, const int special_value = 0, const neutrino_locale_t special_value_name = NONEXISTANT_LOCALE, const char * non_localized_name = NULL, bool sliderOn = false );
 
-	int paint(bool selected, bool last = false);
+	int paint(bool selected);
 
 	int exec(CMenuTarget* parent);
 	int isMenueOptionChooser(void) const{return 1;}
@@ -314,7 +314,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
 	int getOptionValue(void) const;
 	int getWidth(void);
 
-	int paint(bool selected, bool last = 0);
+	int paint(bool selected);
 	std::string getOptionName() {return optionNameString;};
 
 	int exec(CMenuTarget* parent);
@@ -336,7 +336,7 @@ class CMenuOptionStringChooser : public CMenuItem
 
 		void addOption(const char * value);
 		void removeOptions(){options.clear();};
-		int paint(bool selected, bool last = 0);
+		int paint(bool selected);
 		int getHeight(void) const
 		{
 			return height;
@@ -362,7 +362,7 @@ class CMenuOptionLanguageChooser : public CMenuItem
 		~CMenuOptionLanguageChooser();
 
 		void addOption(const char * value);
-		int paint(bool selected, bool last = 0);
+		int paint(bool selected);
 		int getHeight(void) const
 		{
 			return height;