make sure buttons in watchlist header are aligned correctly (376)

previously the active button was jutting out somewhat
use vertical align instead

also make the border radiuses work again by wrapping them so the button
is the first element not the hamburger and use mix in

Change-Id: I817ae3f14c672939024ce819dd1842a6807ec4d9
Merge "make sure buttons in watchlist header are aligned correctly (376)"