Index: src/core/org/apache/jmeter/gui/MainFrame.java
===================================================================
--- src/core/org/apache/jmeter/gui/MainFrame.java	(revision 1184910)
+++ src/core/org/apache/jmeter/gui/MainFrame.java	(working copy)
@@ -60,6 +60,7 @@
 import org.apache.jmeter.gui.tree.JMeterCellRenderer;
 import org.apache.jmeter.gui.tree.JMeterTreeListener;
 import org.apache.jmeter.gui.util.JMeterMenuBar;
+import org.apache.jmeter.gui.util.JMeterToolBar;
 import org.apache.jmeter.samplers.Remoteable;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestListener;
@@ -83,6 +84,10 @@
     // The default title for the Menu bar
     private static final String DEFAULT_TITLE =
         "Apache JMeter ("+JMeterUtils.getJMeterVersion()+")"; // $NON-NLS-1$ $NON-NLS-2$
+    
+    // Allow display/hide toolbar
+    private static final boolean DISPLAY_TOOLBAR =
+            JMeterUtils.getPropDefault("jmeter.toolbar", true); // $NON-NLS-1$
 
     /** The menu bar. */
     private JMeterMenuBar menuBar;
@@ -428,6 +433,9 @@
      */
     private Component createToolBar() {
         Box toolPanel = new Box(BoxLayout.X_AXIS);
+        if (DISPLAY_TOOLBAR) {
+            toolPanel.add(JMeterToolBar.createToolbar()); // add the toolbar
+        }
         toolPanel.add(Box.createRigidArea(new Dimension(10, 15)));
         toolPanel.add(Box.createGlue());
         toolPanel.add(activeThreads);
Index: bin/jmeter.properties
===================================================================
--- bin/jmeter.properties	(revision 1184910)
+++ bin/jmeter.properties	(working copy)
@@ -110,6 +110,10 @@
 # See https://issues.apache.org/bugzilla/show_bug.cgi?id=52026 for details
 # N.B. the laf can be defined in user.properties.
 
+# Toolbar display
+# default: true
+#jmeter.toolbar=true
+
 # Icon definitions
 # default:
 #jmeter.icons=org/apache/jmeter/images/icon.properties