Alright, I've reverted the counter back to it's original style and placement. I think that's the cleanest looking variation.
Added the fix for thumbs as well.