diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index abbab66c8..f3ff5f8b6 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -1782,10 +1782,7 @@ void CAudioPlayerGui::paint()
 		int current_page;
 		getScrollBarData(&total_pages, &current_page, m_playlist.size(), m_listmaxshow, m_selected);
 
-		paintScrollBar(m_x + m_width - SCROLLBAR_WIDTH, m_y + m_title_height + OFFSET_SHADOW + OFFSET_INTER + m_header_height, SCROLLBAR_WIDTH, m_item_height*m_listmaxshow, total_pages, current_page);
-
-		// shadow
-		m_frameBuffer->paintBoxRel(m_x + m_width, m_y + m_title_height + OFFSET_SHADOW + OFFSET_INTER + m_header_height + OFFSET_SHADOW, OFFSET_SHADOW, m_item_height*m_listmaxshow, COL_SHADOW_PLUS_0);
+		paintScrollBar(m_x + m_width - SCROLLBAR_WIDTH, m_y + m_title_height + OFFSET_SHADOW + OFFSET_INTER + m_header_height, SCROLLBAR_WIDTH, m_item_height*m_listmaxshow, total_pages, current_page, CC_SHADOW_ON);
 	}
 
 	paintTitleBox();
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 1a489d7cb..9a49f973b 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -1492,11 +1492,7 @@ void CFileBrowser::paint()
 	int total_pages;
 	int current_page;
 	getScrollBarData(&total_pages, &current_page, filelist.size(), listmaxshow, selected);
-
-	paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);
-
-	// shadow
-	frameBuffer->paintBoxRel(x + width, y + header_height + OFFSET_SHADOW, OFFSET_SHADOW, item_height*listmaxshow, COL_SHADOW_PLUS_0);
+	paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page, CC_SHADOW_ON);
 }
 
 void CFileBrowser::SMSInput(const neutrino_msg_t msg)
diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp
index 2cdd04039..9ccb9952f 100644
--- a/src/gui/pictureviewer.cpp
+++ b/src/gui/pictureviewer.cpp
@@ -758,11 +758,7 @@ void CPictureViewerGui::paint()
 	int total_pages;
 	int current_page;
 	getScrollBarData(&total_pages, &current_page, playlist.size(), listmaxshow, selected);
-
-	paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);
-
-	// shadow
-	frameBuffer->paintBoxRel(x + width, y + header_height + OFFSET_SHADOW, OFFSET_SHADOW, item_height*listmaxshow, COL_SHADOW_PLUS_0);
+	paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page, CC_SHADOW_ON);
 
 	paintFoot();
 	paintInfo();