Fix star size
Change size of backButton
Merge remote-tracking branch 'origin/master'