icons bugfix and stuff