diff --git a/src/gui/components/cc_types.h b/src/gui/components/cc_types.h
index d73bd1549..3c32c0275 100644
--- a/src/gui/components/cc_types.h
+++ b/src/gui/components/cc_types.h
@@ -201,12 +201,16 @@ typedef struct button_label_cc
 #define CC_WIDTH_MIN		CFrameBuffer::getInstance()->scale2Res(16)
 #define CC_HEIGHT_MIN		CC_WIDTH_MIN
 
+//shadow defines
 #define CC_SHADOW_OFF 			0x0
 #define CC_SHADOW_RIGHT 		0x2
 #define CC_SHADOW_BOTTOM 		0x4
 #define CC_SHADOW_CORNER_BOTTOM_LEFT	0x8
 #define CC_SHADOW_CORNER_BOTTOM_RIGHT	0x10
 #define CC_SHADOW_CORNER_TOP_RIGHT	0x20
+//prepared combined shadow defines
+#define CC_SHADOW_RIGHT_CORNER_ALL	CC_SHADOW_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT
+#define CC_SHADOW_BOTTOM_CORNER_ALL	CC_SHADOW_BOTTOM | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_BOTTOM_LEFT
 #define CC_SHADOW_ON 			CC_SHADOW_RIGHT | CC_SHADOW_BOTTOM | CC_SHADOW_CORNER_BOTTOM_LEFT | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT
 
 #define CC_SAVE_SCREEN_YES 	true
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 8fb22635a..05768c541 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -1443,7 +1443,7 @@ void EpgPlus::paint()
 		this->maxNumberOfDisplayableEntries,
 		this->selectedChannelEntry == NULL ? 0 : this->selectedChannelEntry->index);
 
-	paintScrollBar(this->sliderX, this->sliderY, this->sliderWidth, this->sliderHeight, total_pages, current_page, CC_SHADOW_ON);
+	paintScrollBar(this->sliderX, this->sliderY, this->sliderWidth, this->sliderHeight, total_pages, current_page, CC_SHADOW_RIGHT_CORNER_ALL);
 }
 
 // -- EPG+ Menue Handler Class
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index ab6e728ab..0d18578dd 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -1388,7 +1388,7 @@ void CTimerList::paintHead()
 	if (header == NULL)
 	{
 		header = new CComponentsHeader(x, y, width, header_height, LOCALE_TIMERLIST_NAME, NEUTRINO_ICON_TIMER, CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT, NULL, CC_SHADOW_ON);
-		header->enableClock(true, " %d.%m.%Y, %H:%M ", " %d.%m.%Y, %H %M ", true);
+		header->enableClock(true, " %d.%m.%Y - %H:%M ", NULL, false);
 	}
 	header->paint(CC_SAVE_SCREEN_NO);
 }
@@ -1401,7 +1401,7 @@ void CTimerList::paintFoot()
 		if (timer != NULL)
 		{
 			//replace info button with dummy if timer is not type REC or ZAP
-			if (timer->eventType == CTimerd::TIMER_RECORD || timer->eventType == CTimerd::TIMER_ZAPTO) //NI
+			if (timer->eventType == CTimerd::TIMER_RECORD || timer->eventType == CTimerd::TIMER_ZAPTO)
 				TimerListButtons[4].button = NEUTRINO_ICON_BUTTON_INFO_SMALL;
 			else
 				TimerListButtons[4].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;