diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index f0f91474c..c8c581a0a 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -472,7 +472,7 @@ void CInfoViewer::show_current_next(bool new_chan, int  epgpos)
 	}
 }
 
-void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel,
+void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channel_Id, const std::string &Channel,
 				 const std::string &g_file_epg, const std::string &g_file_epg1,
 				 const int duration, const int curr_pos)
 {
@@ -506,7 +506,7 @@ void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel
 	infoViewerBB->is_visible = true;
 
 	ChannelName = Channel;
-	channel_id = 0;
+	channel_id = Channel_Id;
 
 	/* showChannelLogo() changes this, so better reset it every time... */
 	ChanNameX = BoxStartX + ChanWidth + SHADOW_OFFSET;
@@ -520,7 +520,11 @@ void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel
 
 	infoViewerBB->paintshowButtonBar();
 
-	g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + 10 , ChanNameY + time_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 ,ChannelName, COL_INFOBAR_TEXT, 0, true);	// UTF-8
+	int ChannelLogoMode = 0;
+	if (g_settings.infobar_show_channellogo > 1)
+		ChannelLogoMode = showChannelLogo(channel_id, 0);
+	if (ChannelLogoMode == 0 || ChannelLogoMode == 3 || ChannelLogoMode == 4)
+		g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + 10 , ChanNameY + time_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 ,ChannelName, COL_INFOBAR_TEXT, 0, true);	// UTF-8
 
 	// show_Data
 	if (CMoviePlayerGui::getInstance().file_prozent > 100)
diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h
index 340298f30..367d609c3 100644
--- a/src/gui/infoviewer.h
+++ b/src/gui/infoviewer.h
@@ -157,7 +157,7 @@ class CInfoViewer
 	CInfoViewer();
 	~CInfoViewer();
 
-	void	showMovieTitle(const int playState, const std::string &title,
+	void	showMovieTitle(const int playState, const t_channel_id &channel_id, const std::string &title,
 				const std::string &g_file_epg, const std::string &g_file_epg1,
 				const int duration, const int curr_pos);
 
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 557430a97..1b9ae1f4a 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -853,13 +853,13 @@ void CMoviePlayerGui::callInfoViewer(/*const int duration, const int curr_pos*/)
 	getCurrentAudioName( is_file_player, currentaudioname);
 
 	if (isMovieBrowser && p_movie_info) {
-		g_InfoViewer->showMovieTitle(playstate, p_movie_info->epgChannel, p_movie_info->epgTitle, p_movie_info->epgInfo1,
+		g_InfoViewer->showMovieTitle(playstate, p_movie_info->epgEpgId >>16, p_movie_info->epgChannel, p_movie_info->epgTitle, p_movie_info->epgInfo1,
 					     duration, position);
 		return;
 	}
 
 	/* not moviebrowser => use the filename as title */
-	g_InfoViewer->showMovieTitle(playstate, file_name, "", "", duration, position);
+	g_InfoViewer->showMovieTitle(playstate, 0, file_name, "", "", duration, position);
 }
 
 bool CMoviePlayerGui::getAudioName(int apid, std::string &apidtitle)