icons + small fixes