bugfix and icon