Changed icons, moved common classes to it.