Moving styles around, updating icons