Make header button markup more universal

Also, remove unnecessary CSS classes from Watchlist header.

Change-Id: I9efca3b617ea6b18712ef3467b5b342b35cf32c0
Merge "Make header button markup more universal"