diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 3372910e3d..c18cfc522f 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -2040,6 +2040,8 @@ go_up=Go up
 
 # Tag picker
 click_to_select_tag=Click to select tags
+add_a_tag=Add a tag
+tags=Tags
 
 # Category browsing
 category_browser_plugin_label=Categories
diff --git a/config/alfresco/web-client-config-properties.xml b/config/alfresco/web-client-config-properties.xml
index 7c02f29fc3..3246248688 100644
--- a/config/alfresco/web-client-config-properties.xml
+++ b/config/alfresco/web-client-config-properties.xml
@@ -726,7 +726,7 @@
    
    <config evaluator="aspect-name" condition="taggable">
       <property-sheet>
-         <show-property name="cm:taggable" display-label="Tags" show-in-edit-mode="true" component-generator="AjaxTagPickerGenerator" />
+         <show-property name="cm:taggable" show-in-edit-mode="true" component-generator="AjaxTagPickerGenerator" />
       </property-sheet>
    </config>
 
diff --git a/source/java/org/alfresco/web/bean/ajax/PickerBean.java b/source/java/org/alfresco/web/bean/ajax/PickerBean.java
index 0e1e89c3fc..6d3666366d 100644
--- a/source/java/org/alfresco/web/bean/ajax/PickerBean.java
+++ b/source/java/org/alfresco/web/bean/ajax/PickerBean.java
@@ -64,6 +64,7 @@ public class PickerBean implements Serializable
    private static final long serialVersionUID = 8950457520023294902L;
    
    private static final String MSG_CATEGORIES = "categories";
+   private static final String MSG_TAGS = "tags";
    private static final String ID_URL = "url";
    private static final String ID_ICON = "icon";
    private static final String ID_CHILDREN = "children";
@@ -295,7 +296,7 @@ public class PickerBean implements Serializable
          if (parentRef == null)
          {
             out.writeNullValue(ID_ID);
-            out.writeValue(ID_NAME, "Tags");
+            out.writeValue(ID_NAME, Application.getMessage(fc, MSG_TAGS));
             out.writeValue(ID_ISROOT, true);
             out.writeValue(ID_SELECTABLE, false);
          }
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java b/source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
index c725fd721b..4dc15d679d 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
@@ -19,7 +19,6 @@
 package org.alfresco.web.ui.repo.component;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
@@ -43,6 +42,9 @@ import org.springframework.web.jsf.FacesContextUtils;
 public class UIAjaxTagPicker extends BaseAjaxItemPicker
 {
    private static final String MSG_CLICK_TO_SELECT_TAG = "click_to_select_tag";
+   private static final String MSG_ADD = "add";
+   private static final String MSG_ADD_A_TAG = "add_a_tag";
+   private static final String MSG_REMOVE = "remove";
    
    @Override
    public String getFamily()
@@ -80,6 +82,7 @@ public class UIAjaxTagPicker extends BaseAjaxItemPicker
       return this.label;
    }
 
