Update feature: Moved system class and updated system icons