new shiny icons!
fixed conflict