More adjustments
Cleanup x86 toolbar