diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index c6c4568eac371d8ee9fe831db98399750e1fdeb2..8d309b811978f3649748422a5ffbae7be9a48792 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -258,21 +258,28 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
 
     fl->addRow(tr("Working Directory:"), boxlayout);
 
-    QGroupBox *box = new QGroupBox(tr("Environment"),this);
-    QVBoxLayout *boxLayout = new QVBoxLayout;
-    box->setLayout(boxLayout);
-    box->setFlat(true);
+    QVBoxLayout *vbx = new QVBoxLayout(this);
+    vbx->addLayout(fl);
+
+    QLabel *environmentLabel = new QLabel(this);
+    environmentLabel->setText(tr("Run Environment"));
+    QFont f = environmentLabel->font();
+    f.setBold(true);
+    f.setPointSizeF(f.pointSizeF() *1.2);
+    environmentLabel->setFont(f);
+    vbx->addWidget(environmentLabel);
 
     QFormLayout *formlayout = new QFormLayout();
     QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this);
 
-    m_baseEnvironmentComboBox = new QComboBox(box);
+
+    m_baseEnvironmentComboBox = new QComboBox(this);
     m_baseEnvironmentComboBox->addItems(QStringList()
                                         << tr("Clean Environment")
                                         << tr("System Environment")
                                         << tr("Build Environment"));
     formlayout->addRow(label, m_baseEnvironmentComboBox);
-    boxLayout->addLayout(formlayout);
+    vbx->addLayout(formlayout);
     label->setVisible(false);
     m_baseEnvironmentComboBox->setVisible(false);
 
@@ -302,11 +309,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
     connect(m_environmentWidget, SIGNAL(switchedToDetails()),
             label, SLOT(show()));
 
-    boxLayout->addWidget(m_environmentWidget);
-
-    QVBoxLayout *vbx = new QVBoxLayout(this);
-    vbx->addLayout(fl);
-    vbx->addWidget(box);
+    vbx->addWidget(m_environmentWidget);
 
     connect(m_environmentWidget, SIGNAL(userChangesUpdated()),
             this, SLOT(userChangesUpdated()));
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 43f543b231da8f2bd58304553665ca4062f49c30..8b182e21671c096c8183e34c7642648d4c5eb4a4 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -88,21 +88,27 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
     m_useTerminalCheck = new QCheckBox(tr("Run in &Terminal"), this);
     layout->addRow(QString(), m_useTerminalCheck);
 
-    QGroupBox *box = new QGroupBox(tr("Environment"),this);
-    QVBoxLayout *boxLayout = new QVBoxLayout();
-    box->setLayout(boxLayout);
-    box->setFlat(true);
+    QVBoxLayout *vbox = new QVBoxLayout(this);
+    vbox->addLayout(layout);
+
+    QLabel *environmentLabel = new QLabel(this);
+    environmentLabel->setText(tr("Run Environment"));
+    QFont f = environmentLabel->font();
+    f.setBold(true);
+    f.setPointSizeF(f.pointSizeF() *1.2);
+    environmentLabel->setFont(f);
+    vbox->addWidget(environmentLabel);
 
     QFormLayout *formlayout = new QFormLayout();
     QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this);
 
-    m_baseEnvironmentComboBox = new QComboBox(box);
+    m_baseEnvironmentComboBox = new QComboBox(this);
     m_baseEnvironmentComboBox->addItems(QStringList()
                                         << tr("Clean Environment")
                                         << tr("System Environment")
                                         << tr("Build Environment"));
     formlayout->addRow(label, m_baseEnvironmentComboBox);
-    boxLayout->addLayout(formlayout);
+    vbox->addLayout(formlayout);
     label->setVisible(false);
     m_baseEnvironmentComboBox->setVisible(false);
 
@@ -114,7 +120,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
     m_environmentWidget = new EnvironmentWidget(this);
     m_environmentWidget->setBaseEnvironment(rc->baseEnvironment());
     m_environmentWidget->setUserChanges(rc->userEnvironmentChanges());
-    boxLayout->addWidget(m_environmentWidget);
+    vbox->addWidget(m_environmentWidget);
 
     connect(m_environmentWidget, SIGNAL(switchedToSummary()),
             m_baseEnvironmentComboBox, SLOT(hide()));
@@ -126,9 +132,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
     connect(m_environmentWidget, SIGNAL(switchedToDetails()),
             label, SLOT(show()));
 
-    QVBoxLayout *vbox = new QVBoxLayout(this);
-    vbox->addLayout(layout);
-    vbox->addWidget(box);
+
 
     changed();
     
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index cc37dd42cb188ab6ad1bac8a4c94df88caea8fbe..10201498fb56fbb2843cc6350ddd29d3bf382729 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -159,21 +159,27 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
             this, SLOT(usingDyldImageSuffixToggled(bool)));
 #endif
 
-    QGroupBox *box = new QGroupBox(tr("Environment"),this);
-    QVBoxLayout *boxLayout = new QVBoxLayout();
-    box->setLayout(boxLayout);
-    box->setFlat(true);
+    QVBoxLayout *vbox = new QVBoxLayout(this);
+    vbox->addLayout(toplayout);
+
+    QLabel *environmentLabel = new QLabel(this);
+    environmentLabel->setText(tr("Run Environment"));
+    QFont f = environmentLabel->font();
+    f.setBold(true);
+    f.setPointSizeF(f.pointSizeF() *1.2);
+    environmentLabel->setFont(f);
+    vbox->addWidget(environmentLabel);
 
     QFormLayout *formlayout = new QFormLayout();
     QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this);
 
-    m_baseEnvironmentComboBox = new QComboBox(box);
+    m_baseEnvironmentComboBox = new QComboBox(this);
     m_baseEnvironmentComboBox->addItems(QStringList()
                                         << tr("Clean Environment")
                                         << tr("System Environment")
                                         << tr("Build Environment"));
     formlayout->addRow(label, m_baseEnvironmentComboBox);
-    boxLayout->addLayout(formlayout);
+    vbox->addLayout(formlayout);
     label->setVisible(false);
     m_baseEnvironmentComboBox->setVisible(false);
 
@@ -186,7 +192,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
     m_environmentWidget->setBaseEnvironment(m_qt4RunConfiguration->baseEnvironment());
     m_environmentWidget->setUserChanges(m_qt4RunConfiguration->userEnvironmentChanges());
     m_environmentWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    boxLayout->addWidget(m_environmentWidget);
+    vbox->addWidget(m_environmentWidget);
 
     connect(m_environmentWidget, SIGNAL(switchedToSummary()),
             m_baseEnvironmentComboBox, SLOT(hide()));
@@ -198,10 +204,6 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
     connect(m_environmentWidget, SIGNAL(switchedToDetails()),
             label, SLOT(show()));
 
-    QVBoxLayout *vbox = new QVBoxLayout(this);
-    vbox->addLayout(toplayout);
-    vbox->addWidget(box);
-
     connect(m_workingDirectoryEdit, SIGNAL(changed(QString)),
             this, SLOT(setWorkingDirectory()));