--- a/policymanagement/dmutilserver/src/DMUtilSession.cpp	Tue Aug 31 16:04:06 2010 +0300
+++ b/policymanagement/dmutilserver/src/DMUtilSession.cpp	Wed Sep 01 12:27:42 2010 +0100
@@ -31,8 +31,7 @@
 #include <centralrepository.h>
 
 #include <coreapplicationuisdomainpskeys.h>
-#include <hbsymbianvariant.h>
-#include <hbindicatorsymbian.h>
+
 
 
 #include <e32property.h>
@@ -49,10 +48,6 @@
 _LIT( MDriveColon, ":");
 _LIT( KMMCEraseFlagFileName, "fmmc.dat");
 
-_LIT(KDMSettingsIndicatorType, "com.nokia.devicemanagement.settingsindicatorplugin/1.0");
-_LIT(KTarmTrustManagementActive, "ManagementActive");
-_LIT(KTarmTrustTerminalSecurity, "TerminalSecurity");
-
 // MACROS
 
 
@@ -344,9 +339,6 @@
 	//get terminal security and management state from centrep
 	TInt terminalSecurity = 0;
 	TInt err( KErrNone );
-	
-	CHbIndicatorSymbian *ind = CHbIndicatorSymbian::NewL();
-	CleanupStack::PushL(ind);
 
 	if ( !aCenRep)
 		{
@@ -365,34 +357,19 @@
 	if ( CDMUtilServer::iManagementActive )			
 		{
 		RDEBUG(" iManagementActive is ETrue -> ECoreAppUIsTarmMngActiveIndicatorOn");
-		//err = RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator, ECoreAppUIsTarmMngActiveIndicatorOn);
-		
-		CHbSymbianVariant* parameter = CHbSymbianVariant::NewL(&KTarmTrustManagementActive,  
-                            CHbSymbianVariant::EDes);
-		ind->Activate(KDMSettingsIndicatorType, parameter );
-		delete parameter;
-
+		err = RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator, ECoreAppUIsTarmMngActiveIndicatorOn);	
 		}
 	else if ( terminalSecurity )
 		{
 		RDEBUG(" terminalSecurity is ETrue -> ECoreAppUIsTarmTerminalSecurityOnIndicatorOn");
-		//err = RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator, ECoreAppUIsTarmTerminalSecurityOnIndicatorOn);
-		
-		CHbSymbianVariant* parameter = CHbSymbianVariant::NewL(&KTarmTrustTerminalSecurity,  
-                            CHbSymbianVariant::EDes);
-		ind->Activate(KDMSettingsIndicatorType, parameter );
-		delete parameter;
+		err = RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator, ECoreAppUIsTarmTerminalSecurityOnIndicatorOn);	
 		}
 	else
 		{
 		RDEBUG(" terminalSecurity is EFalse -> ECoreAppUIsTarmIndicatorsOff");
-		//err = RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator, ECoreAppUIsTarmIndicatorsOff);
-		
-		ind->Deactivate(KDMSettingsIndicatorType);
+		err = RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator, ECoreAppUIsTarmIndicatorsOff);	
 		}	
 	
-	CleanupStack::PopAndDestroy(ind);
-	
 	if( err != KErrNone )
 		{
 		RDEBUG8_2("CDMUtilSession::SetIndicatorStateL ERROR: %d",err);