+   @SuppressWarnings("unchecked")
    @Override
    /**
     * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
@@ -168,8 +171,8 @@ public class UIAjaxTagPicker extends BaseAjaxItemPicker
       out.write("<script type='text/javascript'>");
       out.write("function init" + divId + "() {");
       out.write(" window." + objId + " = new AlfTagger('" + divId + "','" + objId + "','" + getServiceCall() +
-                "','" + formClientId + "');");
-	   out.write(" window." + objId + ".setChildNavigation(false);");
+                "','" + formClientId + "','" + msg.getString(MSG_ADD) + "','" + msg.getString(MSG_REMOVE) + "');");
+      out.write(" window." + objId + ".setChildNavigation(false);");
       if (getDefaultIcon() != null)
       {
          out.write(" window." + objId + ".setDefaultIcon('" + getDefaultIcon() + "');");
@@ -204,32 +207,32 @@ public class UIAjaxTagPicker extends BaseAjaxItemPicker
          out.write((String)attrs.get("styleClass"));
       }
       out.write(">");
-		if (isDisabled())
-		{
-		   out.write("   <span>");
+      if (isDisabled())
+      {
+         out.write("   <span>");
          if (selectedNames != null)
          {
             out.write(selectedNames);
          }
          out.write("   </span>");
-		}
-		else
-		{
-      	out.write("  <span class='pickerActionButton'><a href='javascript:" + objId + ".showSelector();'>");
-      	if (selectedNames == null)
-      	{
-      	   if ("".equals(getLabel()))
-      	   {
-      	      setLabel(msg.getString(MSG_CLICK_TO_SELECT_TAG));
-      	   }
-         	out.write(getLabel());
-      	}
-			else
-			{
-				out.write(selectedNames);
-			}
+      }
+      else
+      {
+         out.write("  <span class='pickerActionButton'><a href='javascript:" + objId + ".showSelector();'>");
+         if (selectedNames == null)
+         {
+            if ("".equals(getLabel()))
+            {
+               setLabel(msg.getString(MSG_CLICK_TO_SELECT_TAG));
+            }
+            out.write(getLabel());
+         }
+         else
+         {
+            out.write(selectedNames);
+         }
          out.write("   </a></span>");
-		}
+      }
       out.write(" </div>");
       // container for item navigation
       out.write(" <div id='" + divId + "-selector' class='pickerSelector'>");
@@ -248,21 +251,31 @@ public class UIAjaxTagPicker extends BaseAjaxItemPicker
       out.write("     <span class='pickerNavBreadcrumb'>");
       out.write("      <span id='" + divId + "-nav-txt' class='pickerNavBreadcrumbText'></span></a>");
       out.write("     </span>");
-		out.write("     <span class='pickerNavAddTag'>");
-		out.write("      <span class='pickerAddTagIcon'></span>");
-		out.write("      <span id='" + divId + "-addTag-linkContainer' class='pickerAddTagLinkContainer'>");
-		out.write("       <a href='#' onclick='window." + objId + ".showAddTagForm(); return false;'>Add a tag</a>");
-		out.write("      </span>");
-		out.write("      <span id='" + divId + "-addTag-formContainer' class='pickerAddTagFormContainer'>");
-		out.write("       <input id='" + divId + "-addTag-box' class='pickerAddTagBox' name='" + divId + "-addTag-box' type='text'>");
-		out.write("       <img id='" + divId + "-addTag-ok' class='pickerAddTagImage' alt='Add' src='");
+      out.write("     <span class='pickerNavAddTag'>");
+      out.write("      <span class='pickerAddTagIcon'></span>");
+      out.write("      <span id='" + divId + "-addTag-linkContainer' class='pickerAddTagLinkContainer'>");
+      out.write("       <a href='#' onclick='window." + objId + ".showAddTagForm(); return false;'>");
+      out.write(msg.getString(MSG_ADD_A_TAG));
+      out.write("</a>");
+      out.write("      </span>");
+      out.write("      <span id='" + divId + "-addTag-formContainer' class='pickerAddTagFormContainer'>");
+      out.write("       <input id='" + divId + "-addTag-box' class='pickerAddTagBox' name='" + divId + "-addTag-box' type='text'>");
+      out.write("       <img id='" + divId + "-addTag-ok' class='pickerAddTagImage' src='");
       out.write(contextPath);
-		out.write("/images/office/action_successful.gif'>");
-		out.write("       <img id='" + divId + "-addTag-cancel' class='pickerAddTagImage' alt='Cancel' src='");
+      out.write("/images/office/action_successful.gif' alt='");
+      out.write(msg.getString(MSG_ADD));
+      out.write("' title='");
+      out.write(msg.getString(MSG_ADD));
+      out.write("'>");
+      out.write("       <img id='" + divId + "-addTag-cancel' class='pickerAddTagImage' src='");
       out.write(contextPath);
-		out.write("/images/office/action_failed.gif'>");
-		out.write("      </span>");
-		out.write("     </span>");
+      out.write("/images/office/action_failed.gif' alt='");
+      out.write(msg.getString(MSG_CANCEL));
+      out.write("' title='");
+      out.write(msg.getString(MSG_CANCEL));
+      out.write("'>");
+      out.write("      </span>");
+      out.write("     </span>");
       out.write("     <span id='" + divId + "-nav-add'></span>");
       out.write("    </div>");
       out.write("   </div>");
diff --git a/source/web/scripts/ajax/tagger.js b/source/web/scripts/ajax/tagger.js
index 63f3bc3f6c..12503387d4 100644
--- a/source/web/scripts/ajax/tagger.js
+++ b/source/web/scripts/ajax/tagger.js
@@ -66,13 +66,21 @@ var AlfTagger = new Class(
    
    /* allow child selection navigation */
    allowChildNavigation: true,
+   
+   /* label to use for Add icon */
+   addLabel: null,
+   
+   /* label to use for Remove icon */
+   removeLabel: null,
 
-   initialize: function(id, varName, service, formClientId) 
+   initialize: function(id, varName, service, formClientId, addLabel, removeLabel) 
    {
       this.id = id;
       this.varName = varName;
       this.service = service;
       this.formClientId = formClientId;
+      this.addLabel = addLabel;
+      this.removeLabel = removeLabel;
       this.selected = [];
       this.preselected = [];
 
@@ -241,7 +249,7 @@ var AlfTagger = new Class(
       var actionScript = "javascript:" + this.varName + ".delItem('" + item.id + "');";
       var actionLink = new Element("a", {"href": actionScript});
       var deleteIcon = new Element("img", {"src": getContextPath() + "/images/icons/minus.gif", "class": "pickerSelectedIcon",
-                                   "border": 0, "title": "Remove", "alt": "Remove"});
+                                   "border": 0, "title": this.removeLabel, "alt": this.removeLabel});
       deleteIcon.injectInside(actionLink);
       actionLink.injectInside(actionSpan);
       actionSpan.injectInside(itemDiv);
@@ -406,7 +414,7 @@ var AlfTagger = new Class(
             var actionScript = "javascript:" + tagger.varName + ".addItem(-1);";
             var actionLink = new Element("a", {"href": actionScript});
             var actionImg = new Element("img", {"id": actionId, "src": getContextPath() + "/images/icons/plus.gif", "class": "taggerActionButton",
-                                        "border": 0, "title": "Add", "alt": "Add"});
+                                        "border": 0, "title": this.addLabel, "alt": this.addLabel});
             actionImg.injectInside(actionLink);
             actionLink.injectInside($(tagger.id + "-nav-add"));
             // style modification for this Add button - it's inside a floating div unlike the others
@@ -466,7 +474,7 @@ var AlfTagger = new Class(
          var actionScript = "javascript:" + this.varName + ".addItem(" + index + ");";
          var actionLink = new Element("a", {"href": actionScript});
          var actionImg = new Element("img", {"id": actionId, "src": getContextPath() + "/images/icons/plus.gif", "class": "pickerActionButton",
-                                     "border": 0, "title": "Add", "alt": "Add"});
+                                     "border": 0, "title": this.addLabel, "alt": this.addLabel});
          actionImg.injectInside(actionLink);
          actionLink.injectInside(actionsSpan);