added more icon, tooltips