Merged buttonlet icons with glyphs since they are used the same way