Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

16 files changed, 53 insertions, 53 deletions

diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index e5c3c2ff..678ba827 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -70,7 +70,7 @@ URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name
   TQString whatsthis =i18n("With this line edit you can insert the URI of the resource you want to reach");  
   setWhatsThis(whatsthis);
   setLabelText(" Uri  :");
-  setButtonIcon("fileopen");
+  setButtonIcon("document-open");
   setToolTip(i18n("Open the URI selector"));
     
   connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFileDialog()));
diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp
index d36fecf8..7cb4c097 100644
--- a/quanta/components/debugger/debuggerbreakpointview.cpp
+++ b/quanta/components/debugger/debuggerbreakpointview.cpp
@@ -67,7 +67,7 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam
   setAllColumnsShowFocus(true);
 
   m_breakpointPopup = new TDEPopupMenu(this);
-  m_breakpointPopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()));
+  m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()));
 
   connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 4799afe4..9624416f 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -60,14 +60,14 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name)
   setSorting(-1); // No sorting
   
   m_variablePopup = new TDEPopupMenu(this);
-  m_variablePopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch);
+  m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch);
 
   if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue))
     m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQT_SLOT(slotVariableSetValue()), 0, setValue);
 
   m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQT_SLOT(slotVariableDump()), 0, dumpValue);
   
-  m_variablePopup->insertItem(SmallIcon("editcopy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue);
+  m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue);
 
   connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 }
diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
index 97c82811..d20ab7cd 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
@@ -123,7 +123,7 @@ void  TagImgDlg::initDialog(){
   widgetImg= new PictureView(this);
   grid->addMultiCellWidget(widgetImg, 5, 10, 0, 4);
 
-  buttonImgSource->setPixmap( SmallIcon("fileopen") );
+  buttonImgSource->setPixmap( SmallIcon("document-open") );
   buttonRecalcImgSize->setPixmap( SmallIcon("reload") );
   
 }
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 05fad523..06625c74 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -46,10 +46,10 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name )
   m_popupMenu = new TDEPopupMenu(this);
   connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
      this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&)));
-  m_popupMenu->insertItem( SmallIconSet("editcopy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ;
-  m_popupMenu->insertItem( SmallIconSet("filesaveas"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ;
+  m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ;
+  m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ;
   m_popupMenu->insertSeparator();
-  m_popupMenu->insertItem( SmallIconSet("editclear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ;
+  m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ;
 
   connect( this, TQT_SIGNAL(clicked(TQListBoxItem*)), TQT_SLOT(clickItem(TQListBoxItem*)) );
 }
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index f74f4a3a..966b1491 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -97,7 +97,7 @@ void ProjectPrivate::initActions(TDEActionCollection *ac)
   m_projectRecent->setToolTip(i18n("Open/Open recent project"));
   connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject()));
 
-  closeprjAction =  new TDEAction( i18n( "&Close Project" ), "fileclose", 0,
+  closeprjAction =  new TDEAction( i18n( "&Close Project" ), "window-close", 0,
                         this, TQT_SLOT( slotCloseProject() ),
                         ac, "project_close" );
 
@@ -108,13 +108,13 @@ void ProjectPrivate::initActions(TDEActionCollection *ac)
           this, TQT_SLOT(slotOpenProjectView(const TQString &)));
   openPrjViewAction->setToolTip(i18n("Open project view"));
 
-  savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "filesave", 0,
+  savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "document-save", 0,
                         this, TQT_SLOT( slotSaveProjectView() ),
                         ac, "project_view_save" );
-  saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "filesaveas", 0,
+  saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "document-save-as", 0,
                         this, TQT_SLOT( slotSaveAsProjectView() ),
                         ac, "project_view_save_as" );
-  deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "editdelete", 0,
+  deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "edit-delete", 0,
                         ac, "project_view_delete" );
   connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)),
           this, TQT_SLOT(slotDeleteProjectView(const TQString &)));
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 3ea5d11e..6d65d9b6 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -1050,11 +1050,11 @@ void QuantaInit::initActions()
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ),
                         TQT_TQOBJECT(ac), "tag_frame_wizard" );
 
-    (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "editpaste", 0,
+    (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "edit-paste", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ),
                         TQT_TQOBJECT(ac), "edit_paste_html_quoted" );
 
-    (void) new TDEAction( i18n( "Paste &URL Encoded" ), "editpaste", 0,
+    (void) new TDEAction( i18n( "Paste &URL Encoded" ), "edit-paste", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ),
                         TQT_TQOBJECT(ac), "edit_paste_url_encoded" );
 
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index bcef6729..158ba563 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -282,7 +282,7 @@ void QuantaView::updateTab()
 {
     if (qConfig.showCloseButtons == "ShowAlways")
     {
-        setIcon(SmallIcon("fileclose"));
+        setIcon(SmallIcon("window-close"));
     }
     if (m_document)
     {
@@ -298,7 +298,7 @@ void QuantaView::updateTab()
                setMDICaption(urlStr + " " + i18n("[modified]"));
             } else
             {
-                setIcon(SmallIcon("filesave"));
+                setIcon(SmallIcon("document-save"));
                 setMDICaption(urlStr);
             }
             m_szCaption = urlStr + " " + i18n("[modified]");
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index af057900..831b81f0 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -67,12 +67,12 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent,
     m_lastActiveEditorView = 0L;
     m_documentationView = 0L;
     m_tabPopup = new TDEPopupMenu(quantaApp);
-    m_tabPopup->insertItem(SmallIcon("fileclose"), i18n("&Close"), this, TQT_SLOT(slotCloseView()));
+    m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(slotCloseView()));
     m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs()));
     m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll()));
     m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReloadFile()), 0, RELOAD_ID);
     m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID);
