Merge branch 'adrifelt-alignment'
Merge remote-tracking branch 'upstream/master'
made both 2x
Merge pull request #102 from adrifelt/closeicon

Make the close icons match for the overlays