diff --git a/metadata.html b/metadata.html
index ffe2d61..a675e2b 100644
--- a/metadata.html
+++ b/metadata.html
@@ -42,8 +42,9 @@
 </x-meta>
 
 <x-meta id="polymer-ui-menu-button" label="Polymer Menu Button" isContainer>
-
 <x-meta id="polymer-ui-menu-item" label="Polymer Menu Item"></x-meta>
+<x-meta id="polymer-ui-submenu-item" label="Polymer Submenu"></x-meta>
+
 <x-meta id="polymer-ui-nav-arrow" label="Polymer Nav Arrow"></x-meta>
 
 <x-meta id="polymer-ui-ratings" label="Polymer Ratings">
diff --git a/polymer-ui-icon-button/metadata.html b/polymer-ui-icon-button/metadata.html
new file mode 100644
index 0000000..2f625bb
--- /dev/null
+++ b/polymer-ui-icon-button/metadata.html
@@ -0,0 +1,61 @@
+<x-meta id="polymer-ui-icon-button" label="Polymer Icon Button">
+  <!--
+  /**
+   * @module Polymer UI Elements
+   */
+  /**
+   * polymer-ui-icon-button enables you to place an image centered in a button.
+   *
+   * Example:
+   *
+   *     <polymer-ui-icon-button src="star.png"></polymer-ui-icon-button>
+   *
+   * Polymer includes an icon set.  The property "icon" can be used
+   * to specify which icon to use.
+   *
+   * Example:
+   *
+   *     <polymer-ui-icon-button icon="menu"></polymer-ui-icon-button>
+   *
+   * @class polymer-ui-icon-button
+   */
+  -->
+  <template>
+    <polymer-ui-icon-button icon="menu" theme="polymer-ui-light-theme"></polymer-ui-icon-button>
+  </template>
+  <!--
+  /**
+    * The URL of an image for the icon.
+    *
+    * @attribute src
+    * @type string
+    * @default ''
+    */
+  /**
+    * If true, border is placed around the button to indicate
+    * active state.
+    *
+    * @attribute active
+    * @type boolean
+    * @default false
+    */
+  /**
+    * Specifies the icon from the Polymer icon set.
+    *
+    * @attribute icon
+    * @type string
+    * @default ''
+    */
+  -->
+  <property name="index" hidden="true"></property>
+  <!--
+  /**
+    * If a theme is applied that includes an icon set, the index of the 
+    * icon to display.
+    *
+    * @attribute index
+    * @type number
+    * @default -1
+  */
+  -->
+</x-meta>
diff --git a/polymer-ui-icon/polymer-ui-icon.html b/polymer-ui-icon/polymer-ui-icon.html
index 28d1786..1aa2420 100644
--- a/polymer-ui-icon/polymer-ui-icon.html
+++ b/polymer-ui-icon/polymer-ui-icon.html
@@ -6,9 +6,9 @@
 -->
 <!--
 /**
-* Polymer-UI Elements
+* Polymer UI Elements
 *
-* @module Polymer-UI Elements
+* @module Polymer UI Elements
 */  
 /**
  * polymer-ui-icon is a 24x24 glyph expressed as a background-image.