diff --git a/content/komodoOverlay.xul b/content/komodoOverlay.xul
index 573993c..93d0e8a 100644
--- a/content/komodoOverlay.xul
+++ b/content/komodoOverlay.xul
@@ -36,6 +36,17 @@
 		</menu>
 	</menupopup>
 	
+	<!-- Toolbar button -->
+	<toolbar id="standardToolbar">
+		<toolbaritem>
+			<toolbarbutton id="avim-tb" class="toolbarbutton-1" type="menu-button" label="&AVIM.label;" tooltip="avim-status-tooltip" autocheck="false" command="avim-enabled-cmd" observes="avim-status-bc">
+				<menupopup id="avim-tb-popup" avim-popupsource="avim-status-popup" onpopupshowing="avim.buildPopup(this);">
+					<menuitem id="avim-tb-enabled" type="checkbox" label="&avim-enabled.label;" observes="avim-enabled-bc" default="true" oncommand="" />
+				</menupopup>
+			</toolbarbutton>
+		</toolbaritem>
+	</toolbar>
+	
 	<!-- Status bar menu -->
 	<statusbar id="statusbarviewbox">
 		<statusbarpanel id="avim-status" tooltip="avim-status-tooltip" popup="avim-status-popup" observes="avim-status-bc" ondblclick="avim.toggle();" />
diff --git a/install.rdf b/install.rdf
index 0391489..1c10441 100755
--- a/install.rdf
+++ b/install.rdf
@@ -106,7 +106,7 @@
 			<Description>
 				<em:id>{36e66fa0-f259-11d9-850e-000d935d3368}</em:id>
 				<em:minVersion>4.0</em:minVersion>
-				<em:maxVersion>9.*</em:maxVersion>
+				<em:maxVersion>10.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 		<!-- $endunless{} -->
@@ -116,7 +116,7 @@
 			<Description>
 				<em:id>{b1042fb5-9e9c-11db-b107-000d935d3368}</em:id>
 				<em:minVersion>4.0</em:minVersion>
-				<em:maxVersion>9.*</em:maxVersion>
+				<em:maxVersion>10.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>