Fixed   dimensions for  different screen sizes. Fixed icons
Merge remote-tracking branch 'origin/master'