diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index a2eb06581..40866f171 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -97,7 +97,7 @@ void CUpnpBrowserGui::Init()
 	topbox.setColorAll(COL_FRAME_PLUS_0, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0, COL_MENUHEAD_TEXT);
 	topbox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]);
 	topbox.enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Head_gradient_direction);
-	topbox.enableShadow(CC_SHADOW_ON, -1, true);
+	topbox.enableShadow(CC_SHADOW_ON);
 
 	infobox.enableFrame(true, 1); //NI
 	infobox.setCorner(RADIUS_LARGE);
@@ -105,7 +105,7 @@ void CUpnpBrowserGui::Init()
 	infobox.setTextColor(COL_MENUCONTENTDARK_TEXT);
 	infobox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU]);
 	infobox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction);
-	infobox.enableShadow(CC_SHADOW_ON, -1, true);
+	infobox.enableShadow(CC_SHADOW_ON);
 
 	timebox.enableFrame(true, 1); //NI
 	timebox.setCorner(RADIUS_LARGE);
@@ -113,7 +113,7 @@ void CUpnpBrowserGui::Init()
 	timebox.setTextColor(infobox.getTextColor());
 	timebox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU]);
 	timebox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction);
-	timebox.enableShadow(CC_SHADOW_ON, -1, true);
+	timebox.enableShadow(CC_SHADOW_ON);
 
 	m_width = m_frameBuffer->getScreenWidthRel();
 	m_height = m_frameBuffer->getScreenHeightRel();
@@ -197,7 +197,7 @@ int CUpnpBrowserGui::exec(CMenuTarget* parent, const std::string & /*actionKey*/
 	stopAudio();
 
 	m_frameBuffer->stopFrame();
-	m_frameBuffer->Clear();
+	topbox.kill();
 
 	CZapit::getInstance()->EnablePlayback(true);
 	CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE , m_LastMode);
@@ -922,7 +922,6 @@ bool CUpnpBrowserGui::selectItem(std::string id)
 
 	delete entries;
 	timeout = 0;
-	m_frameBuffer->Clear();
 
 	return endall;
 }
@@ -948,8 +947,8 @@ void CUpnpBrowserGui::paintDeviceInfo()
 
 	topbox.setDimensionsAll(m_x, m_y, m_width, m_topbox_height);
 	topbox.setCorner(RADIUS_LARGE);
-	topbox.setText(tmp, CTextBox::AUTO_WIDTH | CTextBox::CENTER);
-	topbox.paint0();
+	if (topbox.setText(tmp, CTextBox::AUTO_WIDTH | CTextBox::CENTER))
+		topbox.paint0();
 }
 
 void CUpnpBrowserGui::paintDevice(unsigned int _pos)
@@ -1150,8 +1149,8 @@ void CUpnpBrowserGui::paintItemInfo(UPnPEntry *entry)
 	}
 
 	topbox.setCorner(RADIUS_LARGE);
-	topbox.setText(tmp, CTextBox::AUTO_WIDTH | CTextBox::CENTER);
-	topbox.paint0();
+	if (topbox.setText(tmp, CTextBox::AUTO_WIDTH | CTextBox::CENTER))
+		topbox.paint0();
 }
 
 void CUpnpBrowserGui::paintItems(std::vector<UPnPEntry> *entry, unsigned int selected, unsigned int max, unsigned int offset)
@@ -1211,8 +1210,8 @@ void CUpnpBrowserGui::paintDetails(UPnPEntry *entry, bool use_playing)
 				text = m_playing_entry.title;
 				text += !m_playing_entry.artist.empty() ? " - " + m_playing_entry.artist : "";
 				text += "\n" + m_playing_entry.album;
-				infobox.setText(text, CTextBox::AUTO_WIDTH);
-				infobox.paint0();
+				if (infobox.setText(text, CTextBox::AUTO_WIDTH))
+					infobox.paint0();
 			}
 		}else{
 			if (!entry)
@@ -1221,8 +1220,8 @@ void CUpnpBrowserGui::paintDetails(UPnPEntry *entry, bool use_playing)
 			text = entry->title;
 			text += !entry->artist.empty() ? " - " + entry->artist : "";
 			text += "\n" + entry->album;
-			infobox.setText(text, CTextBox::AUTO_WIDTH);
-			infobox.paint0();
+			if (infobox.setText(text, CTextBox::AUTO_WIDTH))
+				infobox.paint0();
 		}
 		if (image)
 			image->paint0();
@@ -1232,8 +1231,11 @@ void CUpnpBrowserGui::paintDetails(UPnPEntry *entry, bool use_playing)
 
 void CUpnpBrowserGui::paintItem2DetailsLine(int pos)
 {
-	if (pos < 0)
+	if (pos < 0){
+		if (dline)
+			dline->kill();
 		return;
+	}
 
 	int xpos  = m_x - DETAILSLINE_WIDTH;
 	int ypos1 = m_item_y + pos*m_item_height;