Further icon fixes