diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 104151875927ff45164ee9e6a27068ae3d08732a..8260afa3b321a8ffc395e380525eace5f8f78821 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -275,7 +275,7 @@ void ManhattanStyle::polish(QWidget *widget)
         }
         else if (qobject_cast<QLabel*>(widget))
             widget->setPalette(panelPalette(widget->palette()));
-        else if (qobject_cast<QToolBar*>(widget) || widget->property("panelwidget_singlerow").toBool())
+        else if (widget->property("panelwidget_singlerow").toBool())
             widget->setFixedHeight(Utils::StyleHelper::navigationWidgetHeight());
         else if (qobject_cast<QStatusBar*>(widget))
             widget->setFixedHeight(Utils::StyleHelper::navigationWidgetHeight() + 2);
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
index 92935fdd74ab1c4f1033e2bf3ecf7b980b00e191..2a9c5d242c207dbd4198f4c59bd1c748e691066a 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.cpp
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
@@ -66,6 +66,7 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug
     layout->setMargin(0);
     layout->setSpacing(0);
     layout->addWidget(m_textEdit);
+    m_textEdit->setFrameStyle(QFrame::NoFrame);
 
     updateTitle();
 
diff --git a/src/plugins/qmlinspector/components/objectpropertiesview.cpp b/src/plugins/qmlinspector/components/objectpropertiesview.cpp
index eff1a699e57ee44a60f31ac9992f347d34f1392a..3420601483fa825a64292a806cf9e018b75f86b9 100644
--- a/src/plugins/qmlinspector/components/objectpropertiesview.cpp
+++ b/src/plugins/qmlinspector/components/objectpropertiesview.cpp
@@ -75,6 +75,7 @@ ObjectPropertiesView::ObjectPropertiesView(QDeclarativeEngineDebug *client, QWid
     setLayout(layout);
 
     m_tree = new QTreeWidget(this);
+    m_tree->setFrameStyle(QFrame::NoFrame);
     m_tree->setAlternatingRowColors(true);
     m_tree->setExpandsOnDoubleClick(false);
     m_tree->setHeaderLabels(QStringList()
diff --git a/src/plugins/qmlinspector/components/objecttree.cpp b/src/plugins/qmlinspector/components/objecttree.cpp
index 39ba6d943dfd1e16d2e9b8fb526e742a5ab91291..c65da984b19b479d4a3bb367e539bae9a1e81369 100644
--- a/src/plugins/qmlinspector/components/objecttree.cpp
+++ b/src/plugins/qmlinspector/components/objecttree.cpp
@@ -45,6 +45,7 @@ ObjectTree::ObjectTree(QDeclarativeEngineDebug *client, QWidget *parent)
       m_client(client),
       m_query(0)
 {
+    setFrameStyle(QFrame::NoFrame);
     setHeaderHidden(true);
     setMinimumWidth(250);
     setExpandsOnDoubleClick(false);
diff --git a/src/plugins/qmlinspector/components/watchtable.cpp b/src/plugins/qmlinspector/components/watchtable.cpp
index dfed5c676baf163abca99f79d49f4ba94cb241f7..0f7a269007514c949142a922c5789064a06a52a1 100644
--- a/src/plugins/qmlinspector/components/watchtable.cpp
+++ b/src/plugins/qmlinspector/components/watchtable.cpp
@@ -276,6 +276,7 @@ WatchTableView::WatchTableView(WatchTableModel *model, QWidget *parent)
     : QTableView(parent),
       m_model(model)
 {
+    setFrameStyle(QFrame::NoFrame);
     setAlternatingRowColors(true);
 
     connect(model, SIGNAL(watchCreated(QDeclarativeDebugWatch*)), SLOT(watchCreated(QDeclarativeDebugWatch*)));
diff --git a/src/plugins/qmlinspector/inspectoroutputwidget.cpp b/src/plugins/qmlinspector/inspectoroutputwidget.cpp
index a8d87aa34d58bc6b4b8431a78138f0ae8d7c1070..364ec4adc08bf5e80ad4959a8ed199bf8f49233f 100644
--- a/src/plugins/qmlinspector/inspectoroutputwidget.cpp
+++ b/src/plugins/qmlinspector/inspectoroutputwidget.cpp
@@ -41,7 +41,7 @@ InspectorOutputWidget::InspectorOutputWidget(QWidget *parent)
     : QTextEdit(parent)
 {
     setWindowTitle(tr("Output"));
-
+    setFrameStyle(QFrame::NoFrame);
     m_clearContents = new QAction(QString(tr("Clear")), this);
     m_clearContents->setIcon(QIcon(Core::Constants::ICON_CLEAR));
     connect(m_clearContents, SIGNAL(triggered()), SLOT(clear()));