diff --git a/.hgignore b/.hgignore
index 559269d4fa..cddda65c24 100644
--- a/.hgignore
+++ b/.hgignore
@@ -87,6 +87,8 @@ syntax: regexp
 ^org\.adempiere\.eclipse\.equinox\.servletbridge/bin/.*\.class$
 ^org\.adempiere\.eclipse\.equinox\.http\.servlet/bin/.*\.class$
 ^org\.adempiere\.eclipse\.equinox\.http\.servletbridge/bin/.*\.class$
+^org\.adempiere\.ui\.zk\.example/bin/.*$
+^org\.adempiere\.webstore\.resource/bin/.*$
 ^org\.adempiere\.webstore\.resource/bin/.*$
 ^targetPlatform/.*$
 ^\.metadata/.*$
diff --git a/org.adempiere.ui.zk.example/2Pack/ExportAction/dict/PackOut.xml b/org.adempiere.ui.zk.example/2Pack/ExportAction/dict/PackOut.xml
index ba04efc65d..6e6d405003 100644
--- a/org.adempiere.ui.zk.example/2Pack/ExportAction/dict/PackOut.xml
+++ b/org.adempiere.ui.zk.example/2Pack/ExportAction/dict/PackOut.xml
@@ -10,11 +10,11 @@
         <DisplayLogic/>
         <IsActive>true</IsActive>
         <IsCustomization>true</IsCustomization>
-        <Name>Export Action</Name>
+        <Name>Export</Name>
         <KeyStroke_KeyCode>0</KeyStroke_KeyCode>
         <KeyStroke_Modifiers>0</KeyStroke_Modifiers>
         <AD_ToolBarButton_UU>09c20701-b692-44a1-9480-72a1cf8a0bf3</AD_ToolBarButton_UU>
-        <ComponentName>Export</ComponentName>
+        <ComponentName>ExportExample</ComponentName>
         <ActionName/>
         <ActionClassName>org.adempiere.ui.zk.example.action.export</ActionClassName>
     </AD_ToolBarButton>
@@ -22,11 +22,22 @@
         <AD_Client_ID>0</AD_Client_ID>
         <AD_Org_ID>0</AD_Org_ID>
         <MsgType>I</MsgType>
-        <MsgText>Export</MsgText>
+        <MsgText>Export Example</MsgText>
         <MsgTip/>
         <EntityType>U</EntityType>
         <AD_Message_UU>b9d8b3d7-34d7-4f18-aed9-c19f9ed8f28a</AD_Message_UU>
         <Value>org.adempiere.ui.zk.example.action.export.tooltip</Value>
         <IsActive>true</IsActive>
     </AD_Message>
+    <AD_Message type="table">
+        <AD_Client_ID>0</AD_Client_ID>
+        <AD_Org_ID>0</AD_Org_ID>
+        <MsgType>I</MsgType>
+        <MsgText>Export Example</MsgText>
+        <MsgTip/>
+        <EntityType>U</EntityType>
+        <AD_Message_UU>9099992f-776f-4efb-bcc6-dbffd65a8f19</AD_Message_UU>
+        <Value>org.adempiere.ui.zk.example.action.export.label</Value>
+        <IsActive>true</IsActive>
+    </AD_Message>
 </idempiere>
diff --git a/org.adempiere.ui.zk.example/META-INF/2Pack.zip b/org.adempiere.ui.zk.example/META-INF/2Pack.zip
index eb60c4edde..d0cdf61761 100644
Binary files a/org.adempiere.ui.zk.example/META-INF/2Pack.zip and b/org.adempiere.ui.zk.example/META-INF/2Pack.zip differ
diff --git a/org.adempiere.ui.zk.example/META-INF/MANIFEST.MF b/org.adempiere.ui.zk.example/META-INF/MANIFEST.MF
index 9665427554..a9d3a4632c 100644
--- a/org.adempiere.ui.zk.example/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk.example/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Activator: org.adempiere.ui.zk.example.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.adempiere.base,
+ org.adempiere.base.equinox,
  org.adempiere.exceptions,
  org.adempiere.plugin.utils,
  org.adempiere.webui.action,
diff --git a/org.adempiere.ui.zk.example/src/action/images/org.adempiere.ui.zk.example.action.export24.png b/org.adempiere.ui.zk.example/src/action/images/org.adempiere.ui.zk.example.action.export24.png
index d39e1caa9e..84c7161b80 100644
Binary files a/org.adempiere.ui.zk.example/src/action/images/org.adempiere.ui.zk.example.action.export24.png and b/org.adempiere.ui.zk.example/src/action/images/org.adempiere.ui.zk.example.action.export24.png differ
diff --git a/org.adempiere.ui.zk.example/src/org/adempiere/ui/zk/example/action/ExportWindow.java b/org.adempiere.ui.zk.example/src/org/adempiere/ui/zk/example/action/ExportWindow.java
index a7d44ab704..2199547319 100644
--- a/org.adempiere.ui.zk.example/src/org/adempiere/ui/zk/example/action/ExportWindow.java
+++ b/org.adempiere.ui.zk.example/src/org/adempiere/ui/zk/example/action/ExportWindow.java
@@ -12,7 +12,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.adempiere.base.IGridTabExporter;
-import org.adempiere.base.Service;
+import org.adempiere.base.equinox.EquinoxExtensionLocator;
 import org.adempiere.exceptions.AdempiereException;
 import org.adempiere.webui.adwindow.ADWindowContent;
 import org.adempiere.webui.adwindow.IADTabbox;
@@ -65,7 +65,7 @@ public class ExportWindow extends Window implements EventListener<Event> {
 		
 		exporterMap = new HashMap<String, IGridTabExporter>();
 		extensionMap = new HashMap<String, String>();
-		List<IGridTabExporter> exporterList = Service.locator().list(IGridTabExporter.class).getServices();
+		List<IGridTabExporter> exporterList = EquinoxExtensionLocator.instance().list(IGridTabExporter.class).getExtensions();
 		for(IGridTabExporter exporter : exporterList)
 		{
 			String extension = exporter.getFileExtension();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
index 765ddd3ec0..dbfb0367d5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
@@ -612,9 +612,9 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
 						label = mToolBarButton.getName();
 					}
 					if (tooltipKey.equals(tooltiptext)) {
-						tooltiptext = null;
+						tooltipKey = null;
 					}
-					ToolBarButton btn = createButton(mToolBarButton.getComponentName(), null, tooltiptext);
+					ToolBarButton btn = createButton(mToolBarButton.getComponentName(), null, tooltipKey);
 					btn.removeEventListener(Events.ON_CLICK, this);
 					btn.setId(mToolBarButton.getName());
 					btn.setDisabled(false);