Fix block selection selection

Casting issue? Either way casting to short fixes it.
Offset selection calculation by 2px
Moved icon location to be centered in highlight.