diff --git a/options.api/src/org/netbeans/modules/options/OptionsCategoryImpl.java b/options.api/src/org/netbeans/modules/options/OptionsCategoryImpl.java
--- a/options.api/src/org/netbeans/modules/options/OptionsCategoryImpl.java
+++ b/options.api/src/org/netbeans/modules/options/OptionsCategoryImpl.java
@@ -83,7 +83,7 @@
 
     @Override
     public Icon getIcon() {
-        if (icon == null) {
+        if (icon == null && iconBase != null) {
             Image image = ImageUtilities.loadImage(iconBase);
             if (image != null) {
                 return new ImageIcon(image);
diff --git a/tasklist.todo/src/org/netbeans/modules/tasklist/todo/layer.xml b/tasklist.todo/src/org/netbeans/modules/tasklist/todo/layer.xml
--- a/tasklist.todo/src/org/netbeans/modules/tasklist/todo/layer.xml
+++ b/tasklist.todo/src/org/netbeans/modules/tasklist/todo/layer.xml
@@ -30,10 +30,9 @@
         <folder name="Advanced">
             <attr name="position" intvalue="0"/>
             <file name="ToDo.instance">
-                <attr name="instanceCreate" methodvalue="org.netbeans.spi.options.AdvancedOption.createSubCategory"/>
-
+                <attr name="instanceCreate" methodvalue="org.netbeans.spi.options.OptionsCategory.createCategory"/>
                 <attr name="controller" newvalue="org.netbeans.modules.tasklist.todo.settings.ToDoOptionsController"/>
-                <attr name="displayName" bundlevalue="org.netbeans.modules.tasklist.todo.settings.Bundle#LBL_Options"/>
+                <attr name="categoryName" bundlevalue="org.netbeans.modules.tasklist.todo.settings.Bundle#LBL_Options"/>
                 <attr name="toolTip" bundlevalue="org.netbeans.modules.tasklist.todo.settings.Bundle#HINT_Options"/>
                 <attr name="keywords" bundlevalue="org.netbeans.modules.tasklist.todo.settings.Bundle#KW_ToDo"/>
                 <attr name="keywordsCategory" stringvalue="Advanced/ToDo"/>