System icons replaced

profibus/exe/profinet_viewer/qt/pn_viewer_qt.cqt

@@ -70,7 +70,7 @@ PnViewerQt::PnViewerQt(const char* v_name, const char* v_device,
   // File Entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "xtt_close.png");
 
   // Functions Entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("F&unctions"));
@@ -84,16 +84,16 @@ PnViewerQt::PnViewerQt(const char* v_name, const char* v_device,
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Help menu
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   // Statusbar and cmd input
   QStatusBar* statusbar = new QStatusBar();

profibus/lib/cow/qt/cow_pb_gsd_attr_qt.cqt

@@ -230,9 +230,9 @@ GsdAttrQt::GsdAttrQt(void* a_parent_ctx, void* a_object, pb_gsd* a_gsd,
   // File entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit entry
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -251,16 +251,16 @@ GsdAttrQt::GsdAttrQt(void* a_parent_ctx, void* a_object, pb_gsd* a_gsd,
   // View Entry
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   // Navigator
   attrnav = new GsdAttrNavQt(this, "Plant", gsd, edit_mode, &brow_widget, &sts);

profibus/lib/cow/qt/cow_pn_gsdml_attr_qt.cqt

@@ -267,9 +267,9 @@ GsdmlAttrQt::GsdmlAttrQt(void* a_parent_ctx, void* a_object, pn_gsdml* a_gsdml,
   // File entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit entry
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -303,16 +303,16 @@ GsdmlAttrQt::GsdmlAttrQt(void* a_parent_ctx, void* a_object, pn_gsdml* a_gsdml,
   addCheckableMenuItem(
       toplevel, view, "_View I/O", SLOT(activate_viewio(bool)));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   // Navigator
   attrnav = new GsdmlAttrNavQt(this, "Plant", gsdml, edit_mode, &brow_widget,

sev/exe/sev_xtt/qt/xtt_tbl_qt.cqt

@@ -249,11 +249,11 @@ XttTblQt::XttTblQt(void* a_parent_ctx, sevcli_tCtx a_sevcli,
   // File entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(toplevel, file, "&Login", SLOT(activate_login()));
   addMenuItem(toplevel, file, "Log&Out", SLOT(activate_logout()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("F&unctions"));
@@ -269,16 +269,16 @@ XttTblQt::XttTblQt(void* a_parent_ctx, sevcli_tCtx a_sevcli,
   addMenuItem(toplevel, view, "&Tree Layout", SLOT(activate_tree_layout()));
   addMenuItem(toplevel, view, "&List Layout", SLOT(activate_list_layout()));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&Overview", SLOT(activate_help()), "CTRL+H",
-      "system-help");
+      "$pwr_exe/xtt_help.png");
   addMenuItem(toplevel, help, "&Project", SLOT(activate_help_project()));
   addMenuItem(toplevel, help, "&About Proview", SLOT(activate_help_proview()));
 

wb/lib/wb/gtk/wb_wpkg_gtk.cpp

@@ -358,7 +358,7 @@ WPkgGtk::WPkgGtk(GtkWidget* wa_parent_wid, void* wa_parent_ctx)
   GtkToolbar* tools = (GtkToolbar*)g_object_new(GTK_TYPE_TOOLBAR, NULL);
 
   GtkWidget* tools_distribute = gtk_button_new();
-  dcli_translate_filename(fname, "$pwr_exe/wpkg_distribute.png");
+  dcli_translate_filename(fname, "$pwr_exe/wb_send.png");
   gtk_container_add(
       GTK_CONTAINER(tools_distribute), gtk_image_new_from_file(fname));
   g_signal_connect(tools_distribute, "clicked",

wb/lib/wb/gtk/wb_wtt_gtk.cpp

@@ -2839,8 +2839,8 @@ WttGtk::WttGtk(void* wt_parent_ctx, GtkWidget* wt_parent_wid,
   GtkToolbar* tools = (GtkToolbar*)g_object_new(GTK_TYPE_TOOLBAR, NULL);
 
   tools_save_w = gtk_button_new();
-  gtk_container_add(GTK_CONTAINER(tools_save_w),
-      gtk_image_new_from_stock("gtk-save", GTK_ICON_SIZE_SMALL_TOOLBAR));
+  dcli_translate_filename(fname, "$pwr_exe/wb_save.png");
+  gtk_container_add(GTK_CONTAINER(tools_save_w), gtk_image_new_from_file(fname));
   g_signal_connect(
       tools_save_w, "clicked", G_CALLBACK(WttGtk::activate_save), this);
   g_object_set(tools_save_w, "can-focus", FALSE, NULL);
@@ -2856,8 +2856,8 @@ WttGtk::WttGtk(void* wt_parent_ctx, GtkWidget* wt_parent_wid,
   gtk_toolbar_append_widget(tools, tools_edit_w, "Edit", "");
 
   tools_buildnode_w = gtk_button_new();
-  gtk_container_add(GTK_CONTAINER(tools_buildnode_w),
-      gtk_image_new_from_stock("gtk-execute", GTK_ICON_SIZE_SMALL_TOOLBAR));
+  dcli_translate_filename(fname, "$pwr_exe/wb_build.png");
+  gtk_container_add(GTK_CONTAINER(tools_buildnode_w), gtk_image_new_from_file(fname));
   if (wb_type == wb_eType_ClassEditor
       || (wbctx && volid && (volclass == pwr_eClass_SharedVolume
                                 || volclass == pwr_eClass_SubVolume))) {
@@ -2927,8 +2927,8 @@ WttGtk::WttGtk(void* wt_parent_ctx, GtkWidget* wt_parent_wid,
   gtk_toolbar_append_widget(tools, tools_messages, "Show Messages", "");
 
   GtkWidget* tools_options = gtk_button_new();
-  gtk_container_add(GTK_CONTAINER(tools_options),
-      gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_SMALL_TOOLBAR));
+  dcli_translate_filename(fname, "$pwr_exe/wb_options.png");
+  gtk_container_add(GTK_CONTAINER(tools_options), gtk_image_new_from_file(fname));
   g_signal_connect(
       tools_options, "clicked", G_CALLBACK(WttGtk::activate_view), this);
   g_object_set(tools_options, "can-focus", FALSE, NULL);

wb/lib/wb/qt/wb_bckw_qt.cqt

@@ -65,12 +65,12 @@ WbBckWQt::WbBckWQt(void* bckw_parent_ctx, ldh_tSession bckw_ldhses,
   addMenuItem(toplevel, file, "&Compare Backup File", SLOT(activate_diff()));
   addMenuItem(toplevel, file, "C&ompare Database", SLOT(activate_diff_wb()));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(
       toplevel, file, "&Transfer to database", SLOT(activate_transfer_wb()));
   addMenuItem(toplevel, file, "&Filter", SLOT(activate_filter()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit menu
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -80,16 +80,16 @@ WbBckWQt::WbBckWQt(void* bckw_parent_ctx, ldh_tSession bckw_ldhses,
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Help menu
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   QVBoxLayout* form = new QVBoxLayout(toplevel);
 

wb/lib/wb/qt/wb_expw_qt.cqt

@@ -63,7 +63,7 @@ WbExpWQt::WbExpWQt(void* expw_parent_ctx, ldh_tSession expw_ldhses,
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, btext, SLOT(activate_export()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit menu
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -77,16 +77,16 @@ WbExpWQt::WbExpWQt(void* expw_parent_ctx, ldh_tSession expw_ldhses,
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Help Entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   // Toolbar
   QToolBar* tools = new QToolBar();

wb/lib/wb/qt/wb_foe_qt.cqt

@@ -771,7 +771,7 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
   syntax
       = addMenuItem(toplevel, file, "Synta&x Check", SLOT(activate_syntax()));
   compile = addMenuItem(toplevel, file, "&Build", SLOT(activate_compile()),
-      "CTRL+SHIFT+B", "system-run");
+      "CTRL+SHIFT+B", "$pwr_exe/wb_build.png");
   plcattribute = addMenuItem(
       toplevel, file, "Plc &Attributes...", SLOT(activate_plcattribute()));
   winddelete = addMenuItem(
@@ -782,7 +782,7 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
       toplevel, file, "&Restore Trace", SLOT(activate_restoretrace()));
   addMenuItem(toplevel, file, "&History", SLOT(activate_history()));
   exit = addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit Entry
   edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -928,11 +928,11 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
   // Zoom submenu
   QMenu* view_zoom = menu_bar->addMenu(translate_utf8("&Zoom"));
   addMenuItem(toplevel, view_zoom, "Zoom &In", SLOT(activate_zoomin()),
-      "CTRL+I", "zoom-in");
+      "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view_zoom, "Zoom &Out", SLOT(activate_zoomout()),
-      "CTRL+O", "zoom-out");
+      "CTRL+O", "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view_zoom, "Zoom &Reset", SLOT(activate_unzoom()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   addCheckableMenuItem(
       toplevel, view, "S&how Execute Order", SLOT(activate_showexeord(bool)));
@@ -961,7 +961,7 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
   addMenuItem(toplevel, help, "H&elp on PlcPgm", SLOT(activate_helpplc()));
   addMenuItem(
       toplevel, help, "He&lp PlcPgm Overview", SLOT(activate_helpplclist()));
@@ -969,15 +969,15 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
   // Toolbar
   QToolBar* tools = new QToolBar();
   tools_save = addToolItem(
-      toplevel, tools, "Save", SLOT(activate_save()), "document-save");
+      toplevel, tools, "Save", SLOT(activate_save()), "$pwr_exe/wb_save.png");
   addToolItem(toplevel, tools, "Print documents", SLOT(activate_print()),
-      "document-print");
-  addCheckableToolItem(toplevel, tools, "Set edit mode",
-      SLOT(activate_edit_togg(bool)), "$pwr_exe/foe_edit.png");
-  addCheckableToolItem(toplevel, tools, "Set view mode",
-      SLOT(activate_view_togg(bool)), "$pwr_exe/foe_view.png");
+      "$pwr_exe/wb_print.png");
+  addToolItem(toplevel, tools, "Set edit mode", SLOT(activate_edit_togg()),
+      "$pwr_exe/foe_edit.png");
+  addToolItem(toplevel, tools, "Set view mode", SLOT(activate_view_togg()),
+      "$pwr_exe/foe_view.png");
   tools_build = addToolItem(
-      toplevel, tools, "Build Program", SLOT(activate_compile()), "system-run");
+      toplevel, tools, "Build Program", SLOT(activate_compile()), "$pwr_exe/wb_build.png");
   addToolItem(toplevel, tools, "Zoom in", SLOT(activate_zoomin()),
       "$pwr_exe/xtt_zoom_in.png");
   addToolItem(toplevel, tools, "Zoom out", SLOT(activate_zoomout()),

wb/lib/wb/qt/wb_uted_qt.cqt

@@ -161,7 +161,7 @@ WUtedQt::WUtedQt(void* wu_parent_ctx, const char* wu_name,
   // File Entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // View Entry
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
@@ -224,7 +224,7 @@ WUtedQt::WUtedQt(void* wu_parent_ctx, const char* wu_name,
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&On Window", SLOT(activate_helputils()),
-      "CTRL+H", "system-help");
+      "CTRL+H", "$pwr_exe/xtt_help.png");
   addMenuItem(toplevel, help, "On &Commands", SLOT(activate_helppwr_plc()));
 
   // Qualifier labels, entries and checkboxes

wb/lib/wb/qt/wb_vsel_qt.cqt

@@ -255,7 +255,7 @@ WVselQt::WVselQt(pwr_tStatus* status, void* wv_parent_ctx,
   // File Entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&Close", SLOT(activate_close()), "CTRL+W",
-      "window-close");
+      "$pwr_exe/xtt_close.png");
 
   // Functions Entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("F&unctions"));

wb/lib/wb/qt/wb_watt_qt.cqt

@@ -399,7 +399,7 @@ WAttQt::WAttQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&Print", SLOT(activate_print()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -411,7 +411,7 @@ WAttQt::WAttQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   pane = new QSplitter(Qt::Vertical);
 

wb/lib/wb/qt/wb_watttext_qt.cqt

@@ -213,7 +213,7 @@ WAttTextQt::WAttTextQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
       "document-save");
   addMenuItem(toplevel, file, "S&ave and close", SLOT(activate_ok()), "CTRL+T");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit entry
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -227,7 +227,7 @@ WAttTextQt::WAttTextQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   if (((WUtility*)parent_ctx)->utype == wb_eUtility_WNav) {
     parent_ctx = ((WNav*)parent_ctx)->parent_ctx;

wb/lib/wb/qt/wb_wda_qt.cqt

@@ -495,7 +495,7 @@ WdaQt::WdaQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
       toplevel, file, "Import from Textfile", SLOT(activate_import_text()));
   addMenuItem(toplevel, file, "&Print", SLOT(activate_print()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -507,7 +507,7 @@ WdaQt::WdaQt(void* wa_parent_ctx, ldh_tSesContext wa_ldhses,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   pane = new QSplitter(Qt::Vertical);
 

wb/lib/wb/qt/wb_wge_qt.cqt

@@ -229,21 +229,21 @@ WGeQt::WGeQt(void* wge_parent_ctx, char* wge_name, char* wge_filename,
     // File Entry
     QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
     addMenuItem(
-        toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+        toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
     // View menu
     QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
     addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-        "zoom-in");
+        "$pwr_exe/xtt_zoom_in.png");
     addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()),
-        "CTRL+O", "zoom-out");
+        "CTRL+O", "$pwr_exe/xtt_zoom_out.png");
     addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-        "zoom-original");
+        "$pwr_exe/xtt_zoom_reset.png");
 
     // Menu Help
     QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
     addMenuItem(toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H",
-        "system-help");
+        "$pwr_exe/xtt_help.png");
 
     graph_form->setMenuBar(menu_bar);
   }

wb/lib/wb/qt/wb_wpkg_qt.cqt

@@ -187,7 +187,7 @@ WPkgQt::WPkgQt(void* wa_parent_ctx) : WPkg(wa_parent_ctx)
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&History", SLOT(activate_history()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions Entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("F&unctions"));
@@ -201,11 +201,11 @@ WPkgQt::WPkgQt(void* wa_parent_ctx) : WPkg(wa_parent_ctx)
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
   addCheckableMenuItem(toplevel, view, "&Display File Differences",
       SLOT(activate_dmode_filediff(bool)));
   addCheckableMenuItem(toplevel, view, "Display Files In &Time Order",

wb/lib/wb/qt/wb_wrev_qt.cqt

@@ -179,7 +179,7 @@ WRevQt::WRevQt(void* wa_parent_ctx, ldh_tSession wa_ldhses)
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&History", SLOT(activate_history()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions Entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("F&unctions"));
@@ -192,16 +192,16 @@ WRevQt::WRevQt(void* wa_parent_ctx, ldh_tSession wa_ldhses)
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   // Toolbar
   QToolBar* tools = new QToolBar();

wb/lib/wb/qt/wb_wtt_qt.cqt

@@ -1916,15 +1916,15 @@ WttQt::WttQt(void* wt_parent_ctx, const char* wt_name, const char* iconname,
   addMenuItem(
       toplevel, file, "Volume &Attributes...", SLOT(activate_openvolobject()));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   menu_save_w = addMenuItem(toplevel, file, "&Save", SLOT(activate_save()),
-      "CTRL+S", "document-save");
+      "CTRL+S", "$pwr_exe/wb_save.png");
   menu_revert_w = addMenuItem(toplevel, file, "&Revert",
-      SLOT(activate_revert()), "", "document-revert");
+      SLOT(activate_revert()), "", "$pwr_exe/wb_revert.png");
   addMenuItem(toplevel, file, "&History", SLOT(activate_history()));
   addMenuItem(toplevel, file, "R&evisions", SLOT(activate_revisions()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit Entry
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -2003,7 +2003,7 @@ WttQt::WttQt(void* wt_parent_ctx, const char* wt_name, const char* iconname,
   // Submenu Build
   QMenu* functions_build = functions->addMenu(translate_utf8("&Build"));
   menu_buildnode_w = addMenuItem(toplevel, functions_build, "&Build Node",
-      SLOT(activate_buildnode()), "CTRL+SHIFT+B", "system-run");
+      SLOT(activate_buildnode()), "CTRL+SHIFT+B", "$pwr_exe/wb_build.png");
   menu_buildvolume_w = addMenuItem(
       toplevel, functions_build, "B&uild Volume", SLOT(activate_buildvolume()));
   menu_buildobject_w = addMenuItem(
@@ -2049,11 +2049,11 @@ WttQt::WttQt(void* wt_parent_ctx, const char* wt_name, const char* iconname,
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
   addMenuItem(
       toplevel, view, "T&wo Windows", SLOT(activate_twowindows()), "CTRL+T");
   view_alltoplevel_w = addMenuItem(
@@ -2084,14 +2084,14 @@ WttQt::WttQt(void* wt_parent_ctx, const char* wt_name, const char* iconname,
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&Overview", SLOT(activate_help()), "CTRL+H",
-      "system-help");
+      "$pwr_exe/xtt_help.png");
   addMenuItem(toplevel, help, "&Project", SLOT(activate_help_project()));
   addMenuItem(toplevel, help, "&About Proview", SLOT(activate_help_proview()));
 
   // Toolbar
   QToolBar* tools = new QToolBar();
   tools_save_w = addToolItem(
-      toplevel, tools, "Save", SLOT(activate_save()), "document-save");
+      toplevel, tools, "Save", SLOT(activate_save()), "$pwr_exe/wb_save.png");
   tools_edit_w = addToolItem(toplevel, tools, "Edit",
       SLOT(activate_configure()), "$pwr_exe/foe_edit.png");
 
@@ -2099,10 +2099,10 @@ WttQt::WttQt(void* wt_parent_ctx, const char* wt_name, const char* iconname,
       || (wbctx && volid && (volclass == pwr_eClass_SharedVolume
                                 || volclass == pwr_eClass_SubVolume))) {
     tools_buildnode_w = addToolItem(toplevel, tools, "Build Volume",
-        SLOT(activate_buildvolume()), "system-run");
+        SLOT(activate_buildvolume()), "$pwr_exe/wb_build.png");
   } else {
     tools_buildnode_w = addToolItem(toplevel, tools, "Build Node",
-        SLOT(activate_buildnode()), "system-run");
+        SLOT(activate_buildnode()), "$pwr_exe/wb_build.png");
   }
 
   addToolItem(toplevel, tools, "Distribute", SLOT(activate_distribute()),
@@ -2118,7 +2118,7 @@ WttQt::WttQt(void* wt_parent_ctx, const char* wt_name, const char* iconname,
   addToolItem(toplevel, tools, "Show Messages", SLOT(activate_messages()),
       "$pwr_exe/wtt_messages.png");
   addToolItem(
-      toplevel, tools, "Options", SLOT(activate_view()), "preferences-system");
+      toplevel, tools, "Options", SLOT(activate_view()), "$pwr_exe/wb_options.png");
   addToolItem(toplevel, tools, "Zoom in", SLOT(activate_zoom_in()),
       "$pwr_exe/xtt_zoom_in.png");
   addToolItem(toplevel, tools, "Zoom out", SLOT(activate_zoom_out()),

wb/lib/wb/qt/wb_xcrr_qt.cqt

@@ -143,9 +143,9 @@ WCrrQt::WCrrQt(void* xa_parent_ctx, ldh_tSesContext xa_ldhses,
   // File entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));

xtt/exe/rt_xtt/gtk/rt_xtt_gtk.cpp

@@ -1028,8 +1028,8 @@ XttGtk::XttGtk(int argc, char* argv[], int* return_sts)
   GtkToolbar* tools = (GtkToolbar*)g_object_new(GTK_TYPE_TOOLBAR, NULL);
 
   GtkWidget* tools_back = gtk_button_new();
-  gtk_container_add(GTK_CONTAINER(tools_back),
-      gtk_image_new_from_stock("gtk-go-back", GTK_ICON_SIZE_SMALL_TOOLBAR));
+  dcli_translate_filename(fname, "$pwr_exe/xtt_arrowleft.png");
+  gtk_container_add(GTK_CONTAINER(tools_back), gtk_image_new_from_file(fname));
   g_signal_connect(tools_back, "clicked", G_CALLBACK(activate_back), this);
   g_object_set(tools_back, "can-focus", FALSE, NULL);
   gtk_toolbar_append_widget(

xtt/exe/rt_xtt/qt/rt_xtt_qt.cqt

@@ -617,11 +617,11 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts)
   // File Entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(toplevel, file, "&Login", SLOT(activate_login()));
   addMenuItem(toplevel, file, "Log&out", SLOT(activate_logout()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit Entry
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -682,23 +682,23 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts)
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&Overview", SLOT(activate_help()), "CTRL+H",
-      "system-help");
+      "$pwr_exe/xtt_help.png");
   addMenuItem(toplevel, help, "&Navigator", SLOT(activate_help_navigator()));
   addMenuItem(toplevel, help, "&Project", SLOT(activate_help_project()));
   addMenuItem(toplevel, help, "&About Proview", SLOT(activate_help_proview()));
 
   // Toolbar
   QToolBar* tools = new QToolBar();
-  addToolItem(toplevel, tools, "Go back", SLOT(activate_back()), "go-previous");
+  addToolItem(toplevel, tools, "Go back", SLOT(activate_back()), "$pwr_exe/xtt_arrowleft.png");
   QAction* tools_advuser = addToolItem(toplevel, tools, "Advanced user",
       SLOT(activate_advanceduser()), "$pwr_exe/xtt_advuser.png");
   addToolItem(toplevel, tools, "Zoom in", SLOT(activate_zoom_in()),

xtt/lib/cow/qt/cow_logw_qt.cqt

@@ -60,18 +60,18 @@ CoLogWQt::CoLogWQt(void* logw_parent_ctx, const char* logw_name,
   // File Entry
   QMenu* file = menu_bar->addMenu("&File");
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // View menu
   QMenu* view = menu_bar->addMenu("&View");
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   QVBoxLayout* form = new QVBoxLayout(toplevel);
 

xtt/lib/cow/qt/cow_msgwindow_qt.cqt

@@ -70,16 +70,16 @@ MsgWindowQt::MsgWindowQt(void* msg_parent_ctx, const char* msg_name,
   addMenuItem(toplevel, file, "C&lear", SLOT(activate_clear()));
   addMenuItem(toplevel, file, "&Print", SLOT(activate_print()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Create msgnav
   QVBoxLayout* form = new QVBoxLayout();

xtt/lib/cow/qt/cow_rtmon_qt.cqt

@@ -103,21 +103,21 @@ RtMonQt::RtMonQt(void* rtmon_parent_ctx, const char* rtmon_name,
   file_op = addMenuItem(
       toplevel, file, "&Start Operator Environment", SLOT(activate_op()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   QVBoxLayout* vbox = new QVBoxLayout();
   nodelistnav = new NodelistNavQt(this, 0, nodename,

xtt/lib/cow/qt/cow_statusmon_nodelist_qt.cqt

@@ -95,7 +95,7 @@ NodelistQt::NodelistQt(void* nodelist_parent_ctx, const char* nodelist_name,
   addMenuItem(toplevel, file, "Open Runtime &Monitor",
       SLOT(activate_open_rtmon()), "", fname);
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
@@ -133,16 +133,16 @@ NodelistQt::NodelistQt(void* nodelist_parent_ctx, const char* nodelist_name,
   a->setData(nodelist_eMode_Status5);
 
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   msg_window = new MsgWindowQt(this, "Status Events", &sts);
   msg_window->find_wnav_cb = find_node_cb;
@@ -155,7 +155,7 @@ NodelistQt::NodelistQt(void* nodelist_parent_ctx, const char* nodelist_name,
   // Toolbar
   QToolBar* tools = new QToolBar();
   addToolItem(toplevel, tools, "Save configuration", SLOT(activate_save()),
-      "document-save");
+      "$pwr_exe/wb_save.png");
   addToolItem(
       toplevel, tools, "Add node", SLOT(activate_add_node()), "list-add");
   addToolItem(toplevel, tools, "Remove node", SLOT(activate_remove_node()),

xtt/lib/cow/qt/cow_tree_qt.cqt

@@ -144,23 +144,23 @@ CowTreeQt::CowTreeQt(void* a_parent_ctx, const char* title,
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&Print", SLOT(activate_print()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "&Tree Layout", SLOT(activate_tree_layout()));
   addMenuItem(toplevel, view, "&List Layout", SLOT(activate_list_layout()));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&Overview", SLOT(activate_help()), "CTRL+H",
-      "system-help");
+      "$pwr_exe/xtt_help.png");
 
   // Toolbar
   QToolBar* tools = new QToolBar();

xtt/lib/cow/qt/cow_xhelp_qt.cqt

@@ -203,12 +203,12 @@ CoXHelpQt::CoXHelpQt(void* xa_parent_ctx, xhelp_eUtility utility, int* xa_sts)
   addMenuItem(toplevel, file, "&Previous Topic", SLOT(activate_previoustopic()),
       "CTRL+P");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit entry
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
   addMenuItem(toplevel, edit, "&Search", SLOT(activate_search()), "CTRL+F",
-      "system-search");
+      "$pwr_exe/wb_search.png");
   addMenuItem(
       toplevel, edit, "Search &Next", SLOT(activate_searchnext()), "CTRL+G");
   addMenuItem(toplevel, edit, "Search &Previous",
@@ -217,16 +217,16 @@ CoXHelpQt::CoXHelpQt(void* xa_parent_ctx, xhelp_eUtility utility, int* xa_sts)
   // Menu View
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
 
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   // Toolbar
   QToolBar* tools = new QToolBar();

xtt/lib/ge/gtk/ge_gtk.cpp

@@ -2831,15 +2831,11 @@ GeGtk::GeGtk(void* x_parent_ctx, GtkWidget* x_parent_widget,
 
   // Tools row
 
-  GtkWidget* tools_save = gtk_button_new();
-  gtk_container_add(GTK_CONTAINER(tools_save),
-      gtk_image_new_from_stock("gtk-save", GTK_ICON_SIZE_SMALL_TOOLBAR));
+  GtkWidget* tools_save = image_button("$pwr_exe/wb_save.png");
   gtk_toolbar_append_widget(tools3, tools_save, "Save", "");
   g_signal_connect(tools_save, "clicked", G_CALLBACK(activate_save), this);
 
-  GtkWidget* tools_build = gtk_button_new();
-  gtk_container_add(GTK_CONTAINER(tools_build),
-      gtk_image_new_from_stock("gtk-execute", GTK_ICON_SIZE_SMALL_TOOLBAR));
+  GtkWidget* tools_build = image_button("$pwr_exe/wb_build.png");
   gtk_toolbar_append_widget(tools3, tools_build, "Build", "");
   g_signal_connect(tools_build, "clicked", G_CALLBACK(activate_build), this);
 

xtt/lib/ge/qt/ge_attr_qt.cqt

@@ -327,7 +327,7 @@ AttrQt::AttrQt(QWidget* a_parent_wid, void* a_parent_ctx, attr_eType a_type,
     // File entry
     QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
     addMenuItem(
-        toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+        toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
     // Functions entry
     QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -343,7 +343,7 @@ AttrQt::AttrQt(QWidget* a_parent_wid, void* a_parent_ctx, attr_eType a_type,
     // Help entry
     QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
     addMenuItem(toplevel, help, "&Help", SLOT(attr_activate_help()), "CTRL+H",
-        "system-help");
+        "$pwr_exe/xtt_help.png");
 
     pane = new QSplitter(Qt::Vertical);
 

xtt/lib/ge/qt/ge_curve_qt.cqt

@@ -755,23 +755,23 @@ GeCurveQt::GeCurveQt(void* gc_parent_ctx, char* curve_name, char* filename,
   menu_add = addMenuItem(toplevel, file, "&Add", SLOT(activate_madd()));
   addMenuItem(toplevel, file, "&Refresh", SLOT(activate_configure()), "CTRL+R");
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   menu_new = addMenuItem(toplevel, file, "&New", SLOT(activate_new()));
   menu_open = addMenuItem(toplevel, file, "&Open", SLOT(activate_open()));
   menu_save = addMenuItem(toplevel, file, "S&ave", SLOT(activate_save()), "CTRL+S");
   menu_snapshot = addMenuItem(toplevel, file, "&Snapshot", SLOT(activate_snapshot()), "CTRL+N");
   menu_export = addMenuItem(toplevel, file, "&Export", SLOT(activate_export()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(
-      toplevel, view, "Zoom &In", SLOT(activate_zoomin()), "CTRL+I", "zoom-in");
+      toplevel, view, "Zoom &In", SLOT(activate_zoomin()), "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoomout()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoomreset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
   addMenuItem(toplevel, view, "&Background Color", SLOT(activate_background()));
   addMenuItem(
       toplevel, view, "&Show Names", SLOT(activate_showname()), "CTRL+W");
@@ -782,7 +782,7 @@ GeCurveQt::GeCurveQt(void* gc_parent_ctx, char* curve_name, char* filename,
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   // Toolbar
   QToolBar* tools = new QToolBar();

xtt/lib/ge/qt/ge_qt.cqt

@@ -1340,7 +1340,7 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
   addMenuItem(
       toplevel, file, "&Open...", SLOT(activate_open()), "", "document-open");
   addMenuItem(
-      toplevel, file, "Save", SLOT(activate_save()), "", "document-save");
+      toplevel, file, "Save", SLOT(activate_save()), "CTRL+S", "$pwr_exe/wb_save.png");
   addMenuItem(toplevel, file, "Save As", SLOT(activate_save_as()),
       "CTRL+SHIFT+S", "document-save-as");
   addMenuItem(toplevel, file, "&Build", SLOT(activate_build()));
@@ -1385,9 +1385,9 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
       SLOT(activate_creanextpage()), "CTRL+SHIFT+N");
   addMenuItem(toplevel, file, "&History", SLOT(activate_history()));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit entry
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -1400,7 +1400,7 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
   addMenuItem(toplevel, edit, "&Delete", SLOT(activate_delete()), "Delete",
       "edit-delete");
   addMenuItem(
-      toplevel, edit, "&Undo", SLOT(activate_undo()), "CTRL+Z", "edit-undo");
+      toplevel, edit, "&Undo", SLOT(activate_undo()), "CTRL+Z", "$pwr_exe/ge_undo.png");
   addMenuItem(toplevel, edit, "&Redo", SLOT(activate_redo()), "CTRL+ALT+Z",
       "edit-redo");
   addMenuItem(toplevel, edit, "&Rotate...", SLOT(activate_rotate()), "CTRL+R");
@@ -1576,11 +1576,11 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
   addMenuItem(toplevel, view, "&Preview", SLOT(activate_preview_start()));
   addMenuItem(toplevel, view, "Preview &Stop", SLOT(activate_preview_stop()));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-original");
+      "$pwr_exe/xtt_zoom_reset.png");
   view_plant_w = addCheckableMenuItem(
       toplevel, view, "Vi&ew Plant", SLOT(activate_view_plant(bool)), "CTRL+P");
   view_graphlist_w = addCheckableMenuItem(
@@ -1591,7 +1591,7 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "", "$pwr_exe/xtt_help.png");
   addMenuItem(
       toplevel, help, "H&elp on Subgraphs", SLOT(activate_help_subgraph()));
 
@@ -1684,8 +1684,8 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
       SLOT(activate_flip_vert()), "$pwr_exe/ge_mirrorvertical.png");
 
   // Toolbar 3
-  addToolItem(toplevel, tools3, "Save", SLOT(activate_save()), "document-save");
-  addToolItem(toplevel, tools3, "Build", SLOT(activate_build()), "system-run");
+  addToolItem(toplevel, tools3, "Save", SLOT(activate_save()), "$pwr_exe/wb_save.png");
+  addToolItem(toplevel, tools3, "Build", SLOT(activate_build()), "$pwr_exe/wb_build.png");
   addToolItem(toplevel, tools3, "Zoom in", SLOT(activate_zoom_in()),
       "$pwr_exe/ge_zoom_in.png");
   addToolItem(toplevel, tools3, "Zoom out", SLOT(activate_zoom_out()),

xtt/lib/ge/qt/ge_subgraphs_qt.cqt

@@ -137,7 +137,7 @@ SubGraphsQt::SubGraphsQt(void* xn_parent_ctx, const char* xn_name,
   addMenuItem(toplevel, file, "Set A&ll Extern",
       SLOT(subgraphs_activate_set_all_extern()), "CTRL+K");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Help entry
   QMenu* help = menu_bar->addMenu(fl("&Help"));

xtt/lib/xtt/qt/xtt_clog_qt.cqt

@@ -88,21 +88,21 @@ CLogQt::CLogQt(void* clog_parent_ctx, const char* clog_name,
   addMenuItem(toplevel, file, "&Update", SLOT(activate_update()), "CTRL+U");
   addMenuItem(toplevel, file, "&Print", SLOT(activate_print()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/wb_close.png");
 
   // View menu
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()),
-      "CTRL+B", "zoom-original");
+      "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
 
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&Help on System Messages", SLOT(activate_help()),
-      "CTRL+H", "system-help");
+      "CTRL+H", "$pwr_exe/xtt_help.png");
   addMenuItem(
       toplevel, help, "Help on &Selected Message", SLOT(activate_helpmsg()));
 

xtt/lib/xtt/qt/xtt_ev_qt.cqt

@@ -138,7 +138,7 @@ EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
     addMenuItem(object, file, "&Export", SLOT(eve_activate_export()));
     addMenuItem(object, file, "&Analyse", SLOT(eve_activate_analyse()));
     addMenuItem(
-        object, file, "&Close", SLOT(eve_activate_exit()), "CTRL+W", "window-close");
+        object, file, "&Close", SLOT(eve_activate_exit()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
     // Functions entry
     QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -150,11 +150,11 @@ EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
     // View entry
     QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
     addMenuItem(object, view, "Zoom &In", SLOT(eve_activate_zoom_in()),
-        "CTRL+I", "zoom-in");
+        "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
     addMenuItem(object, view, "Zoom &Out", SLOT(eve_activate_zoom_out()),
-        "CTRL+O", "zoom-out");
+        "CTRL+O", "$pwr_exe/xtt_zoom_out.png");
     addMenuItem(object, view, "Zoom &Reset", SLOT(eve_activate_zoom_reset()),
-        "CTRL+B", "zoom-original");
+        "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
     addCheckableMenuItem(object, view, "&Display hundredth",
         SLOT(eve_activate_disp_hundredth(bool)));
     addCheckableMenuItem(
@@ -165,7 +165,7 @@ EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
     // Help entry
     QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
     addMenuItem(object, help, "&Help", SLOT(eve_activate_help()), "CTRL+H",
-        "system-help");
+        "$pwr_exe/xtt_help.png");
     addMenuItem(
         object, help, "Help Selected Event", SLOT(eve_activate_helpevent()));
 
@@ -242,7 +242,7 @@ EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
     addMenuItem(object, file, "&Print", SLOT(ala_activate_print()), "",
         "document-print");
     addMenuItem(
-        object, file, "&Close", SLOT(ala_activate_exit()), "CTRL+W", "window-close");
+        object, file, "&Close", SLOT(ala_activate_exit()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
     // Functions entry
     QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -282,11 +282,11 @@ EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
     }
 
     addMenuItem(object, view, "Zoom &In", SLOT(ala_activate_zoom_in()),
-        "CTRL+I", "zoom-in");
+        "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
     addMenuItem(object, view, "Zoom &Out", SLOT(ala_activate_zoom_out()),
-        "CTRL+O", "zoom-out");
+        "CTRL+O", "$pwr_exe/xtt_zoom_out.png");
     addMenuItem(object, view, "Zoom &Reset", SLOT(ala_activate_zoom_reset()),
-        "CTRL+B", "zoom-original");
+        "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
     addCheckableMenuItem(object, view, "&Display hundredth",
         SLOT(ala_activate_disp_hundredth(bool)));
     addCheckableMenuItem(
@@ -297,7 +297,7 @@ EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
     // Help entry
     QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
     addMenuItem(object, help, "&Help", SLOT(ala_activate_help()), "CTRL+H",
-        "system-help");
+        "$pwr_exe/xtt_help.png");
     addMenuItem(
         object, help, "Help Selected Event", SLOT(ala_activate_helpevent()));
 
@@ -379,7 +379,7 @@ EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
     addMenuItem(object, file, "&Print", SLOT(blk_activate_print()), "",
         "document-print");
     addMenuItem(
-        object, file, "&Close", SLOT(blk_activate_exit()), "CTRL+W", "window-close");
+        object, file, "&Close", SLOT(blk_activate_exit()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
     // Functions entry
     QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -393,16 +393,16 @@ EvQt::EvQt(void* ev_parent_ctx, char* eve_name, char* ala_name, char* blk_name,
     // View entry
     QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
     addMenuItem(object, view, "Zoom &In", SLOT(blk_activate_zoom_in()),
-        "CTRL+I", "zoom-in");
+        "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
     addMenuItem(object, view, "Zoom &Out", SLOT(blk_activate_zoom_out()),
-        "CTRL+O", "zoom-out");
+        "CTRL+O", "$pwr_exe/xtt_zoom_out.png");
     addMenuItem(object, view, "Zoom &Reset", SLOT(blk_activate_zoom_reset()),
-        "CTRL+B", "zoom-original");
+        "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
 
     // Help entry
     QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
     addMenuItem(object, help, "&Help", SLOT(blk_activate_help()), "CTRL+H",
-        "system-help");
+        "$pwr_exe/xtt_help.png");
 
     // Create blk evlist
     blk = new EvListQt(this, ev_eType_BlockList, blk_size, eventname_seg,

xtt/lib/xtt/qt/xtt_evala_qt.cqt

@@ -100,9 +100,9 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, char* ala_name, pwr_tObjid ev_user,
   // File entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&Print", SLOT(ala_activate_print()), "",
-      "document-print");
+      "$pwr_exe/wb_print.png");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -142,11 +142,11 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, char* ala_name, pwr_tObjid ev_user,
   }
 
   addMenuItem(toplevel, view, "Zoom &In", SLOT(ala_activate_zoom_in()),
-      "CTRL+I", "zoom-in");
+      "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(ala_activate_zoom_out()),
-      "CTRL+O", "zoom-out");
+      "CTRL+O", "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(ala_activate_zoom_reset()),
-      "CTRL+B", "zoom-original");
+      "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
   addCheckableMenuItem(toplevel, view, "&Display hundredth",
       SLOT(ala_activate_disp_hundredth(bool)));
   addCheckableMenuItem(
@@ -157,7 +157,7 @@ EvAlaQt::EvAlaQt(void* ev_parent_ctx, char* ala_name, pwr_tObjid ev_user,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&Help", SLOT(ala_activate_help()), "CTRL+H",
-      "system-help");
+      "$pwr_exe/xtt_help.png");
   addMenuItem(
       toplevel, help, "Help Selected Event", SLOT(ala_activate_helpevent()));
 

xtt/lib/xtt/qt/xtt_eveve_qt.cqt

@@ -99,9 +99,9 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, char* eve_name, pwr_tObjid ev_user,
   // File entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&Print", SLOT(eve_activate_print()), "",
-      "document-print");
+      "$pwr_exe/wb_print.png");
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -133,11 +133,11 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, char* eve_name, pwr_tObjid ev_user,
   }
 
   addMenuItem(toplevel, view, "Zoom &In", SLOT(eve_activate_zoom_in()),
-      "CTRL+I", "zoom-in");
+      "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(eve_activate_zoom_out()),
-      "CTRL+O", "zoom-out");
+      "CTRL+O", "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(eve_activate_zoom_reset()),
-      "CTRL+B", "zoom-original");
+      "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
   addCheckableMenuItem(toplevel, view, "&Display hundredth",
       SLOT(eve_activate_disp_hundredth(bool)));
   addCheckableMenuItem(
@@ -148,7 +148,7 @@ EvEveQt::EvEveQt(void* ev_parent_ctx, char* eve_name, pwr_tObjid ev_user,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&Help", SLOT(eve_activate_help()), "CTRL+H",
-      "system-help");
+      "$pwr_exe/xtt_help.png");
   addMenuItem(
       toplevel, help, "Help Selected Event", SLOT(eve_activate_helpevent()));
 

xtt/lib/xtt/qt/xtt_ge_qt.cqt

@@ -310,21 +310,21 @@ XttGeQt::XttGeQt(void* xg_parent_ctx, const char* xg_name,
     // File Entry
     QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
     addMenuItem(
-        toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+        toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
     // View menu
     QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
     addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-        "zoom-in");
+        "$pwr_exe/xtt_zoom_in.png");
     addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()),
-        "CTRL+O", "zoom-out");
+        "CTRL+O", "$pwr_exe/xtt_zoom_out.png");
     addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-        "zoom-original");
+        "$pwr_exe/xtt_zoom_reset.png");
 
     // Menu Help
     QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
     addMenuItem(toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H",
-        "system-help");
+        "$pwr_exe/xtt_help.png");
 
     graph_form->setMenuBar(menu_bar);
   }

xtt/lib/xtt/qt/xtt_hist_qt.cqt

@@ -87,13 +87,13 @@ HistQt::HistQt(void* hist_parent_ctx, char* hist_name, pwr_tAttrRef* arp,
   // File entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Print", SLOT(activate_print()), "", "document-print");
+      toplevel, file, "&Print", SLOT(activate_print()), "", "$pwr_exe/wb_print.png");
   addMenuItem(
       toplevel, file, "&Export", SLOT(activate_export()));
   addMenuItem(
       toplevel, file, "&Analyse", SLOT(activate_analyse()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -107,11 +107,11 @@ HistQt::HistQt(void* hist_parent_ctx, char* hist_name, pwr_tAttrRef* arp,
   // View entry
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(toplevel, view, "Zoom &In", SLOT(activate_zoom_in()), "CTRL+I",
-      "zoom-in");
+      "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()),
-      "CTRL+B", "zoom-original");
+      "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
   addCheckableMenuItem(toplevel, view, "Hide &Search Dialog",
       SLOT(activate_hide_search(bool)), "CTRL+E");
   addCheckableMenuItem(toplevel, view, "&Display hundredth",
@@ -124,7 +124,7 @@ HistQt::HistQt(void* hist_parent_ctx, char* hist_name, pwr_tAttrRef* arp,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "&Help", SLOT(activate_help()),
-      "CTRL+H", "system-help");
+      "CTRL+H", "$pwr_exe/xtt_help.png");
   addMenuItem(toplevel, help, "Help Selected Event", SLOT(activate_helpevent()));
 
   // Search dialog

xtt/lib/xtt/qt/xtt_op_qt.cqt

@@ -314,7 +314,7 @@ OpQt::OpQt(void* op_parent_ctx, char* opplace, pwr_tStatus* status)
   // End Help submenu
 
   functions_close = addMenuItem(
-      toplevel, functions, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, functions, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Toolbar
   tools = new QToolBar();

xtt/lib/xtt/qt/xtt_trace_qt.cqt

@@ -300,7 +300,7 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, pwr_tObjid tr_objid,
   addMenuItem(toplevel, file, "&Restore Trace", SLOT(activate_restoretrace()));
   addMenuItem(toplevel, file, "C&lear Trace", SLOT(activate_cleartrace()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions Entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -320,11 +320,11 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, pwr_tObjid tr_objid,
   // View Entry
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(
-      toplevel, view, "Zoom &In", SLOT(activate_zoomin()), "CTRL+I", "zoom-in");
+      toplevel, view, "Zoom &In", SLOT(activate_zoomin()), "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoomout()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoomreset()),
-      "CTRL+B", "zoom-original");
+      "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
 
   // Submenu ScanTime
   QMenu* view_sc = view->addMenu(translate_utf8("&ScanTime"));
@@ -359,7 +359,7 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, pwr_tObjid tr_objid,
   // Menu Help
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(toplevel, help, "On &Trace", SLOT(activate_help()), "CTRL+H",
-      "system-help");
+      "$pwr_exe/xtt_help.png");
   addMenuItem(toplevel, help, "On &PlcPgm", SLOT(activate_helpplc()));
   addMenuItem(toplevel, help, "P&lcPgm Overview", SLOT(activate_helpplclist()));
 

xtt/lib/xtt/qt/xtt_xatt_qt.cqt

@@ -374,7 +374,7 @@ XAttQt::XAttQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&Print", SLOT(activate_print()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -394,7 +394,7 @@ XAttQt::XAttQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   pane = new QSplitter(Qt::Vertical);
 

xtt/lib/xtt/qt/xtt_xattone_qt.cqt

@@ -272,12 +272,12 @@ XAttOneQt::XAttOneQt(void* xa_parent_ctx, pwr_sAttrRef* xa_aref, char* xa_title,
   // File entry
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   // Prompt, label, input entry
   msg_label = new QLabel("");

xtt/lib/xtt/qt/xtt_xcolwind_qt.cqt

@@ -450,7 +450,7 @@ XColWindQt::XColWindQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar_list,
       "document-save-as");
   addMenuItem(toplevel, file, "&Print", SLOT(activate_print()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Edit entry
   QMenu* edit = menu_bar->addMenu(translate_utf8("&Edit"));
@@ -477,11 +477,11 @@ XColWindQt::XColWindQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar_list,
   // View Entry
   QMenu* view = menu_bar->addMenu(translate_utf8("&View"));
   addMenuItem(
-      toplevel, view, "Zoom &In", SLOT(activate_zoomin()), "CTRL+I", "zoom-in");
+      toplevel, view, "Zoom &In", SLOT(activate_zoomin()), "CTRL+I", "$pwr_exe/xtt_zoom_in.png");
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoomout()), "CTRL+O",
-      "zoom-out");
+      "$pwr_exe/xtt_zoom_out.png");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoomreset()),
-      "CTRL+B", "zoom-original");
+      "CTRL+B", "$pwr_exe/xtt_zoom_reset.png");
 
   // Submenu ScanTime
   QMenu* view_sc = view->addMenu(translate_utf8("&ScanTime"));
@@ -507,7 +507,7 @@ XColWindQt::XColWindQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar_list,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   pane = new QSplitter(Qt::Vertical);
   memset(&ar, 0, sizeof(ar));

xtt/lib/xtt/qt/xtt_xcrr_qt.cqt

@@ -136,7 +136,7 @@ XCrrQt::XCrrQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
   QMenu* file = menu_bar->addMenu(translate_utf8("&File"));
   addMenuItem(toplevel, file, "&Print", SLOT(activate_print()));
   addMenuItem(
-      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "window-close");
+      toplevel, file, "&Close", SLOT(close()), "CTRL+W", "$pwr_exe/xtt_close.png");
 
   // Functions entry
   QMenu* functions = menu_bar->addMenu(translate_utf8("&Functions"));
@@ -146,7 +146,7 @@ XCrrQt::XCrrQt(void* xa_parent_ctx, pwr_sAttrRef* xa_objar,
   // Help entry
   QMenu* help = menu_bar->addMenu(translate_utf8("&Help"));
   addMenuItem(
-      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "system-help");
+      toplevel, help, "&Help", SLOT(activate_help()), "CTRL+H", "$pwr_exe/xtt_help.png");
 
   QVBoxLayout* vbox = new QVBoxLayout();
   xcrrnav = new XAttNavQt(this, xattnav_eType_CrossRef, "Plant", &objar,