lower all icons a little on authentication page
fix merge conflicts
befoer sleep
Merge branch 'master' of https://github.com/sw5813/heartbeat