-    m_tabPopup->insertItem(SmallIcon("editdelete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID);
+    m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID);
     m_tabPopup->insertSeparator();
     m_fileListPopup = new TDEPopupMenu(quantaApp);
     connect(m_fileListPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileListPopupAboutToShow()));
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 948778e0..3a3a7029 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -884,7 +884,7 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil
       if (sMoving || (sReading && sDeleting))
         popup.insertItem(SmallIconSet("goto"), i18n("&Move Here"), 2 );
       if (sReading)
-        popup.insertItem(SmallIconSet("editcopy"), i18n("&Copy Here"), 1 );
+        popup.insertItem(SmallIconSet("edit-copy"), i18n("&Copy Here"), 1 );
       if (sLinking)
         popup.insertItem(SmallIconSet("www"), i18n("&Link Here"), 3 );
       popup.insertSeparator();
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index a8fb6f01..1b438a0e 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -84,34 +84,34 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
 
   m_fileMenu = new TDEPopupMenu(this);
 
-  m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
+  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
   m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag()));
-  m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
+  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
   m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject()));
-  m_fileMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
   m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
-  m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
-  createNewMenu->insertItem(SmallIcon("folder_new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
+  createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
   createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
 
   m_folderMenu = new TDEPopupMenu();
 
-  m_folderMenu->insertItem(SmallIcon("folder_new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()));
+  m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()));
   m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop()));
   m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate()));
   m_folderMenu->insertItem(SmallIcon("empty"), i18n("&Create New"), createNewMenu);
   m_folderMenu->insertSeparator();
   m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
-  m_folderMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("editpaste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
+  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
   m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQT_SLOT(slotChangeAlias()));
   m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
-  m_menuDel = m_folderMenu->insertItem( SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 0da3eb9e..26e6ed43 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -125,41 +125,41 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
 
   m_fileMenu = new TDEPopupMenu(this);
 
-  m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this, TQT_SLOT(slotOpen()));
+  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQT_SLOT(slotOpen()));
   m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar()));
   m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag()));
-  m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
+  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL()));
   m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL()));
   m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
-  m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
-  createNewMenu->insertItem(SmallIcon("folder_new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
+  createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
   createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
 
   m_folderMenu = new TDEPopupMenu(this);
 
-  m_folderMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu);
+  m_folderMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu);
   m_folderMenu->insertSeparator();
   m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL()));
   m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL()));
   m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate()));
   m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
-  m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
   m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus()));
   m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_projectMenu = new TDEPopupMenu(this);
-  m_projectMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu);
+  m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu);
   m_projectMenu->insertSeparator();
   m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject()));
   m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQT_SLOT(slotRescan()));
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index af04b9cd..c1cc3b62 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -100,13 +100,13 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
 
   m_fileMenu = new TDEPopupMenu();
 
-  m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
+  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
   m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith()));
-  m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
+  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
 //  m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject()));
-  m_fileMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
@@ -114,9 +114,9 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
   m_folderMenu = new TDEPopupMenu();
 
 //  m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
-  m_folderMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("editpaste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
-  m_menuDel = m_folderMenu->insertItem( SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
+  m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_folderMenu->insertSeparator();
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index a46cb590..feb56bc9 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -830,7 +830,7 @@ void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListV
     
     TDEPopupMenu *menu = new TDEPopupMenu( this );
     menu->insertItem( i18n("&Move Here"), DRAG_MOVE, 0 );
-    menu->insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 );
+    menu->insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), DRAG_COPY, 1 );
     menu->insertSeparator();
     menu->insertItem( SmallIcon("cancel"), i18n("C&ancel"), DRAG_CANCEL, 3 );
     int id = menu->exec(TQCursor::pos(), 0);
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index c82de08e..e8d0bbfc 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -466,13 +466,13 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char
 
   widgetLayout->addWidget( nodeName, 0, 0 );
   deleteTag = new KPushButton(this, i18n( "Delete Tag" ).ascii());
-  deleteTag->setPixmap(SmallIcon("editdelete"));
+  deleteTag->setPixmap(SmallIcon("edit-delete"));
   deleteTag->setMaximumHeight(32);
   deleteTag->setMaximumWidth(32);
   TQToolTip::add(deleteTag, i18n("Delete the current tag only."));
 
   deleteAll = new KPushButton(this, i18n( "Delete All" ).ascii());
-  deleteAll->setPixmap(SmallIcon("editdelete"));
+  deleteAll->setPixmap(SmallIcon("edit-delete"));
   deleteAll->setMaximumHeight(32);
   deleteAll->setMaximumWidth(32);
   TQToolTip::add(deleteAll, i18n("Delete the current tag and all its children."));
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 1d421d61..700dfcff 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -144,28 +144,28 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name )
   m_fileMenu = new TDEPopupMenu(this);
 
   m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert()));
-  m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
+  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
   m_fileMenu->insertItem(SmallIcon("mail_send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
   m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate()));
   m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject()));
-  m_menuClose = m_fileMenu->insertItem(SmallIcon("fileclose"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
+  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_folderMenu = new TDEPopupMenu(this);
 
-  m_folderMenu->insertItem(SmallIcon("folder_new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir()));
+  m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir()));
   m_folderMenu->insertItem(SmallIcon("mail_send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
   m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate()));
   m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate()));
   m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("editpaste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
-  m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
+  m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));