fix npe & iae
removed unused services & duplicate class
uncomment
added resource root icons for future usage