--- a/coreapplicationuis/Rfs/src/rfs.rss	Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfs.rss	Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -27,10 +27,7 @@
 #include "rfs.loc"
 #include <eikon.rsg>
 #include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.hrh>
-#include <avkon.mbg>
+
 
 // RESOURCE DEFINITIONS 
 
@@ -42,76 +39,12 @@
 
 RESOURCE TBUF r_device_restart { buf = qtn_rfs_note_device_restart; }
 
-// -----------------------------------------------------------------------------
-// R_CONFIRM_RFS
-// -----------------------------------------------------------------------------
 
-RESOURCE DIALOG r_confirm_rfs
-    {
-    flags = EGeneralQueryFlags;
-
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY 
-                { 
-                layout = EConfirmationLayout;
-                label = qtn_rfs_restore_query;
-                };
-            }
-        };
-    }
-
-// -----------------------------------------------------------------------------
-// R_CONFIRM_DEEP_RFS
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confirm_deep_rfs
-    {
-    flags = EGeneralQueryFlags;
+RESOURCE TBUF r_confirm_rfs { buf = qtn_rfs_restore_query; }
 
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationLayout;
-                label = qtn_rfs_reset_phone_settings;
-                };
-            }
-        };
-    }
+RESOURCE TBUF r_confirm_deep_rfs { buf = qtn_rfs_reset_phone_settings; }
 
-// -----------------------------------------------------------------------------
-// R_CLOSING_CONNECTIONS
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_closing_connections
-    {
-    flags = EAknWaitNoteFlags | EEikDialogFlagWait;
-    buttons = R_AVKON_SOFTKEYS_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout = EWaitLayout;
-                singular_label = qtn_rfs_note_closing_connections;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
+RESOURCE TBUF r_closing_connections { buf = qtn_rfs_note_closing_connections; }
+
 
 // End of File