Fixes to k.h.d. and add icons.