remove unused style and use color bases on toolbar
nuke focus outline, add push indication to toolbar