Fix sample widget; remove unused icons; add icons