diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp
index 1a2807af3..8299f2469 100644
--- a/src/gui/components/cc_item_picture.cpp
+++ b/src/gui/components/cc_item_picture.cpp
@@ -217,17 +217,21 @@ void CComponentsPicture::initCCItem()
 	 * by setters setWidth/setHeight
 	 * these steps are required to assign the current image dimensions to item dimensions
 	*/
-	if (keep_dx_aspect && dy){
+	if (keep_dx_aspect && dy)
+	{
 		float h_ratio = float(height)*100/(float)dy;
 		width = int(h_ratio*(float)dx/100);
 #ifdef BOXMODEL_APOLLO
 		if (do_scale && (width > 10 || height > 10))
 			width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
 #endif
+		keep_dx_aspect = false;
 	}
-	if (keep_dy_aspect && dx){
+	if (keep_dy_aspect && dx)
+	{
 		float w_ratio = float(width)*100/(float)dx;
 		height = int(w_ratio*(float)dy/100);
+		keep_dy_aspect = false;
 	}
 
 	//resize image and apply current assigned scale values
diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp
index beda47621..473fef132 100644
--- a/src/gui/moviebrowser/mb.cpp
+++ b/src/gui/moviebrowser/mb.cpp
@@ -1402,6 +1402,8 @@ TRACE("[mb]->%s:%d m_movieCover->getHeight(): %d\n", __func__, __LINE__, m_movie
 			m_movieCover->setWidth(0); // force recalculation
 TRACE("[mb]->%s:%d m_movieCover->getWidth(): %d\n", __func__, __LINE__, m_movieCover->getWidth());
 			m_movieCover->setHeight(cover_h, true);
+			if (m_movieCover->getWidth() > movieCoverBox.iWidth/3)
+				m_movieCover->setWidth(movieCoverBox.iWidth/3, true); // use maximal one third of box width
 
 			m_movieCover->setXPos(movieCoverBox.iX + movieCoverBox.iWidth - m_movieCover->getWidth() - 2*OFFSET_INNER_MID - OFFSET_SHADOW);
 			m_movieCover->setYPos(movieCoverBox.iY + (movieCoverBox.iHeight - m_movieCover->getHeight())/2);
@@ -3726,6 +3728,8 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
 			}
 			break;
 		case MB_INFO_SPACER: 				// 		= 21,
+			*item_string="";
+			break;
 		case MB_INFO_MAX_NUMBER: 			//		= 22
 		default:
 			*item_string="";