wxGUI/manual: install default icons to $HTMLDIR/icons

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@46008 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/icons/Makefile

@@ -5,7 +5,7 @@ include $(MODULE_TOPDIR)/include/Make/Dir.make
 SRCICO := $(wildcard *.ico *.png)
 SRCICONS := $(wildcard grass/*.png)
 ETCICONS := $(patsubst %,$(ETC)/gui/icons/%,$(SRCICONS) $(SRCICO))
-HTMLICONS := $(patsubst %,$(HTMLDIR)/icons/%,$(SRCICONS))
+HTMLICONS := $(patsubst grass/%,$(HTMLDIR)/icons/%,$(SRCICONS))
 
 ETCDIRS = \
 	$(ETC)/gui \
@@ -13,15 +13,14 @@ ETCDIRS = \
 	$(ETC)/gui/icons/grass
 
 HTMLDIRS = \
-	$(HTMLDIR)/icons \
-	$(HTMLDIR)/icons/grass
+	$(HTMLDIR)/icons
 
-default: $(ICONS) $(ETCICONS) $(HTMLICONS)
+default: $(ETCICONS) $(HTMLICONS)
 
 $(ETC)/gui/icons/%: % | $(ETCDIRS)
 	$(INSTALL_DATA) $< $@
 
-$(HTMLDIR)/icons/%: % | $(HTMLDIRS)
+$(HTMLDIR)/icons/%: grass/% | $(HTMLDIRS)
 	$(INSTALL_DATA) $< $@
 
 $(ETCDIRS) $(HTMLDIRS): %:

gui/wxpython/docs/wxGUI.GCP_Manager.html

@@ -85,26 +85,26 @@ given GCP, useful with a high zoom.
 
 <dl>
 
-<dt><img src="icons/grass/show.png">&nbsp;
+<dt><img src="icons/show.png">&nbsp;
   <em>Display map</em></dt>
 <dd>Displays maps for source and target canvas and re-renders any layers
 that have changed since the last time the display was updated.</dd>
 
-<dt><img src="icons/grass/layer-redraw.png">&nbsp;
+<dt><img src="icons/layer-redraw.png">&nbsp;
   <em>Re-render map</em></dt>
 <dd>Re-renders both source and target canvas regardless of whether they
 have changed or not.</dd>
 
-<dt><img src="icons/grass/erase.png">&nbsp;
+<dt><img src="icons/erase.png">&nbsp;
   <em>Erase display</em></dt>
 <dd>Erases both source and target canvas to a white background.</dd>
 
-<dt><img src="icons/grass/gcp-create.png">&nbsp;
+<dt><img src="icons/gcp-create.png">&nbsp;
   <em>Define GCP (Ground Control Points)</em></dt>
 <dd>On left mouse click, coordinates are defined for the currently
 selected GCP.</dd>
 
-<dt><img src="icons/grass/pan.png">&nbsp;
+<dt><img src="icons/pan.png">&nbsp;
   <em>Pan</em></dt>
 <dd>Interactive selection of a new center of view in the active
 display monitor. Drag the pan cursor while pressing the left mouse
@@ -112,7 +112,7 @@ button to pan. Alternatively left-click on the new center. Panning
 changes the location of the region displayed but not the size of the
 area displayed or the resolution.</dd>
 
-<dt><img src="icons/grass/zoom-in.png">&nbsp;
+<dt><img src="icons/zoom-in.png">&nbsp;
   <em>Zoom in</em></dt>
 <dd>Interactive zooming with the mouse in the active map canvas (source 
 or target). Drawing a box or just a left click with the mouse and zoom-in
@@ -122,7 +122,7 @@ zoom-in cursor causes the display to zoom in by 30%, centered on the
 point where the mouse is clicked. Zooming changes the display region
 extents (both size and location of area displayed).</dd>
 
-<dt><img src="icons/grass/zoom-out.png">&nbsp;
+<dt><img src="icons/zoom-out.png">&nbsp;
   <em>Zoom out</em></dt>
 <dd>Interactive zooming with the mouse in the active map canvas (source 
 or target). Drawing a box or just a left click with the mouse and zoom-out
@@ -133,7 +133,7 @@ out by 30%, centered on the point where the mouse is clicked. Zooming
 changes the display region extents (both size and location of area
 displayed).</dd>
 
-<dt><img src="icons/grass/zoom-more.png">&nbsp;
+<dt><img src="icons/zoom-more.png">&nbsp;
   <em>Adjust display zoom</em></dt>
 <dd>Source and target display are adjusted by using the current GCPs for
 coordinate transformation:
@@ -153,17 +153,17 @@ to set active map canvas for <em>Return to previous zoom</em> or
 <em>Zoom to extent of currently displayed map</em>. Alternatively, move
 the mouse over the map canvas to be used as active canvas.</dd>
 
-<dt><img src="icons/grass/zoom-last.png">&nbsp;
+<dt><img src="icons/zoom-last.png">&nbsp;
   <em>Return to previous zoom</em></dt>
 <dd>Returns to the previous zoom extent. Up to 10 levels of zoom back are
 maintained.</dd>
 
-<dt><img src="icons/grass/zoom-extent.png">&nbsp;
+<dt><img src="icons/zoom-extent.png">&nbsp;
 <em>Zoom to extent of currently displayed map</em></dt>
 <dd>Zoom to the extent of the currently displayed map in the active map
 canvas (source or target).</dd>
 
-<dt><img src="icons/grass/settings.png">&nbsp;
+<dt><img src="icons/settings.png">&nbsp;
 <em>Settings</em></dt>
 <dd>Shows a settings dialog for GCP management and display:<br><br> 
 
@@ -225,11 +225,11 @@ canvas (source or target).</dd>
   </dl><br>
 </dd>
 
-<dt><img src="icons/grass/help.png">&nbsp;
+<dt><img src="icons/help.png">&nbsp;
 <em>Show Help</em></dt>
 <dd>Show help page for the GCP Manager.
 
-<dt><img src="icons/grass/quit.png">&nbsp;
+<dt><img src="icons/quit.png">&nbsp;
 <em>Quit</em></dt>
 <dd>Quit the GCP Manager.
 
@@ -239,34 +239,34 @@ canvas (source or target).</dd>
 
 <dl>
 
-<dt><img src="icons/grass/gcp-save.png">&nbsp;
+<dt><img src="icons/gcp-save.png">&nbsp;
 <em>Save GCPs to POINTS file</em></dt>
 <dd>The current list of GCPs is saved to the imagery group's POINTS file
 and to a backup copy.</dd>
 
-<dt><img src="icons/grass/gcp-add.png">&nbsp;
+<dt><img src="icons/gcp-add.png">&nbsp;
 <em>Add new GCP</em></dt>
 <dd>Adds a new Ground Control Point to the list and selects it for editing.</dd>
 
-<dt><img src="icons/grass/gcp-delete.png">&nbsp;
+<dt><img src="icons/gcp-delete.png">&nbsp;
 <em>Delete selected GCP</em></dt>
 <dd>Deletes the currently selected GCP from the list.</dd>
 
-<dt><img src="icons/grass/gcp-remove.png">&nbsp;
+<dt><img src="icons/gcp-remove.png">&nbsp;
 <em>Clear selected GCP</em></dt>
 <dd>Resets all coordinates of the currently selected GCP to 0 (zero).</dd>
 
-<dt><img src="icons/grass/reload.png">&nbsp;
+<dt><img src="icons/reload.png">&nbsp;
 <em>Reload GCPs from POINTS file</em></dt>
 <dd>Reloads GCPs from the imagery group's POINTS file.</dd>
 
-<dt><img src="icons/grass/gcp-rms.png">&nbsp;
+<dt><img src="icons/gcp-rms.png">&nbsp;
 <em>Recalculate RMS error</em></dt>
 <dd>Recalculates forward and backward RMS error for all GCP marked for
 use (activated checkbox in first row).
 </dd>
 
-<dt><img src="icons/grass/georectify.png">&nbsp;
+<dt><img src="icons/georectify.png">&nbsp;
 <em>Georectify</em></dt>
 <dd>Uses <em><a href="i.rectify.html">i.rectify</a></em> to georectify
 all images in the source imagery group.

gui/wxpython/docs/wxGUI.Modeler.html

@@ -7,7 +7,7 @@
 extension which allows the user to create, edit, and manage
 models. The modeler can be launched from the menu "File |
 Graphical modeler" or by clicking on
-icon <img src="icons/grass/modeler-main.png"> in the toolbar.
+icon <img src="icons/modeler-main.png"> in the toolbar.
 
 <p>
 The modeler currently allows to:

gui/wxpython/docs/wxGUI.Nviz.html

@@ -38,38 +38,38 @@ the 3D display mode.
 </center>
 
 <dl>
-  <dt><img src="icons/grass/3d-view.png">&nbsp;
+  <dt><img src="icons/3d-view.png">&nbsp;
     <em>Switch to view page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>view</b>
   control page.</dd>
-  <dt><img src="icons/grass/3d-raster.png">&nbsp;
+  <dt><img src="icons/3d-raster.png">&nbsp;
     <em>Switch to surface page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>surface</b>
   control page (data properties).</dd>
-  <dt><img src="icons/grass/3d-vector.png">&nbsp;
+  <dt><img src="icons/3d-vector.png">&nbsp;
     <em>Switch to vector page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>vector</b>
   control page (data properties).</dd>
-  <dt><img src="icons/grass/3d-volume.png">&nbsp;
+  <dt><img src="icons/3d-volume.png">&nbsp;
     <em>Switch to volume page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>volume</b>
   control page (data properties).</dd>
-  <dt><img src="icons/grass/3d-light.png">&nbsp;
+  <dt><img src="icons/3d-light.png">&nbsp;
     <em>Switch to light page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>light</b>
   control page (appearance).</dd>
-  <dt><img src="icons/grass/3d-fringe.png">&nbsp;
+  <dt><img src="icons/3d-fringe.png">&nbsp;
     <em>Switch to fringe page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>fringe</b>
   control page (appearance).</dd>
-  <dt><img src="icons/grass/settings.png">&nbsp;
+  <dt><img src="icons/settings.png">&nbsp;
     <em>Show 3D view mode settings</em></dt>
   <dd>Show dialog with settings for wxGUI 3D view mode. The user
   settings can be stored in wxGUI settings file.</dd>
-  <dt><img src="icons/grass/help.png">&nbsp;
+  <dt><img src="icons/help.png">&nbsp;
     <em>Show help</em></dt>
   <dd>Show this help.</dd>
-  <dt><img src="icons/grass/quit.png">&nbsp;
+  <dt><img src="icons/quit.png">&nbsp;
     <em>Quit</em></dt>
   <dd>Quit 3D view mode and switch map display to the 2D view
   mode.</dd>

gui/wxpython/docs/wxGUI.Vector_Digitizer.html

@@ -49,68 +49,68 @@ vector map" button in the "Additional Tools" menu on the Digitzer Toolbar.
 </center>
 
 <dl>
-  <dt><img src="icons/grass/point-create.png">&nbsp;
+  <dt><img src="icons/point-create.png">&nbsp;
     <em>Digitize new point</em></dt>
   <dd>Add new point to vector map and optionally define its
     attributes.</dd>
   
-  <dt><img src="icons/grass/line-create.png">&nbsp;
+  <dt><img src="icons/line-create.png">&nbsp;
     <em>Digitize new line</em></dt>
   <dd>Add new line to vector map and optionally define its
     attributes.</dd>
 
-  <dt><img src="icons/grass/polygon-create.png">&nbsp;
+  <dt><img src="icons/polygon-create.png">&nbsp;
     <em>Digitize new boundary</em></dt>
   <dd>Add new boundary to vector map and optionally define its
     attributes.</dd>
   
-  <dt><img src="icons/grass/centroid-create.png">&nbsp;
+  <dt><img src="icons/centroid-create.png">&nbsp;
     <em>Digitize new centroid</em></dt>
   <dd>Add new centroid to vector map and optionally define its
     attributes.</dd>
   
-  <dt><img src="icons/grass/vertex-move.png">&nbsp;
+  <dt><img src="icons/vertex-move.png">&nbsp;
     <em>Move vertex</em></dt>
   <dd>Move selected vertex of linear feature. Thus shape of linear
     feature is changed.</dd>
 
-  <dt><img src="icons/grass/vertex-create.png">&nbsp;
+  <dt><img src="icons/vertex-create.png">&nbsp;
     <em>Add vertex</em></dt>
   <dd>Add new vertex to selected linear feature (shape not
     changed).</dd>
 
-  <dt><img src="icons/grass/vertex-delete.png">&nbsp;
+  <dt><img src="icons/vertex-delete.png">&nbsp;
     <em>Remove vertex</em></dt>
   <dd>Remove selected vertex from linear feature. Thus shape of selected
   feature can be changed.</dd>
 
-  <dt><img src="icons/grass/line-split.png">&nbsp;
+  <dt><img src="icons/line-split.png">&nbsp;
     <em>Split line/boundary</em></dt>
   <dd>Split selected linear feature on given position to separate
   vector features.</dd>
 
-  <dt><img src="icons/grass/line-edit.png">&nbsp;
+  <dt><img src="icons/line-edit.png">&nbsp;
     <em>Edit line/boundary</em></dt>
   <dd>Edit selected linear feature, add new segments or remove
   existing segments of linear feature.</dd>
 
-  <dt><img src="icons/grass/line-move.png">&nbsp;
+  <dt><img src="icons/line-move.png">&nbsp;
     <em>Move feature(s)</em></dt>
   <dd>Move selected vector features. Selection can be done by mouse or
     by query.</dd>
 
-  <dt><img src="icons/grass/line-delete.png">&nbsp;
+  <dt><img src="icons/line-delete.png">&nbsp;
     <em>Delete feature(s)</em></dt>
   <dd>Delete selected vector features. Selection can be done by mouse
   or by query.</dd>
 
-  <dt><img src="icons/grass/cats-display.png">&nbsp;
+  <dt><img src="icons/cats-display.png">&nbsp;
     <em>Display/update categories</em></dt>
   <dd>Display categories of selected vector feature. Category settings
   can be modified, new layer/category pairs added or already defined pairs
   removed.</dd>
 
-  <dt><img src="icons/grass/cats-copy.png">&nbsp;
+  <dt><img src="icons/cats-copy.png">&nbsp;
     <em>Copy categories / Duplicate attributes</em></dt>
   <dd><ul>
       <li>Copy category settings of selected vector feature to other
@@ -127,14 +127,14 @@ vector map" button in the "Additional Tools" menu on the Digitzer Toolbar.
     </ul>
   </dd>
 
-  <dt><img src="icons/grass/attributes-display.png">&nbsp;
+  <dt><img src="icons/attributes-display.png">&nbsp;
     <em>Display/update attributes</em></dt>
   <dd>Display attributes of selected vector feature (based on its
     category settings).  Attributes can be also modified. Same
     functionality is accessible from Main toolbar "Query vector map
     (editable mode)".</dd>
 
-  <dt><img src="icons/grass/tools.png">&nbsp;
+  <dt><img src="icons/tools.png">&nbsp;
     <em>Additional tools</em></dt>
   <dd>
     <ul>
@@ -176,15 +176,15 @@ vector map" button in the "Additional Tools" menu on the Digitzer Toolbar.
     </ul>
   </dd>
 
-  <dt><img src="icons/grass/undo.png">&nbsp;
+  <dt><img src="icons/undo.png">&nbsp;
     <em>Undo</em></dt>
   <dd>Undo previous operations.</dd>
 
-  <dt><img src="icons/grass/settings.png">&nbsp;
+  <dt><img src="icons/settings.png">&nbsp;
     <em>Settings</em></dt>
   <dd>Dialog for vector digitizer settings.</dd>
 
-  <dt><img src="icons/grass/quit.png">&nbsp;
+  <dt><img src="icons/quit.png">&nbsp;
     <em>Quit digitizing tool</em></dt>
   <dd>Changes in vector map can be optionally discarded when
   digitizing session is quited.</dd>

gui/wxpython/docs/wxGUI.html

@@ -102,114 +102,114 @@ d.vect, or d.grid, for example).
 
 <dl>
 
-  <dt><img src="icons/grass/monitor-create.png">&nbsp;
+  <dt><img src="icons/monitor-create.png">&nbsp;
     <em>Start new display / create new workspace</em></dt>
   <dd>Opens a new map display and creates empty layer tree tab in Layer
     Manager or creates new workspace for the current layer tree.
 
     <dl>
-      <dt><img src="icons/grass/monitor-create.png">&nbsp;
+      <dt><img src="icons/monitor-create.png">&nbsp;
 	<em>Start new map display</em></dt>
       <dd>Opens a new map display and creates empty layer tree tab in Layer Manager.</dd>
-      <dt><img src="icons/grass/create.png">&nbsp;
+      <dt><img src="icons/create.png">&nbsp;
 	<em>Create new workspace</em></dt>
       <dd>Removes all layers from the layer tree and creates a new, empty tree
 	where new layers can be added.</dd>
     </dl>
   </dd>
   
-  <dt><img src="icons/grass/layer-open.png">&nbsp;
+  <dt><img src="icons/layer-open.png">&nbsp;
     <em>Load / import map layers into workspace</em></dt>
   <dd>Loads or imports selected raster or vector maps into current layer tree.
   
     <dl>
-      <dt><img src="icons/grass/layer-open.png">&nbsp;
+      <dt><img src="icons/layer-open.png">&nbsp;
 	<em>Load map layers into workspace</em></dt>
       <dd>Loads selected raster or vector maps into current layer tree.</dd>
       
-      <dt><img src="icons/grass/layer-import.png">&nbsp;
+      <dt><img src="icons/layer-import.png">&nbsp;
 	<em>Import raster data</em></dt>
       <dd>Import selected raster data into GRASS and load them into current layer tree.</dd>
       
-      <dt><img src="icons/grass/layer-import.png">&nbsp;
+      <dt><img src="icons/layer-import.png">&nbsp;
 	<em>Import vector data</em></dt>
       <dd>Import selected vector data into GRASS and load them into current layer tree.</dd>
       
-      <dt><img src="icons/grass/layer-import.png">&nbsp;
+      <dt><img src="icons/layer-import.png">&nbsp;
 	<em>Link external raster data</em></dt>
       <dd>Link selected external raster data as GRASS raster maps and load them into current layer tree.</dd>
       
-      <dt><img src="icons/grass/layer-import.png">&nbsp;
+      <dt><img src="icons/layer-import.png">&nbsp;
 	<em>Link external vector data</em></dt>
       <dd>Link selected external vector data as GRASS vector maps and load them into current layer tree.</dd>
     </dl>
   </dd>
   
-  <dt><img src="icons/grass/open.png">&nbsp;
+  <dt><img src="icons/open.png">&nbsp;
     <em>Open existing workspace file</em></dt>
   <dd>Opens an previously saved workspace file, containing a set of display
     layers and their option settings.</dd>
   
-  <dt><img src="icons/grass/save.png">&nbsp;
+  <dt><img src="icons/save.png">&nbsp;
     <em>Save current workspace to file</em></dt>
   <dd>Saves current set of layers and their options to a workspace
     file.</dd>
   
-  <dt><img src="icons/grass/layer-raster-add.png">&nbsp;
+  <dt><img src="icons/layer-raster-add.png">&nbsp;
     <em>Add raster map layer</em></dt>
   <dd>Adds raster map to layer tree, see <em><a href="d.rast.html">d.rast</a></em>.
   </dd>
   
-  <dt><img src="icons/grass/layer-raster-more.png">&nbsp;
+  <dt><img src="icons/layer-raster-more.png">&nbsp;
     <em>Add various raster map layers (RGB, HIS, shaded relief...)</em></dt>
   <dd>Opens a dropdown menu that allows user to select to:
     
     <dl>
-      <dt><img src="icons/grass/layer-raster3d-add.png">&nbsp;
+      <dt><img src="icons/layer-raster3d-add.png">&nbsp;
 	<em>Add 3D raster map layer</em></dt>
       <dd>Adds 3D raster map to layer tree.</dd>
   
-      <dt><img src="icons/grass/layer-rgb-add.png">&nbsp;
+      <dt><img src="icons/layer-rgb-add.png">&nbsp;
 	<em>Add RGB raster layer</em></dt>
       <dd>Combines and displays three raster maps defined as red, green, 
 	and blue channels to create an RGB color map, 
 	see <em><a href="d.rgb.html">d.rgb</a></em>.</dd>
       
-      <dt><img src="icons/grass/layer-his-add.png">&nbsp;
+      <dt><img src="icons/layer-his-add.png">&nbsp;
 	<em>Add HIS raster layer</em></dt>
       <dd>Combines and displays two or three raster maps defined as hue,
 	intensity, and (optionally) saturation channels to create a color map,
 	see <em><a href="d.his.html">d.his</a></em>.</dd>
       
-      <dt><img src="icons/grass/layer-shaded-relief-add.png">&nbsp;
+      <dt><img src="icons/layer-shaded-relief-add.png">&nbsp;
 	<em>Add shaded relief raster map layer </em></dt>
       <dd>Adds shaded relief raster map layer,
 	see <em><a href="d.shadedmap.html">d.shadedmap</a></em>.</dd>
       
-      <dt><img src="icons/grass/layer-aspect-arrow-add.png">&nbsp;
+      <dt><img src="icons/layer-aspect-arrow-add.png">&nbsp;
 	<em>Add raster arrows layer</em></dt>
       <dd>Adds map of raster cells with directional arrows drawn. Arrow
 	direction and length are determined by separate aspect/directional map
 	and (optional) slope/intensity map,
 	see <em><a href="d.rast.arrow.html">d.rast.arrow</a></em>.</dd>
       
-      <dt><img src="icons/grass/layer-cell-cats-add.png">&nbsp;
+      <dt><img src="icons/layer-cell-cats-add.png">&nbsp;
 	<em>Add raster numbers layer</em></dt>
       <dd>Adds map of raster cells with numbers representing the cell values, 
 	see <em><a href="d.rast.num.html">d.rast.num</a></em>.</dd>
     </dl>
   </dd>
-  <dt><img src="icons/grass/layer-vector-add.png">&nbsp;
+  <dt><img src="icons/layer-vector-add.png">&nbsp;
     <em>Add vector map layer</em></dt>
   <dd>Adds a vector map layer,
   see <em><a href="d.vect.html">d.vect</a></em>.</dd>
   
-  <dt><img src="icons/grass/layer-vector-more.png">&nbsp;
+  <dt><img src="icons/layer-vector-more.png">&nbsp;
     <em>Add various vector map layers (thematic, chart...)</em></dt>
   <dd>Opens a dropdown menu that allows user to select to:
     
     <dl>
-      <dt><img src="icons/grass/layer-vector-thematic-add.png">&nbsp;
+      <dt><img src="icons/layer-vector-thematic-add.png">&nbsp;
 	<em>Add thematic area (choropleth) map layer
 	  (for all vector types)</em></dt>
       <dd>Adds layer for thematic display values from a numeric attribute
@@ -222,7 +222,7 @@ d.vect, or d.grid, for example).
 	printing,
 	see <em><a href="d.vect.thematic.html">d.vect.thematic</a></em>.</dd>
       
-      <dt><img src="icons/grass/layer-vector-chart-add.png">&nbsp;
+      <dt><img src="icons/layer-vector-chart-add.png">&nbsp;
 	<em>Add thematic chart layer (for vector points)</em></dt>
       <dd>Adds layer in which pie or bar charts can be automatically created
 	at vector point locations. Charts display values from selected columns
@@ -232,37 +232,37 @@ d.vect, or d.grid, for example).
 	see <em><a href="d.vect.chart.html">d.vect.chart</a></em>.</dd>
     </dl>
   </dd>
-  <dt><img src="icons/grass/layer-group-add.png">&nbsp;
+  <dt><img src="icons/layer-group-add.png">&nbsp;
     <em>Add group</em></dt>
   <dd>Adds an empty group. Layers can then be added to the group.</dd>
   
-  <dt><img src="icons/grass/layer-more.png">&nbsp;
+  <dt><img src="icons/layer-more.png">&nbsp;
     <em>Add grid or vector labels overlay</em></dt>
   <dd>Opens a dropdown menu that allows user to select to:
     <dl>
-      <dt><img src="icons/grass/layer-grid-add.png">&nbsp;
+      <dt><img src="icons/layer-grid-add.png">&nbsp;
 	<em>Add overlay grids and lines</em></dt>
       <dd>Adds layer to display regular grid (for all locations)
 	see <em><a href="d.grid.html">d.grid</a></em></dd>
       
-      <dt><img src="icons/grass/layer-label-add.png">&nbsp;
+      <dt><img src="icons/layer-label-add.png">&nbsp;
 	<em>Add labels layer for vector objects (from existing labels file)</em></dt>
       <dd>Add a layer of text from a labels file for vector objects
 	created with the <em><a href="v.label.html">v.label</a></em> module. 
 	A labels file can also be created with a text editor, 
 	see <em><a href="d.labels.html">d.labels</a></em>.</dd>
       
-      <dt><img src="icons/grass/module-d.geodesic.gif">&nbsp;
+      <dt><img src="icons/shortest-distance.png">&nbsp;
 	<em>Add geodesic line layer</em></dt>
       <dd>Add layer to display geodesic line for latitude/longitude locations only,
 	see <em><a href="d.geodesic.html">d.geodesic</a></em></dd>
       
-      <dt><img src="icons/grass/module-d.geodesic.gif">&nbsp;
+      <dt><img src="icons/shortest-distance.png">&nbsp;
 	<em>Add rhumbline layer</em>
 	<dd>Add layer to display rhumblines (for latitude/longitude locations only),
           see <em><a href="d.rhumbline.html">d.rhumbline</a></em>.</dd>
 
-      <dt><img src="icons/grass/layer-command-add.png">&nbsp;
+      <dt><img src="icons/layer-command-add.png">&nbsp;
 	<em>Add command layer</em></dt>
       <dd>Adds a layer in which a GRASS GIS command or command list can be entered.
 	For a command list use the semi-colon (";") symbol as a separator.
@@ -279,23 +279,23 @@ d.text text=Population\ density
 </pre></div>
     </dl>
   </dd>
-  <dt><img src="icons/grass/layer-remove.png">&nbsp;
+  <dt><img src="icons/layer-remove.png">&nbsp;
     <em>Delete selected layer</em></dt>
   <dd>Removes selected map layer or map layer group from layer tree.</dd>
   
-  <dt><img src="icons/grass/edit.png">&nbsp;
+  <dt><img src="icons/edit.png">&nbsp;
     <em>Edit vector maps</em></dt>
   <dd>Opens <em><a href="wxGUI.Vector_Digitizer.html">vector digitizer</a></em> to allow editing selected vector map.</dd>
   
-  <dt><img src="icons/grass/table.png">&nbsp;
+  <dt><img src="icons/table.png">&nbsp;
     <em>Show attribute table</em></dt>
   <dd>Opens <em><a href="wxGUI.Attribute_Table_Manager.html">attribute table manager</a></em> for selected vector map.</dd>
   
-  <dt><img src="icons/grass/modeler-main.png">&nbsp;
+  <dt><img src="icons/modeler-main.png">&nbsp;
     <em>Start Graphical Modeler</em></dt>
   <dd>Opens <em><a href="wxGUI.Modeler.html">graphical modeler</a></em> to create models and run them.</dd>
   
-  <dt><img src="icons/grass/settings.png">&nbsp;
+  <dt><img src="icons/settings.png">&nbsp;
     <em>Show GUI settings</em></dt>
   <dd>Opens dialog to change GUI preferences.</dd>
 
@@ -381,28 +381,28 @@ the computational region extents.
 
 <dl>
 
-  <dt><img src="icons/grass/show.png">&nbsp;
+  <dt><img src="icons/show.png">&nbsp;
     <em>Display map</em></dt>
   <dd>Displays all active layers from layer tree and re-renders for display
     any layers that have changed since the last time the display was updated, 
     including layers added or removed.</dd>
   
-  <dt><img src="icons/grass/layer-redraw.png">&nbsp;
+  <dt><img src="icons/layer-redraw.png">&nbsp;
     <em>Re-render map</em></dt>
   <dd>Re-renders all active layers regardless of whether they have changed
     or not.</dd>
   
-  <dt><img src="icons/grass/erase.png">&nbsp;
+  <dt><img src="icons/erase.png">&nbsp;
     <em>Erase display</em></dt>
   <dd>Erases the currently selected map display to a white background.
     see <em><a href="d.erase.html">d.erase</a>, <a href="d.frame.html">d.frame
 	-e</a></em>.</dd>
   
-  <dt><img src="icons/grass/pointer.png">&nbsp;
+  <dt><img src="icons/pointer.png">&nbsp;
     <em>Pointer</em></dt>
   <dd>Select arrow cursor for map display.</dd>
   
-  <dt><img src="icons/grass/info.png">&nbsp;
+  <dt><img src="icons/info.png">&nbsp;
     <em>Query raster/vector maps</em></dt>
   <dd>Opens a dropdown menu that allows user to select to:
     <dl>
@@ -419,7 +419,7 @@ the computational region extents.
     </dl>
   </dd>
   
-  <dt><img src="icons/grass/pan.png">&nbsp;
+  <dt><img src="icons/pan.png">&nbsp;
     <em>Pan</em></dt>
   <dd>Interactive selection of a new center of view in the active
     display monitor. Drag the pan cursor while pressing the left mouse
@@ -428,7 +428,7 @@ the computational region extents.
     does <em>not</em> affect the computational region for other GIS
     processes, see <em><a href="g.region.html">g.region</a></em>.</dd>
   
-  <dt><img src="icons/grass/zoom-in.png">&nbsp;
+  <dt><img src="icons/zoom-in.png">&nbsp;
     <em>Zoom in</em></dt>
   <dd>Interactive zooming with the mouse in the active display monitor.
     Drawing a box or just click with the mouse (left button) and zoom-in
@@ -440,7 +440,7 @@ the computational region extents.
     does <em>not</em> affect the computational region for other GIS
     processes, see <em><a href="g.region.html">g.region</a></em>.</dd>
   
-  <dt><img src="icons/grass/zoom-out.png">&nbsp;
+  <dt><img src="icons/zoom-out.png">&nbsp;
     <em>Zoom out</em></dt>
   <dd>Interactive zooming with the mouse in the active display monitor.
     Drawing a box or just click with the mouse (left button) and zoom-out
@@ -453,7 +453,7 @@ the computational region extents.
     other GIS processes,
     see <em><a href="g.region.html">g.region</a></em>.</dd>
   
-  <dt><img src="icons/grass/zoom-extent.png">&nbsp;
+  <dt><img src="icons/zoom-extent.png">&nbsp;
     <em>Zoom to selected map(s)</em></dt>
   <dd>Set zoom extent based on selected raster or vector maps. Zooming
     resets the display region extents (both size and location of area
@@ -461,12 +461,12 @@ the computational region extents.
     for other GIS processes,
     see <em><a href="g.region.html">g.region</a></em>.</dd>
 
-  <dt><img src="icons/grass/zoom-last.png">&nbsp;
+  <dt><img src="icons/zoom-last.png">&nbsp;
     <em>Return to previous zoom</em></dt>
   <dd>Returns to the previous zoom extent. Up to 10 levels of zoom back are
     maintained, see <em><a href="g.region.html">g.region</a></em>.</dd>
   
-  <dt><img src="icons/grass/zoom-more.png">&nbsp;
+  <dt><img src="icons/zoom-more.png">&nbsp;
     <em>Zoom options</em></dt>
   <dd>Opens a dropdown menu that allows user to:
     <ul>
@@ -481,11 +481,11 @@ the computational region extents.
     </ul>
   </dd>
   
-  <dt><img src="icons/grass/layer-raster-analyze.png">&nbsp;
+  <dt><img src="icons/layer-raster-analyze.png">&nbsp;
     <em>Analyze menu</em></dt>
   <dd>Opens a dropdown menu with:
     <dl>
-      <dt><img src="icons/grass/measure-length.png">&nbsp;
+      <dt><img src="icons/measure-length.png">&nbsp;
         <em>Distance measurement tool</em></dt>
       <dd>Interactive measurement of lengths defined with the mouse. The
         length of each segment and the cumulative length of all segments
@@ -493,7 +493,7 @@ the computational region extents.
         measured in the current measurement unit,
         see <em><a href="d.measure.html">d.measure</a></em>.</dd>
       
-      <dt><img src="icons/grass/layer-raster-profile.png">&nbsp;
+      <dt><img src="icons/layer-raster-profile.png">&nbsp;
         <em>Profile tool</em></dt>
       <dd>Interactively create profile of a raster map. Profile transect is
 	drawn with the mouse in map display. The profile may be of the
@@ -501,31 +501,31 @@ the computational region extents.
 	simultaneously, 
 	see <em><a href="gm_profile.html">Profile Tool help page</a></em>.</dd>
 
-      <dt><img src="icons/grass/layer-raster-histogram.png">&nbsp;
+      <dt><img src="icons/layer-raster-histogram.png">&nbsp;
         <em>Histogram tool</em></dt>
       <dd>Displays histogram of selected raster map or image in new window,
         see <em><a href="d.histogram.html">d.histogram</a></em>.</dd>
     </dl>
   </dd>
   
-  <dt><img src="icons/grass/overlay-add.png">&nbsp;
+  <dt><img src="icons/overlay-add.png">&nbsp;
     <em>Add overlay</em></dt>
   <dd>opens a dropdown menu that allows user to
     
     <dl>
-    <dt><img src="icons/grass/scalebar-add.png">&nbsp;
+    <dt><img src="icons/scalebar-add.png">&nbsp;
       <em>Add scalebar and north arrow</em></dt>
     <dd>Adds layer to display a combined scalebar and north arrow. Options
       include scalebar placement (using screen coordinates or a mouse),
       scalebar format, and scalebar colors,
       see <em><a href="d.barscale.html">d.barscale</a></em>.</dd>
     
-    <dt><img src="icons/grass/legend-add.png">&nbsp;
+    <dt><img src="icons/legend-add.png">&nbsp;
       <em>Add raster map legend</em></dt>
     <dd>Adds layer to display with legend of selected raster map,
       see <em><a href="d.legend.html">d.legend</a></em>.</dd>
     
-    <dt><img src="icons/grass/text-add.png">&nbsp;
+    <dt><img src="icons/text-add.png">&nbsp;
       <em>Add text layer</em></dt>
     <dd>Adds layer to display a line of text using default GRASS font
       (selected with <em><a href="d.font.html">d.font</a></em>).  Options
@@ -534,11 +534,11 @@ the computational region extents.
     </dl>
   </dd>
 
-  <dt><img src="icons/grass/map-export.png">&nbsp;
+  <dt><img src="icons/map-export.png">&nbsp;
     <em>Save display to graphic file</em></dt>
   <dd>Save the visible image in map display to different raster graphic formats.</dd>
   
-  <dt><img src="icons/grass/print.png">&nbsp;
+  <dt><img src="icons/print.png">&nbsp;
     <em>Print map</em></dt>
   <dd>Prints map on system native printer or PostScript device;
     saves visible map display (including PostScript text and labels) to PDF