Updated toolbar icon layout, dropped fab