Selector bugs fixed, selfmade icons added