Added icon handling

Because icons are neat