Merge "Thumbnails: Set margin on magnify icon"