icons + other fixes