icons + other improvements