themes,icons: clean-up