fixes + icons