removed unused icons
some small code changes