Proper icons added and other changes