Also separate out Apex-specific styling into a separate file. The current toolbar is already supposed to be aligned with Apex so the visual changes here are minimal. Bug: T223155 Change-Id: I7a0a21809018e0094d50992054523d20be3c5473