--- a/uifw/EikStd/coctlsrc/AknToolbar.cpp	Wed Mar 31 21:59:52 2010 +0300
+++ b/uifw/EikStd/coctlsrc/AknToolbar.cpp	Wed Apr 14 16:14:00 2010 +0300
@@ -1136,7 +1136,10 @@
                             MTouchFeedback* feedback = MTouchFeedback::Instance();
                             if ( feedback )
                                 {
-                                feedback->InstantFeedback( ETouchFeedbackBasicButton );
+                                feedback->InstantFeedback( button,
+                                                           ETouchFeedbackBasicButton,
+                                                           ETouchFeedbackVibra,
+                                                           aPointerEvent );
                                 }
                             }
                 
@@ -2044,8 +2047,11 @@
 
     CWindowGc& gc = SystemGc();
     MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-    // Draw background         
-    if ( iFlags & KAknToolbarFixed && 
+    
+    //
+    // Draw background
+    //
+    if ( iFlags & KAknToolbarFixed && !( iFlags & KAknToolbarNoBackground ) &&
          iBgRect.Height() > 0 &&
          iBgRect.Width() > 0 )
         {
@@ -3114,14 +3120,6 @@
 
             aCellPaneRect = RectFromLayout( aGridPaneRect,     
                 AknLayoutScalable_Avkon::cell_sctrl_middle_pane( 0, 0, 0 ) );
-
-            //
-            // fixing bug: ELJG-7XX8RE
-            // (Two extra black lines are displayed around toolbar area at first)
-            // extend the toolbar size by hard code
-            //
-            aToolbarRect.iTl.iY -= 1;
-            aToolbarRect.iBr.iY += 1;
             }
         }
     else