new icons
added merge from database