icons+small improvements