--- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Wed Mar 31 21:49:52 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Wed Apr 14 16:08:26 2010 +0300
@@ -1681,6 +1681,9 @@
  
     //Offset of profile-related menu items in power key menu
     TInt iProfileItemsOffset;
+    //Flag to record if the TD network is enalbed.
+		TBool iTDEnable;
+
     };
 
 #endif      // SYSAPAPPUI_H

--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Wed Mar 31 21:49:52 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Wed Apr 14 16:08:26 2010 +0300
@@ -2020,9 +2020,17 @@
 
 	        case EPSGprsUnattached:
 	        default:
+	        	  if ( iTDEnable )
+	            {
+	            signalGprsIndicatorState = EAknSignalEdgeIndicatorAvailable;
+	            signalIndicatorState = EAknSignalCommonPacketDataIndicatorAvailable;
+	            }
+	            else
+	            {
 	            signalGprsIndicatorState = EAknSignalEdgeIndicatorOff;
 	            signalIndicatorState = EAknSignalCommonPacketDataIndicatorOff;
-	            iGprsSuspendedNoteShown = EFalse;
+	            }
+              iGprsSuspendedNoteShown = EFalse;
 	            iGprsActivated = EFalse;
 	            iGprsSuspended = EFalse;
 	            iCallActivated = EFalse;
@@ -2077,8 +2085,17 @@
 
             case EPSGprsUnattached:
             default:
+                if ( iTDEnable )
+	              {
+	              signalGprsIndicatorState = EAknSignalGprsIndicatorAvailable;
+	              signalIndicatorState = EAknSignalCommonPacketDataIndicatorAvailable;
+	              }
+	              else
+	              {
                 signalGprsIndicatorState = EAknSignalGprsIndicatorOff;
                 signalIndicatorState = EAknSignalCommonPacketDataIndicatorOff;
+                }
+
                 iGprsSuspendedNoteShown = EFalse;
                 iGprsActivated = EFalse;
                 iGprsSuspended = EFalse;

--- a/coreapplicationuis/advancedtspcontroller/data/keyinfmtx.rul	Wed Mar 31 21:49:52 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/data/keyinfmtx.rul	Wed Apr 14 16:08:26 2010 +0300
@@ -11,10 +11,6 @@
                 <contextRef source='Call' type='State'/>
                 <string>None</string>
             </equals>
-            <equals>
-                <contextRef source='CurrentVolume' type='Mute'/>
-                <string>Off</string>
-            </equals>
         </and>
         <actions>
             <!-- FM Tx has been enabled -->

--- a/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss	Wed Mar 31 21:49:52 2010 +0300
+++ b/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss	Wed Apr 14 16:08:26 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -788,7 +788,7 @@
     {
     number = EAknSettingPageNoOrdinalDisplayed;
     label = qtn_acc_sett_def_prof;
-    softkey_resource = R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT;
+    softkey_resource = R_AVKON_SOFTKEYS_CANCEL;
     type = EAknSetListBox;
     editor_resource_id = r_setting_listbox;
     }