diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 602b446d5..002073996 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -744,13 +744,11 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 	int logo_w = 0;
 	int logo_h = 0;
 	int logo_w_max = ox / 4;
-	if(channel) {
-		if(g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, channel->getName(), lname, &logo_w, &logo_h)) {
-			if((logo_h > (toph-4)) || (logo_w > logo_w_max)) {
-				g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, logo_w_max, toph-4);
-			}
-			pic_offx = logo_w + 10;
+	if(g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, g_Zapit->getChannelName(channel_id), lname, &logo_w, &logo_h)) {
+		if((logo_h > (toph-4)) || (logo_w > logo_w_max)) {
+			g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, logo_w_max, toph-4);
 		}
+		pic_offx = logo_w + 10;
 	}
 
 	int pos;
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index fa6821884..8186571f2 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1472,7 +1472,7 @@ void CMovieBrowser::refreshMovieInfo(void)
 	//printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgEpgId, m_movieSelectionHandler->epgId, m_cBoxFrameTitleRel.iY);
 	int lx = 0;//never read m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-logo_w-10;
 	int ly = 0;//never read m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-logo_h)/2;
-	short pb_hdd_offset = 104;
+	short pb_hdd_offset = g_settings.infobar_show_sysfs_hdd ? 104 : 0;
 	if (show_mode == MB_SHOW_YT)
 		pb_hdd_offset = 0;