diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 6864276e2..082331577 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -2123,7 +2123,7 @@ void CChannelList::paintHead()
 			headerClock->setClockIntervall(10);
 
 		}
-		headerClock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]);
+		headerClock->setClockFont(SNeutrinoSettings::FONT_TYPE_MENU_TITLE);
 		headerClock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT);
 		headerClock->setYPos(y);
 		headerClock->setHeight(theight);
diff --git a/src/gui/infoclock.cpp b/src/gui/infoclock.cpp
index c6635fff4..75e063064 100644
--- a/src/gui/infoclock.cpp
+++ b/src/gui/infoclock.cpp
@@ -51,7 +51,7 @@ CInfoClock* CInfoClock::getInstance()
 
 void CInfoClock::initVarInfoClock()
 {
-	cl_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
+	setClockFont(SNeutrinoSettings::FONT_TYPE_MENU_TITLE);
 	Init();
 }
 
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 1e5f31946..dd62828c9 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -260,7 +260,7 @@ void CInfoViewer::paintTime (bool show_dot)
 		clock->doPaintBg(false);
 	}
 	clock->setDimensionsAll(clock_x, clock_y, clock_w, clock_h);
-	clock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]);
+	clock->setClockFont(SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME);
 	clock->setClockFormat(show_dot ? "%H:%M" : "%H.%M");
 	
 	clock->paint(CC_SAVE_SCREEN_NO);
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index d2380fdd3..e9687e322 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -614,7 +614,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 	else if (actionKey == "running_clock"){	
 		if (clock_r == NULL){
 			clock_r = new CComponentsFrmClock(100, 50, 0, 50, "%H.%M:%S");
-			clock_r->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]);
+			clock_r->setClockFont(SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME);
 			clock_r->setClockIntervall(1);
 // 			clock_r->doPaintBg(false);
 		}
@@ -635,7 +635,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 	else if (actionKey == "clock"){
 		if (clock == NULL){
 			clock = new CComponentsFrmClock(100, 50, 0, 50, "%H:%M", false);
-			clock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]);
+			clock->setClockFont(SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME);
 		}
 
 		if (!clock->isPainted())