diff -Naur kdebase.old/konqueror/about/konq_aboutpage.cc kdebase/konqueror/about/konq_aboutpage.cc
--- kdebase.old/konqueror/about/konq_aboutpage.cc	2005-07-06 01:05:53.000000000 -0700
+++ kdebase/konqueror/about/konq_aboutpage.cc	2005-07-07 00:00:46.000000000 -0700
@@ -11,6 +11,7 @@
 #include <kstandarddirs.h>
 #include <kaction.h>
 #include <kiconloader.h>
+#include <kglobalsettings.h>
 
 #include <assert.h>
 #include <qfile.h>
@@ -85,6 +86,11 @@
 
 QString KonqAboutPageFactory::launch()
 {
+  static QString s_documentPath;
+  static QString s_homePath;
+  static QString s_homeFolder;
+  static QString s_homeIcon;
+
   if ( s_launch_html )
     return *s_launch_html;
 
@@ -92,15 +98,25 @@
   if ( res.isEmpty() )
     return res;
 
+  s_homePath = QDir::homeDirPath() ;
+  s_homePath = QDir::cleanDirPath( s_homePath );
+  s_documentPath = KGlobalSettings::documentPath() ;
+  s_documentPath = QDir::cleanDirPath( s_documentPath ) ;
+  if (QString::compare(s_homePath, s_documentPath) == 0)
+    {s_homeFolder = i18n("Home Folder");
+    s_homeIcon = "kfm_home";}
+  else {s_homeFolder = i18n("User Files"); 
+    s_homeIcon = "gohome";}
+
   KIconLoader *iconloader = KGlobal::iconLoader();
   int iconSize = iconloader->currentSize(KIcon::Desktop);
-  QString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop );
-  QString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop );
+  QString home_icon_path = iconloader->iconPath(s_homeIcon, KIcon::Desktop );
+  QString storage_icon_path = iconloader->iconPath("blockdevice", KIcon::Desktop );
   QString remote_icon_path = iconloader->iconPath("network", KIcon::Desktop );
   QString wastebin_icon_path = iconloader->iconPath("trashcan_full", KIcon::Desktop );
   QString applications_icon_path = iconloader->iconPath("kmenu", KIcon::Desktop );
   QString settings_icon_path = iconloader->iconPath("kcontrol", KIcon::Desktop );
-  QString home_folder = QDir::homeDirPath();
+  QString home_folder = s_documentPath ;
   QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
 
   res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
@@ -121,7 +137,7 @@
       .arg( home_icon_path )
       .arg(iconSize).arg(iconSize)
       .arg( home_folder )
-      .arg( i18n( "Home Folder" ) )
+      .arg( s_homeFolder )
       .arg( i18n( "Your personal files" ) )
       .arg( storage_icon_path )
       .arg(iconSize).arg(iconSize)
diff -Naur kdebase.old/konqueror/konq_mainwindow.cc kdebase/konqueror/konq_mainwindow.cc
--- kdebase.old/konqueror/konq_mainwindow.cc	2005-07-06 03:04:21.000000000 -0700
+++ kdebase/konqueror/konq_mainwindow.cc	2005-07-06 23:46:03.000000000 -0700
@@ -3702,7 +3702,7 @@
 	   SLOT( slotHome(KAction::ActivationReason, Qt::ButtonState) ) );
 
   (void) new KAction( i18n( "App&lications" ), "kmenu", 0, this, SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
-  (void) new KAction( i18n( "&Storage Media" ), "system", 0, this, SLOT( slotGoMedia() ), actionCollection(), "go_media" );
+  (void) new KAction( i18n( "&Storage Media" ), "blockdevice", 0, this, SLOT( slotGoMedia() ), actionCollection(), "go_media" );
   (void) new KAction( i18n( "&Network Folders" ), "network", 0, this, SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
   (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, this, SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
   //(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
