lolwut
Merge remote-tracking branch 'origin/master'
Fixed size for side buttons.