GH95 - custom icons

#95
some duplicated code here