diff --git a/entries/toolbar.xml b/entries/toolbar.xml
diff --git a/resources/header/example1.html → resources/toolbar/example1.html b/resources/header/example1.html → resources/toolbar/example1.html
diff --git a/resources/footer/example3.html → resources/toolbar/example10.html b/resources/footer/example3.html → resources/toolbar/example10.html
diff --git a/resources/footer/example4.html → resources/toolbar/example11.html b/resources/footer/example4.html → resources/toolbar/example11.html
diff --git a/resources/header/example2.html → resources/toolbar/example2.html b/resources/header/example2.html → resources/toolbar/example2.html
@@ -25,9 +25,9 @@
 <body>
 <div data-role="page" style="max-height:90px; min-height:90px;">
 	<div data-role="header">
-		<a href="index.html" data-icon="delete">Cancel</a>
+		<a href="index.html" data-role="button" data-icon="delete">Cancel</a>
 		<h1>Edit Contact</h1>
-		<a href="index.html" data-icon="check">Save</a>
+		<a href="index.html" data-role="button" data-icon="check">Save</a>
 	</div>
 </div>
 </body>

diff --git a/resources/header/example3.html → resources/toolbar/example3.html b/resources/header/example3.html → resources/toolbar/example3.html
@@ -25,9 +25,9 @@
 <body>
 <div data-role="page" style="max-height:90px; min-height:90px;">
 	<div data-role="header">
-		<a href="index.html" data-icon="delete">Cancel</a>
+		<a href="index.html" data-role="button" data-icon="delete">Cancel</a>
 		<h1>Edit Contact</h1>
-		<a href="index.html" data-icon="check" data-theme="b">Save</a>
+		<a href="index.html" data-role="button" data-icon="check" data-theme="b">Save</a>
 	</div>
 </div>
 </body>

diff --git a/resources/header/example4.html → resources/toolbar/example4.html b/resources/header/example4.html → resources/toolbar/example4.html
@@ -26,7 +26,7 @@
 <div data-role="page" style="max-height:90px; min-height:90px;">
 	<div data-role="header" >
 		<h1>Page Title</h1>
-		<a href="index.html" data-icon="gear" class="ui-btn-right">Options</a>
+		<a href="index.html" data-role="button" data-icon="gear" class="ui-btn-right">Options</a>
 	</div>
 </div>
 </body>

diff --git a/resources/header/example5.html → resources/toolbar/example5.html b/resources/header/example5.html → resources/toolbar/example5.html
@@ -25,7 +25,7 @@
 <body>
 <div data-role="page" style="max-height:90px; min-height:90px;">
 	<div data-role="header" >
-		<a href="index.html" data-icon="gear" class="ui-btn-right">Options</a>
+		<a href="index.html" data-role="button" data-icon="gear" class="ui-btn-right">Options</a>
 		<span class="ui-title" />
 	</div>
 </div>

diff --git a/resources/header/example6.html → resources/toolbar/example6.html b/resources/header/example6.html → resources/toolbar/example6.html
diff --git a/resources/header/example7.html → resources/toolbar/example7.html b/resources/header/example7.html → resources/toolbar/example7.html
diff --git a/resources/footer/example1.html → resources/toolbar/example8.html b/resources/footer/example1.html → resources/toolbar/example8.html
diff --git a/resources/footer/example2.html → resources/toolbar/example9.html b/resources/footer/example2.html → resources/toolbar/example9.html