diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 0b08e2236..55f53c35b 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -122,7 +122,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
 	previous_channellist_additional = -1;
 	eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
 	dline = NULL;
-	cc_minitv = NULL;
+
 	minitv_is_active = false;
 	headerNew = true;
 	bouquet = NULL;
@@ -133,6 +133,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
 
 	paint_events_index = -2;
 	CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
+	CNeutrinoApp::getInstance()->OnAfterSetupFonts.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
 }
 
 CChannelList::~CChannelList()
@@ -952,9 +953,9 @@ void CChannelList::hide()
 	paint_events(-2); // cancel paint_events thread
 	if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV
 	{
-		if (cc_minitv)
-			delete cc_minitv;
-		cc_minitv = NULL;
+		if (cc_minitv){
+			delete cc_minitv; cc_minitv = NULL;
+		}
 	}
 	if(header)
 		header->kill();
@@ -2162,13 +2163,17 @@ void CChannelList::paintHead()
 
 CComponentsHeader* CChannelList::getHeaderObject()
 {
-	return header;
+	if (header)
+		return header;
+	return NULL;
 }
 
 void CChannelList::ResetModules()
 {
-	delete header;
-	header = NULL;
+	if (header){
+		delete header;
+		header = NULL;
+	}
 	if(dline){
 		delete dline;
 		dline = NULL;
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index edde1bbda..40d2c74d1 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -67,7 +67,7 @@ enum {
 class CFrameBuffer;
 class CBouquet;
 
-class CChannelList : public CListHelpers
+class CChannelList : public CListHelpers, public sigc::trackable
 {
 private:
 	enum state_
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 4ecad5660..e211dd68c 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -127,10 +127,6 @@ CEpgData::CEpgData()
 	mp_movie_info 	= NULL;
 	header     	= NULL;
 	Bottombox 	= NULL;
-	lpic		= NULL;
-	rpic		= NULL;
-	lText 		= NULL;
-	rText		= NULL;
 	pb		= NULL;
 	font_title	= NULL;
 }
@@ -1524,9 +1520,6 @@ void CEpgData::ResetModules()
 	}
 	if (Bottombox){
 		delete Bottombox; Bottombox = NULL;
-		// bottom box items are destroyed but explicit reset of bottom box items here required
-		lpic = rpic = NULL;
-		lText = rText = NULL;
 	}
 	if (pb){
 		delete pb; pb = NULL;
diff --git a/src/gui/epgview.h b/src/gui/epgview.h
index d873b82de..617fff66f 100644
--- a/src/gui/epgview.h
+++ b/src/gui/epgview.h
@@ -52,8 +52,6 @@ class CEpgData
 		CEPGData		epgData;
 		CComponentsHeader	*header;
 		CNaviBar 		*Bottombox;
-		CComponentsPictureScalable *lpic, *rpic;
-		CComponentsText 	*lText, *rText;
 		CProgressBar 		*pb;
 		Font			*font_title;
 		std::string 		epg_date;