apm and fix icons