Slimming + changed some icons.