Improve icon, header spacing