M data/rc.xml → data/rc.xml

@@ -634,10 +634,10 @@ if this is a negative value, then the delay is infinite and the
        submenu will not be shown until it is clicked on -->
   <submenuHideDelay>400</submenuHideDelay>
   <!-- time to delay before hiding a submenu when selecting another
-       entry in parent menu -->
+       entry in parent menu
        if this is a negative value, then the delay is infinite and the
        submenu will not be hidden until a different submenu is opened -->
-  <applicationIcons>yes</applicationIcons>
+  <showIcons>yes</showIcons>
   <!-- controls if icons appear in the client-list-(combined-)menu -->
   <manageDesktops>yes</manageDesktops>
   <!-- show the manage desktops section in the client-list-(combined-)menu -->

M data/rc.xsd → data/rc.xsd

@@ -393,7 +393,8 @@ <xsd:enumeration value="ActiveWindow"/>
             <xsd:enumeration value="InactiveWindow"/>
             <xsd:enumeration value="MenuHeader"/>
             <xsd:enumeration value="MenuItem"/>
-            <xsd:enumeration value="OnScreenDisplay"/>
+            <xsd:enumeration value="ActiveOnScreenDisplay"/>
+            <xsd:enumeration value="InactiveOnScreenDisplay"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="fontweight">