change icons system, style fixes and fix #39