Icons added + other changes