settings and candies icon animated go up
Merge remote-tracking branch 'origin/master'