diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
index 5f59b1df379..f9fd55cbfb2 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Intel Corporation - Initial API and implementation
+ * IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.managedbuilder.ui.properties;
 
@@ -106,7 +107,7 @@ public class ToolSelectionDialog extends Dialog {
 		
 		c2.setLayout(new GridLayout(1, false));
 		Button b1 = new Button(c2, SWT.PUSH);
-		b1.setText(" > ");  //$NON-NLS-1$
+		b1.setText(Messages.getString("ToolSelectionDialog.12"));  //$NON-NLS-1$
 		b1.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				int x = t1.getSelectionIndex();
@@ -115,8 +116,9 @@ public class ToolSelectionDialog extends Dialog {
 				right.add(tool);
 				updateData(true);
 			}});
+		b1.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
 		Button b2 = new Button(c2, SWT.PUSH);
-		b2.setText(" < ");  //$NON-NLS-1$
+		b2.setText(Messages.getString("ToolSelectionDialog.13"));  //$NON-NLS-1$
 		b2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		b2.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
@@ -126,6 +128,7 @@ public class ToolSelectionDialog extends Dialog {
 				left.add(ManagedBuildManager.getRealTool(tool));
 				updateData(true);
 			}});
+		b2.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
 		
 		errorLabel = new CLabel(composite, SWT.NONE);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
index 8dbed893c3d..a6c716c7cfb 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
@@ -47,6 +47,8 @@ ToolSelectionDialog.8=Tool does not support managed build \!
 ToolSelectionDialog.9=Props not defined \! 
 ToolSelectionDialog.10=Props not supported \! 
 ToolSelectionDialog.11=Req. props not supported \! 
+ToolSelectionDialog.12=Add tool -->
+ToolSelectionDialog.13=<-- Remove tool
 ToolChainEditTab.0=Display compatible toolchains only
 ToolChainEditTab.1=Current toolchain
 ToolChainEditTab.2=Current builder