--- a/uifw/AvKon/src/akncolourselectiongrid.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/AvKon/src/akncolourselectiongrid.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -737,11 +737,11 @@
             {
             // on down event list basic feedback + audio
             fbSpec->AddFeedback( ETouchEventStylusDown,
-                                 ETouchFeedbackList );
+                                 ETouchFeedbackBasicItem );
             
             // on up event list basic feedback, no audio
             fbSpec->AddFeedback( ETouchEventStylusUp,
-                                 ETouchFeedbackList,
+                                 ETouchFeedbackBasicItem,
                                  ETouchFeedbackVibra );
 
             feedback->SetFeedbackArea( this,
@@ -1684,16 +1684,26 @@
     // if the NGA effects are off, use “pop-up”.
     // If NGA effects are on, use “pop-up closed”.
     MTouchFeedback* feedback = MTouchFeedback::Instance();
+    if ( feedback )
+        {
+        if( AknLayoutUtils::PenEnabled() )
+            {
+            if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
+                {
+                feedback->InstantFeedback( ETouchFeedbackPopupClose );
+                }
+            else
+                {
+                feedback->InstantFeedback( ETouchFeedbackPopUp );
+                }
+            }
+        }
 
     switch (aButton)
         {
         case EAknSoftkeyInsert:
         case EEikBidOk:
             {
-            if ( feedback )
-                {
-                feedback->InstantFeedback( ETouchFeedbackBasic );
-                }
             TInt index = iGrid->CurrentItemIndex();
 
             if (iNoneBox)
@@ -1709,20 +1719,6 @@
             }
         default:
             {
-            if ( feedback )
-                {
-                if( AknLayoutUtils::PenEnabled() )
-                    {
-                    if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
-                        {
-                        feedback->InstantFeedback( ETouchFeedbackDecreasingPopUp );
-                        }
-                    else
-                        {
-                        feedback->InstantFeedback( ETouchFeedbackPopUp );
-                        }
-                    }
-                }
             break;
             }
         }
@@ -1794,7 +1790,7 @@
             {
             if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
                 {
-                feedback->InstantFeedback( ETouchFeedbackIncreasingPopUp );
+                feedback->InstantFeedback( ETouchFeedbackPopupOpen );
                 }
             else
                 {