--- a/src/hbcore/decorators/hbtitlebar.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -98,8 +98,6 @@
     // the default action's icon should mirror in case of a layout direction change
     icon.setMirroringMode(HbIcon::LayoutDirection);
     mDefaultNavigationAction->setIcon(icon);
-
-    mDefaultNavigationAction->setText("Quit");
     mNavigationButton->setAction(mDefaultNavigationAction);
 
     HbStyle::setItemName(q, "titlebar");
@@ -171,6 +169,7 @@
     d->mMainWindow = mainWindow;
     d->init();
     setFlag(QGraphicsItem::ItemIsPanel, true);
+    setFlag(QGraphicsItem::ItemHasNoContents, true);
 }
 
 HbTitleBar::HbTitleBar(HbTitleBarPrivate &dd, HbMainWindow *mainWindow,
@@ -181,6 +180,8 @@
     d->q_ptr = this;
     d->mMainWindow = mainWindow;
     d->init();
+    setFlag(QGraphicsItem::ItemIsPanel, true);
+    setFlag(QGraphicsItem::ItemHasNoContents, true);
 }
 
 /*
@@ -464,7 +465,7 @@
     case QEvent::Gesture: {
             QGestureEvent *gestureEvent = static_cast<QGestureEvent*>(event);
             HbSwipeGesture *swipe = qobject_cast<HbSwipeGesture*>(gestureEvent->gesture(Qt::SwipeGesture));
-            if(swipe) {
+            if (swipe) {
                 switch (swipe->state()) {
                 case (Qt::GestureFinished): {
                     if(swipe->sceneHorizontalDirection() == QSwipeGesture::Right) {
@@ -474,7 +475,7 @@
                     }
                     gestureEvent->accept();
                     break;
-        }
+                }
                 default:
                     break;
                 }