diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java b/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
index 9779414cbe..c56e7e07d6 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
@@ -159,7 +159,7 @@ public class Desktop extends AbstractUIPart implements MenuListener, Serializabl
 	private void createHomeTab() 
 	{
         Tabpanel homeTab = new Tabpanel();
-        windowContainer.addWindow(homeTab, "Home", false);
+        windowContainer.addWindow(homeTab, Msg.getMsg(Env.getCtx(), "Home").replaceAll("&", ""), false);
 
         Hbox hbox = new Hbox();
         hbox.setStyle("margin: 5px");
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java
index 9ed3d17d6c..f63fb04271 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java
@@ -16,7 +16,7 @@ public class WPAPanel extends Panel implements EventListener
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 	Get Panel if User has Perfpormance Goals
+	 * 	Get Panel if User has Performance Goals
 	 *	@return panel pr null
 	 */
 	public static WPAPanel get()
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
index a0db89c67f..2483ef84d0 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
@@ -60,7 +60,8 @@ public class MenuSearchPanel extends Panel implements EventListener
     private void init()
     {
         lblSearch = new Label();
-        lblSearch.setValue(Msg.getMsg(Env.getCtx(),"Lookup") + ":");
+        lblSearch.setValue(Msg.getMsg(Env.getCtx(),"TreeSearch").replaceAll("&", "") + ":");
+        lblSearch.setTooltip(Msg.getMsg(Env.getCtx(),"TreeSearchText"));
         
         cmbSearch = new AutoComplete();
         cmbSearch.setAutodrop(true);
@@ -113,7 +114,7 @@ public class MenuSearchPanel extends Panel implements EventListener
             if (treeItem != null)
             {
                 select(treeItem);
-                Clients.showBusy("Loding...", true);
+                Clients.showBusy(Msg.getMsg(Env.getCtx(), "Loading"), true);
                 Events.echoEvent("onPostSelect", this, null);
             }
         }
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
index be0911e8da..2bb5efed94 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
@@ -177,7 +177,7 @@ public class FindWindow extends Window implements EventListener,ValueChangeListe
         }        
         this.setBorder("normal");
         this.setWidth("550px");
-        this.setTitle("Lookup Record: "+ title);
+        this.setTitle(Msg.getMsg(Env.getCtx(), "Find").replaceAll("&", "") + ": " + title);
         this.setAttribute("mode", "modal");
         this.setClosable(true);
     }
@@ -188,16 +188,16 @@ public class FindWindow extends Window implements EventListener,ValueChangeListe
     private void initSimple()
     {
         lblDocumentNo = new Label();
-        lblDocumentNo.setValue(Msg.translate(Env.getCtx(),"DocumentNo").substring(1));
+        lblDocumentNo.setValue(Msg.translate(Env.getCtx(),"DocumentNo").replaceAll("&", ""));
         
         lblDescription = new Label();
-        lblDescription.setValue(Msg.translate(Env.getCtx(),"Description"));
+        lblDescription.setValue(Msg.translate(Env.getCtx(),"Description").replaceAll("&", ""));
         
         lblName = new Label();
-        lblName.setValue(Msg.translate(Env.getCtx(),"Name").substring(1));
+        lblName.setValue(Msg.translate(Env.getCtx(),"Name").replaceAll("&", ""));
         
         lblValue = new Label();
-        lblValue.setValue(Msg.translate(Env.getCtx(),"Value").substring(1));
+        lblValue.setValue(Msg.translate(Env.getCtx(),"Value").replaceAll("&", ""));
         
         fieldDocumentNo = new Textbox();
         fieldDocumentNo.setId("fieldDocumentNo");
@@ -329,18 +329,18 @@ public class FindWindow extends Window implements EventListener,ValueChangeListe
         listhead.setSizable(true);
         
         ListHeader lstHColumn = new ListHeader();
-        lstHColumn.setLabel("Column");    
+        lstHColumn.setLabel(Msg.translate(Env.getCtx(), "AD_Column_ID"));    
         lstHColumn.setWidth("100px");
                
         ListHeader lstHOperator = new ListHeader();
-        lstHOperator.setLabel("Operator");
+        lstHOperator.setLabel(Msg.getMsg(Env.getCtx(), "Operator"));
         
         ListHeader lstHQueryValue = new ListHeader();
-        lstHQueryValue.setLabel("Query Value");
+        lstHQueryValue.setLabel(Msg.getMsg(Env.getCtx(), "QueryValue"));
         lstHQueryValue.setWidth("200px");
         
         ListHeader lstHQueryTo = new ListHeader();
-        lstHQueryTo.setLabel("To Query Value");
+        lstHQueryTo.setLabel(Msg.getMsg(Env.getCtx(), "QueryValue2"));
         lstHQueryTo.setWidth("200px");
         
         listhead.appendChild(lstHColumn);
@@ -369,8 +369,8 @@ public class FindWindow extends Window implements EventListener,ValueChangeListe
         winMain.createPart(this);
         winAdvanced = new Window();
         winLookupRecord = new Window();     
-        winMain.addTab(winLookupRecord, "Lookup Record",false, true);
-        winMain.addTab(winAdvanced, "Advanced", false, false);
+        winMain.addTab(winLookupRecord, Msg.getMsg(Env.getCtx(), "Find").replaceAll("&", ""),false, true);
+        winMain.addTab(winAdvanced, Msg.getMsg(Env.getCtx(), "Advanced").replaceAll("&", ""), false, false);
         initSimple();
         initAdvanced();