GH95 - custom icons

#95
this if, else is a little bit complicated, see my above comment