--- a/uifw/AvKon/src/AknCharMap.cpp	Tue Apr 27 16:55:05 2010 +0300
+++ b/uifw/AvKon/src/AknCharMap.cpp	Tue May 11 16:27:42 2010 +0300
@@ -584,7 +584,7 @@
 void CAknSctNaviButton::SetFocused(TBool aState)
     {
     iButtonControl->SetFocus(aState);
-    iButtonControl->DrawNow();
+    iButtonControl->DrawDeferred();
     }
 
 void CAknSctNaviButton::SetEnabled(TBool aState)
@@ -1753,7 +1753,7 @@
 void CAknSctCategoryButton::SetFocused(TBool aState)
     {
     iButtonControl->SetFocus(aState);
-    iButtonControl->DrawNow();
+    iButtonControl->DrawDeferred();
     }
 
 
@@ -2962,7 +2962,10 @@
     iPictographCases.Close();
     iPictographPages.Close();
     MTouchFeedback* feedback = MTouchFeedback::Instance();
-    feedback->RemoveFeedbackForControl( this );
+    if ( feedback != NULL )
+        {
+        feedback->RemoveFeedbackForControl( this );
+        }
    }
 
 void CAknCharMap::DoLayout()