--- a/profilesservices/MediaFileList/Src/mediafiledialog.cpp	Thu Dec 17 08:52:52 2009 +0200
+++ b/profilesservices/MediaFileList/Src/mediafiledialog.cpp	Thu Jan 07 12:54:49 2010 +0200
@@ -1105,12 +1105,12 @@
     // memory card icon
     icons->AppendL( IconL( KAknsIIDQgnIndiMmcAdd, iIconFileName,
                            EMbmMediafilelistQgn_indi_mmc_add,
-                           EMbmMediafilelistQgn_indi_mmc_add_mask ) );
+                           EMbmMediafilelistQgn_indi_mmc_add_mask, EAknsCIQsnIconColorsCG13 ) );
 
      // mass storage icon
     icons->AppendL( IconL( KAknsIIDQgnPropLinkEmbdSmall, iIconFileName,
                            EMbmMediafilelistQgn_indi_fmgr_ms_add,
-                           EMbmMediafilelistQgn_indi_fmgr_ms_add_mask ) );
+                           EMbmMediafilelistQgn_indi_fmgr_ms_add_mask,EAknsCIQsnIconColorsCG13 ) );
 
     // empty icon
     icons->AppendL( IconL( KAknsIIDQgnPropEmpty, KAvkonBitmapFile,
@@ -1145,6 +1145,31 @@
 	}
 
 
+// -----------------------------------------------------------------------------
+// CMediaFileDialog::IconL
+// For MMC icon and Mass Storage icon
+// -----------------------------------------------------------------------------
+//
+CGulIcon* CMediaFileDialog::IconL(TAknsItemID aId, const TDesC& aFileName,
+                                   TInt aFileIndex, TInt aFileMaskIndex, TAknsQsnIconColorsIndex colorIndex)
+	{
+	TRgb defaultColour(KRgbBlack);
+	CFbsBitmap* bmap = NULL;
+	CFbsBitmap* mask = NULL;
+
+	AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), defaultColour, KAknsIIDQsnIconColors,
+			colorIndex);
+	AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(), KAknsIIDQgnIndiMmcAdd,
+			KAknsIIDQsnIconColors, colorIndex, bmap, mask,
+			aFileName, aFileIndex, aFileMaskIndex, defaultColour);
+
+	CGulIcon* icon = CGulIcon::NewL(bmap, mask);
+	icon->SetBitmapsOwnedExternally(EFalse);
+	CleanupStack::Pop(2);
+	return icon;
+	}
+
+
 // ----------------------------------------------------------------------------
 // CMediaFileDialog::ShowContextMenuL
 // 
@@ -3065,7 +3090,7 @@
         return;
         }
 
-    if ( aEventType == EEventItemDoubleClicked || aEventType == EEventEnterKeyPressed )
+    if ( aEventType == EEventItemSingleClicked  || aEventType == EEventEnterKeyPressed )
         {
         TBool closeDialog = HandleOKL( EAttrDoubleClicked );