diff --git a/images/themes/classic/qgis.xpm b/images/themes/classic/qgis.xpm
diff --git a/images/themes/default/CMakeLists.txt b/images/themes/default/CMakeLists.txt
@@ -1,8 +1,6 @@
-FILE (GLOB IMAGES *.png)
+ADD_SUBDIRECTORY(plugins)
+
+FILE(GLOB IMAGES *.png *.svg)
 
 INSTALL (FILES ${IMAGES}
          DESTINATION ${QGIS_DATA_DIR}/themes/default)
-
-FILE (GLOB PLUG_IMAGES  plugins/*.png)
-
-INSTALL (FILES ${PLUG_IMAGES} DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)
diff --git a/images/themes/gis/LICENSE.TXT → images/themes/default/LICENSE.TXT b/images/themes/gis/LICENSE.TXT → images/themes/default/LICENSE.TXT
diff --git a/images/themes/default/locked.png b/images/themes/default/locked.png
diff --git a/images/themes/default/mActionAddArrow.png b/images/themes/default/mActionAddArrow.png
diff --git a/images/themes/default/mActionAddBasicShape.png b/images/themes/default/mActionAddBasicShape.png
diff --git a/images/themes/gis/mActionAddGPSLayer.png → images/themes/default/mActionAddGPSLayer.png b/images/themes/gis/mActionAddGPSLayer.png → images/themes/default/mActionAddGPSLayer.png
diff --git a/images/themes/default/mActionAddHtml.png b/images/themes/default/mActionAddHtml.png
diff --git a/images/themes/default/mActionAddImage.png b/images/themes/default/mActionAddImage.png
diff --git a/images/themes/default/mActionAddLayer.png b/images/themes/default/mActionAddLayer.png
diff --git a/images/themes/default/mActionAddLegend.png b/images/themes/default/mActionAddLegend.png
diff --git a/images/themes/default/mActionAddMap.png b/images/themes/default/mActionAddMap.png
diff --git a/images/themes/default/mActionAddOgrLayer.png b/images/themes/default/mActionAddOgrLayer.png
diff --git a/images/themes/default/mActionAddPart.png b/images/themes/default/mActionAddPart.png
diff --git a/images/themes/default/mActionAddRasterLayer.png b/images/themes/default/mActionAddRasterLayer.png
diff --git a/images/themes/default/mActionAddRing.png b/images/themes/default/mActionAddRing.png
diff --git a/images/themes/default/mActionAddSpatiaLiteLayer.png b/images/themes/default/mActionAddSpatiaLiteLayer.png
diff --git a/images/themes/default/mActionAddVertex.png b/images/themes/default/mActionAddVertex.png
diff --git a/images/themes/default/mActionAddWcsLayer.png b/images/themes/default/mActionAddWcsLayer.png
diff --git a/images/themes/default/mActionAddWfsLayer.png b/images/themes/default/mActionAddWfsLayer.png
diff --git a/images/themes/default/mActionAddWmsLayer.png b/images/themes/default/mActionAddWmsLayer.png
diff --git a/images/themes/default/mActionAlignBottom.png b/images/themes/default/mActionAlignBottom.png
diff --git a/images/themes/default/mActionAlignHCenter.png b/images/themes/default/mActionAlignHCenter.png
diff --git a/images/themes/default/mActionAlignLeft.png b/images/themes/default/mActionAlignLeft.png
diff --git a/images/themes/default/mActionAlignRight.png b/images/themes/default/mActionAlignRight.png
diff --git a/images/themes/default/mActionAlignTop.png b/images/themes/default/mActionAlignTop.png
diff --git a/images/themes/default/mActionAlignVCenter.png b/images/themes/default/mActionAlignVCenter.png
diff --git a/images/themes/default/mActionCalculateField.png b/images/themes/default/mActionCalculateField.png
diff --git a/images/themes/default/mActionCaptureLine.png b/images/themes/default/mActionCaptureLine.png
diff --git a/images/themes/default/mActionCapturePoint.png b/images/themes/default/mActionCapturePoint.png
diff --git a/images/themes/default/mActionCapturePolygon.png b/images/themes/default/mActionCapturePolygon.png
diff --git a/images/themes/default/mActionChangeLabelProperties.png b/images/themes/default/mActionChangeLabelProperties.png
diff --git a/images/themes/default/mActionComposerManager.png b/images/themes/default/mActionComposerManager.png
diff --git a/images/themes/default/mActionCopySelected.png b/images/themes/default/mActionCopySelected.png
diff --git a/images/themes/default/mActionDeleteAttribute.png b/images/themes/default/mActionDeleteAttribute.png
diff --git a/images/themes/default/mActionDeletePart.png b/images/themes/default/mActionDeletePart.png
diff --git a/images/themes/default/mActionDeleteRing.png b/images/themes/default/mActionDeleteRing.png
diff --git a/images/themes/default/mActionDeleteSelected.png b/images/themes/default/mActionDeleteSelected.png
diff --git a/images/themes/default/mActionDeleteVertex.png b/images/themes/default/mActionDeleteVertex.png
diff --git a/images/themes/default/mActionDeselectAll.png b/images/themes/default/mActionDeselectAll.png
diff --git a/images/themes/default/mActionDraw.png b/images/themes/default/mActionDraw.png
diff --git a/images/themes/default/mActionEditCopy.png b/images/themes/default/mActionEditCopy.png
diff --git a/images/themes/default/mActionEditCut.png b/images/themes/default/mActionEditCut.png
diff --git a/images/themes/default/mActionEditPaste.png b/images/themes/default/mActionEditPaste.png
diff --git a/images/themes/default/mActionFileNew.png b/images/themes/default/mActionFileNew.png
diff --git a/images/themes/default/mActionFileOpen.png b/images/themes/default/mActionFileOpen.png
diff --git a/images/themes/default/mActionFilePrint.png b/images/themes/default/mActionFilePrint.png
diff --git a/images/themes/default/mActionFileSave.png b/images/themes/default/mActionFileSave.png
diff --git a/images/themes/default/mActionFileSaveAs.png b/images/themes/default/mActionFileSaveAs.png
diff --git a/images/themes/gis/mActionFilter.svg → images/themes/default/mActionFilter.svg b/images/themes/gis/mActionFilter.svg → images/themes/default/mActionFilter.svg
diff --git a/images/themes/default/mActionFolder.png b/images/themes/default/mActionFolder.png
diff --git a/images/themes/default/mActionGroupItems.png b/images/themes/default/mActionGroupItems.png
diff --git a/images/themes/default/mActionHelpContents.png b/images/themes/default/mActionHelpContents.png
diff --git a/images/themes/default/mActionHideAllLayers.png b/images/themes/default/mActionHideAllLayers.png
diff --git a/images/themes/default/mActionIdentify.png b/images/themes/default/mActionIdentify.png
diff --git a/images/themes/default/mActionInOverview.png b/images/themes/default/mActionInOverview.png
diff --git a/images/themes/default/mActionInvertSelection.png b/images/themes/default/mActionInvertSelection.png
diff --git a/images/themes/default/mActionLabel.png b/images/themes/default/mActionLabel.png
diff --git a/images/themes/default/mActionLabeling.png b/images/themes/default/mActionLabeling.png
diff --git a/images/themes/default/mActionLowerItems.png b/images/themes/default/mActionLowerItems.png
diff --git a/images/themes/default/mActionMapTips.png b/images/themes/default/mActionMapTips.png
diff --git a/images/themes/default/mActionMeasure.png b/images/themes/default/mActionMeasure.png
diff --git a/images/themes/default/mActionMeasureAngle.png b/images/themes/default/mActionMeasureAngle.png
diff --git a/images/themes/default/mActionMeasureArea.png b/images/themes/default/mActionMeasureArea.png
diff --git a/images/themes/default/mActionMergeFeatureAttributes.png b/images/themes/default/mActionMergeFeatureAttributes.png
diff --git a/images/themes/default/mActionMergeFeatures.png b/images/themes/default/mActionMergeFeatures.png
diff --git a/images/themes/default/mActionMoveFeature.png b/images/themes/default/mActionMoveFeature.png
diff --git a/images/themes/default/mActionMoveItemContent.png b/images/themes/default/mActionMoveItemContent.png
diff --git a/images/themes/default/mActionMoveItemsToBottom.png b/images/themes/default/mActionMoveItemsToBottom.png
diff --git a/images/themes/default/mActionMoveItemsToTop.png b/images/themes/default/mActionMoveItemsToTop.png
diff --git a/images/themes/default/mActionMoveLabel.png b/images/themes/default/mActionMoveLabel.png
diff --git a/images/themes/default/mActionMoveVertex.png b/images/themes/default/mActionMoveVertex.png
diff --git a/images/themes/default/mActionNewAttribute.png b/images/themes/default/mActionNewAttribute.png
diff --git a/images/themes/default/mActionNewBookmark.png b/images/themes/default/mActionNewBookmark.png
diff --git a/images/themes/default/mActionNewComposer.png b/images/themes/default/mActionNewComposer.png
diff --git a/images/themes/default/mActionNewVectorLayer.png b/images/themes/default/mActionNewVectorLayer.png
diff --git a/images/themes/default/mActionNodeTool.png b/images/themes/default/mActionNodeTool.png
diff --git a/images/themes/default/mActionOffsetCurve.png b/images/themes/default/mActionOffsetCurve.png
diff --git a/images/themes/default/mActionOpenTable.png b/images/themes/default/mActionOpenTable.png
diff --git a/images/themes/default/mActionPan.png b/images/themes/default/mActionPan.png
diff --git a/images/themes/default/mActionPanToSelected.svg b/images/themes/default/mActionPanToSelected.svg
diff --git a/images/themes/default/mActionPinLabels.svg b/images/themes/default/mActionPinLabels.svg
diff --git a/images/themes/default/mActionRaiseItems.png b/images/themes/default/mActionRaiseItems.png
diff --git a/images/themes/default/mActionRedo.png b/images/themes/default/mActionRedo.png
diff --git a/images/themes/default/mActionRemoveLayer.png b/images/themes/default/mActionRemoveLayer.png
diff --git a/images/themes/default/mActionReshape.png b/images/themes/default/mActionReshape.png
diff --git a/images/themes/default/mActionRotateFeature.png b/images/themes/default/mActionRotateFeature.png
diff --git a/images/themes/default/mActionRotateLabel.png b/images/themes/default/mActionRotateLabel.png
diff --git a/images/themes/default/mActionRotateLabel.svg b/images/themes/default/mActionRotateLabel.svg
diff --git a/images/themes/default/mActionSaveAsPDF.png b/images/themes/default/mActionSaveAsPDF.png
diff --git a/images/themes/default/mActionSaveAsSVG.png b/images/themes/default/mActionSaveAsSVG.png
diff --git a/images/themes/default/mActionSaveMapAsImage.png b/images/themes/default/mActionSaveMapAsImage.png
diff --git a/images/themes/default/mActionScaleBar.png b/images/themes/default/mActionScaleBar.png
diff --git a/images/themes/default/mActionSelect.png b/images/themes/default/mActionSelect.png
diff --git a/images/themes/default/mActionSelectFreehand.png b/images/themes/default/mActionSelectFreehand.png
diff --git a/images/themes/default/mActionSelectPan.png b/images/themes/default/mActionSelectPan.png
diff --git a/images/themes/default/mActionSelectPolygon.png b/images/themes/default/mActionSelectPolygon.png
diff --git a/images/themes/default/mActionSelectPolygon.svg b/images/themes/default/mActionSelectPolygon.svg
diff --git a/images/themes/default/mActionSelectRadius.png b/images/themes/default/mActionSelectRadius.png
diff --git a/images/themes/default/mActionSelectRectangle.png b/images/themes/default/mActionSelectRectangle.png
diff --git a/images/themes/default/mActionSelectedToTop.png b/images/themes/default/mActionSelectedToTop.png
diff --git a/images/themes/default/mActionShowAllLayers.png b/images/themes/default/mActionShowAllLayers.png
diff --git a/images/themes/default/mActionShowBookmarks.png b/images/themes/default/mActionShowBookmarks.png
diff --git a/images/themes/default/mActionShowHideLabels.svg b/images/themes/default/mActionShowHideLabels.svg
diff --git a/images/themes/default/mActionShowPinnedLabels.svg b/images/themes/default/mActionShowPinnedLabels.svg
diff --git a/images/themes/default/mActionSimplify.png b/images/themes/default/mActionSimplify.png
diff --git a/images/themes/default/mActionSplitFeatures.png b/images/themes/default/mActionSplitFeatures.png
diff --git a/images/themes/default/mActionSplitFeatures.svg b/images/themes/default/mActionSplitFeatures.svg
diff --git a/images/themes/default/mActionToggleEditing.png b/images/themes/default/mActionToggleEditing.png
diff --git a/images/themes/default/mActionUndo.png b/images/themes/default/mActionUndo.png
diff --git a/images/themes/default/mActionUngroupItems.png b/images/themes/default/mActionUngroupItems.png
diff --git a/images/themes/default/mActionUnselectAttributes.png b/images/themes/default/mActionUnselectAttributes.png
diff --git a/images/themes/default/mActionZoomActual.png b/images/themes/default/mActionZoomActual.png
diff --git a/images/themes/gis/mActionZoomActual.svg → images/themes/default/mActionZoomActual.svg b/images/themes/gis/mActionZoomActual.svg → images/themes/default/mActionZoomActual.svg
diff --git a/images/themes/default/mActionZoomFullExtent.png b/images/themes/default/mActionZoomFullExtent.png
diff --git a/images/themes/default/mActionZoomIn.png b/images/themes/default/mActionZoomIn.png
diff --git a/images/themes/default/mActionZoomLast.png b/images/themes/default/mActionZoomLast.png
diff --git a/images/themes/default/mActionZoomNext.png b/images/themes/default/mActionZoomNext.png
diff --git a/images/themes/default/mActionZoomOut.png b/images/themes/default/mActionZoomOut.png
diff --git a/images/themes/default/mActionZoomToLayer.png b/images/themes/default/mActionZoomToLayer.png
diff --git a/images/themes/default/mActionZoomToSelected.png b/images/themes/default/mActionZoomToSelected.png
diff --git a/images/themes/gis/mIconDeselected.svg → images/themes/default/mIconDeselected.svg b/images/themes/gis/mIconDeselected.svg → images/themes/default/mIconDeselected.svg
diff --git a/images/themes/gis/mIconExpressionFilter.svg → .../themes/default/mIconExpressionFilter.svg b/images/themes/gis/mIconExpressionFilter.svg → .../themes/default/mIconExpressionFilter.svg
diff --git a/images/themes/gis/mIconExpressionPreview.svg → ...themes/default/mIconExpressionPreview.svg b/images/themes/gis/mIconExpressionPreview.svg → ...themes/default/mIconExpressionPreview.svg
diff --git a/images/themes/gis/mIconExpressionSelect.svg → .../themes/default/mIconExpressionSelect.svg b/images/themes/gis/mIconExpressionSelect.svg → .../themes/default/mIconExpressionSelect.svg
diff --git a/images/themes/default/mIconLineLayer.png b/images/themes/default/mIconLineLayer.png
diff --git a/images/themes/gis/mIconLineLayer.svg → images/themes/default/mIconLineLayer.svg b/images/themes/gis/mIconLineLayer.svg → images/themes/default/mIconLineLayer.svg
diff --git a/images/themes/default/mIconOws.png b/images/themes/default/mIconOws.png
diff --git a/images/themes/gis/mIconOws.svg → images/themes/default/mIconOws.svg b/images/themes/gis/mIconOws.svg → images/themes/default/mIconOws.svg
diff --git a/images/themes/default/mIconPointLayer.png b/images/themes/default/mIconPointLayer.png
diff --git a/images/themes/gis/mIconPointLayer.svg → images/themes/default/mIconPointLayer.svg b/images/themes/gis/mIconPointLayer.svg → images/themes/default/mIconPointLayer.svg
diff --git a/images/themes/default/mIconPolygonLayer.png b/images/themes/default/mIconPolygonLayer.png
diff --git a/images/themes/gis/mIconPolygonLayer.svg → images/themes/default/mIconPolygonLayer.svg b/images/themes/gis/mIconPolygonLayer.svg → images/themes/default/mIconPolygonLayer.svg
diff --git a/images/themes/gis/mIconSelectAdd.svg → images/themes/default/mIconSelectAdd.svg b/images/themes/gis/mIconSelectAdd.svg → images/themes/default/mIconSelectAdd.svg
diff --git a/images/themes/gis/mIconSelectIntersect.svg → ...s/themes/default/mIconSelectIntersect.svg b/images/themes/gis/mIconSelectIntersect.svg → ...s/themes/default/mIconSelectIntersect.svg
diff --git a/images/themes/gis/mIconSelectRemove.svg → images/themes/default/mIconSelectRemove.svg b/images/themes/gis/mIconSelectRemove.svg → images/themes/default/mIconSelectRemove.svg
diff --git a/images/themes/gis/mIconSelected.svg → images/themes/default/mIconSelected.svg b/images/themes/gis/mIconSelected.svg → images/themes/default/mIconSelected.svg
diff --git a/images/themes/default/mIconTableLayer.png b/images/themes/default/mIconTableLayer.png
diff --git a/images/themes/gis/mIconTableLayer.svg → images/themes/default/mIconTableLayer.svg b/images/themes/gis/mIconTableLayer.svg → images/themes/default/mIconTableLayer.svg
diff --git a/images/themes/default/mIconVectorLayer.png b/images/themes/default/mIconVectorLayer.png
diff --git a/images/themes/gis/mIconVectorLayer.svg → images/themes/default/mIconVectorLayer.svg b/images/themes/gis/mIconVectorLayer.svg → images/themes/default/mIconVectorLayer.svg
diff --git a/images/themes/default/mIconWcs.png b/images/themes/default/mIconWcs.png
diff --git a/images/themes/default/mIconWms.png b/images/themes/default/mIconWms.png
diff --git a/images/themes/gis/plugins/CMakeLists.txt → images/themes/default/plugins/CMakeLists.txt b/images/themes/gis/plugins/CMakeLists.txt → images/themes/default/plugins/CMakeLists.txt
@@ -1,7 +1,7 @@
 ADD_SUBDIRECTORY(coordinate_capture)
 ADD_SUBDIRECTORY(gps_importer)
 
-FILE (GLOB IMAGES *.png)
+FILE(GLOB IMAGES *.png *.svg)
 
 INSTALL (FILES ${IMAGES}
-         DESTINATION ${QGIS_DATA_DIR}/themes/gis/plugins)
+         DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)
diff --git a/images/themes/default/plugins/coordinate_capture/CMakeLists.txt b/images/themes/default/plugins/coordinate_capture/CMakeLists.txt
@@ -0,0 +1,4 @@
+FILE(GLOB IMAGES *.png *.svg)
+
+INSTALL (FILES ${IMAGES}
+         DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins/coordinate_capture)
diff --git a/...coordinate_capture/coordinate_capture.png → ...coordinate_capture/coordinate_capture.png b/...coordinate_capture/coordinate_capture.png → ...coordinate_capture/coordinate_capture.png
diff --git a/images/themes/default/plugins/copyright_label.png b/images/themes/default/plugins/copyright_label.png
diff --git a/images/themes/gis/plugins/delimited_text.png → ...themes/default/plugins/delimited_text.png b/images/themes/gis/plugins/delimited_text.png → ...themes/default/plugins/delimited_text.png
diff --git a/.../themes/gis/plugins/dxf2shp_converter.png → ...mes/default/plugins/dxf2shp_converter.png b/.../themes/gis/plugins/dxf2shp_converter.png → ...mes/default/plugins/dxf2shp_converter.png
diff --git a/images/themes/gis/plugins/gps_importer.png → ...s/themes/default/plugins/gps_importer.png b/images/themes/gis/plugins/gps_importer.png → ...s/themes/default/plugins/gps_importer.png
diff --git a/images/themes/default/plugins/gps_importer/CMakeLists.txt b/images/themes/default/plugins/gps_importer/CMakeLists.txt
@@ -0,0 +1,4 @@
+FILE(GLOB IMAGES *.png *.svg)
+
+INSTALL (FILES ${IMAGES}
+         DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins/gps_importer)
diff --git a/...s/gis/plugins/gps_importer/create_gpx.png → ...fault/plugins/gps_importer/create_gpx.png b/...s/gis/plugins/gps_importer/create_gpx.png → ...fault/plugins/gps_importer/create_gpx.png
diff --git a/...s/gis/plugins/gps_importer/import_gpx.png → ...fault/plugins/gps_importer/import_gpx.png b/...s/gis/plugins/gps_importer/import_gpx.png → ...fault/plugins/gps_importer/import_gpx.png
diff --git a/images/themes/gis/plugins/interpolation.png → .../themes/default/plugins/interpolation.png b/images/themes/gis/plugins/interpolation.png → .../themes/default/plugins/interpolation.png
diff --git a/images/themes/gis/plugins/mGeorefRun.png → images/themes/default/plugins/mGeorefRun.png b/images/themes/gis/plugins/mGeorefRun.png → images/themes/default/plugins/mGeorefRun.png
diff --git a/...s/themes/gis/plugins/mapserver_export.png → ...emes/default/plugins/mapserver_export.png b/...s/themes/gis/plugins/mapserver_export.png → ...emes/default/plugins/mapserver_export.png
diff --git a/images/themes/default/plugins/north_arrow.png b/images/themes/default/plugins/north_arrow.png
diff --git a/images/themes/gis/plugins/ogr_converter.png → .../themes/default/plugins/ogr_converter.png b/images/themes/gis/plugins/ogr_converter.png → .../themes/default/plugins/ogr_converter.png
diff --git a/images/themes/gis/plugins/quick_print.png → ...es/themes/default/plugins/quick_print.png b/images/themes/gis/plugins/quick_print.png → ...es/themes/default/plugins/quick_print.png
diff --git a/images/themes/default/plugins/scale_bar.png b/images/themes/default/plugins/scale_bar.png
diff --git a/images/themes/gis/plugins/spit.png → images/themes/default/plugins/spit.png b/images/themes/gis/plugins/spit.png → images/themes/default/plugins/spit.png
diff --git a/images/themes/default/unlocked.png b/images/themes/default/unlocked.png
diff --git a/images/themes/gis/CMakeLists.txt b/images/themes/gis/CMakeLists.txt
diff --git a/images/themes/gis/locked.png b/images/themes/gis/locked.png
diff --git a/images/themes/gis/mActionAddArrow.png b/images/themes/gis/mActionAddArrow.png
diff --git a/images/themes/gis/mActionAddBasicShape.png b/images/themes/gis/mActionAddBasicShape.png
diff --git a/images/themes/gis/mActionAddHtml.png b/images/themes/gis/mActionAddHtml.png
diff --git a/images/themes/gis/mActionAddImage.png b/images/themes/gis/mActionAddImage.png
diff --git a/images/themes/gis/mActionAddLayer.png b/images/themes/gis/mActionAddLayer.png
diff --git a/images/themes/gis/mActionAddLegend.png b/images/themes/gis/mActionAddLegend.png
diff --git a/images/themes/gis/mActionAddMap.png b/images/themes/gis/mActionAddMap.png
diff --git a/images/themes/gis/mActionAddOgrLayer.png b/images/themes/gis/mActionAddOgrLayer.png
diff --git a/images/themes/gis/mActionAddPart.png b/images/themes/gis/mActionAddPart.png
diff --git a/images/themes/gis/mActionAddRasterLayer.png b/images/themes/gis/mActionAddRasterLayer.png
diff --git a/images/themes/gis/mActionAddRing.png b/images/themes/gis/mActionAddRing.png
diff --git a/images/themes/gis/mActionAddSpatiaLiteLayer.png b/images/themes/gis/mActionAddSpatiaLiteLayer.png
diff --git a/images/themes/gis/mActionAddVertex.png b/images/themes/gis/mActionAddVertex.png
diff --git a/images/themes/gis/mActionAddWcsLayer.png b/images/themes/gis/mActionAddWcsLayer.png
diff --git a/images/themes/gis/mActionAddWfsLayer.png b/images/themes/gis/mActionAddWfsLayer.png
diff --git a/images/themes/gis/mActionAddWmsLayer.png b/images/themes/gis/mActionAddWmsLayer.png
diff --git a/images/themes/gis/mActionAlignBottom.png b/images/themes/gis/mActionAlignBottom.png
diff --git a/images/themes/gis/mActionAlignHCenter.png b/images/themes/gis/mActionAlignHCenter.png
diff --git a/images/themes/gis/mActionAlignLeft.png b/images/themes/gis/mActionAlignLeft.png
diff --git a/images/themes/gis/mActionAlignRight.png b/images/themes/gis/mActionAlignRight.png
diff --git a/images/themes/gis/mActionAlignTop.png b/images/themes/gis/mActionAlignTop.png
diff --git a/images/themes/gis/mActionAlignVCenter.png b/images/themes/gis/mActionAlignVCenter.png
diff --git a/images/themes/gis/mActionAllEdits.svg b/images/themes/gis/mActionAllEdits.svg
diff --git a/images/themes/gis/mActionAnnotation.png b/images/themes/gis/mActionAnnotation.png
diff --git a/images/themes/gis/mActionCalculateField.png b/images/themes/gis/mActionCalculateField.png
diff --git a/images/themes/gis/mActionCancelAllEdits.svg b/images/themes/gis/mActionCancelAllEdits.svg
diff --git a/images/themes/gis/mActionCancelEdits.svg b/images/themes/gis/mActionCancelEdits.svg
diff --git a/images/themes/gis/mActionCaptureLine.png b/images/themes/gis/mActionCaptureLine.png
diff --git a/images/themes/gis/mActionCapturePoint.png b/images/themes/gis/mActionCapturePoint.png
diff --git a/images/themes/gis/mActionCapturePolygon.png b/images/themes/gis/mActionCapturePolygon.png
diff --git a/images/themes/gis/mActionChangeLabelProperties.png b/images/themes/gis/mActionChangeLabelProperties.png
diff --git a/images/themes/gis/mActionComposerManager.png b/images/themes/gis/mActionComposerManager.png
diff --git a/images/themes/gis/mActionCopySelected.png b/images/themes/gis/mActionCopySelected.png
diff --git a/images/themes/gis/mActionDecreaseBrightness.svg b/images/themes/gis/mActionDecreaseBrightness.svg
diff --git a/images/themes/gis/mActionDecreaseContrast.svg b/images/themes/gis/mActionDecreaseContrast.svg
diff --git a/images/themes/gis/mActionDeleteAttribute.png b/images/themes/gis/mActionDeleteAttribute.png
diff --git a/images/themes/gis/mActionDeletePart.png b/images/themes/gis/mActionDeletePart.png
diff --git a/images/themes/gis/mActionDeleteRing.png b/images/themes/gis/mActionDeleteRing.png
diff --git a/images/themes/gis/mActionDeleteSelected.png b/images/themes/gis/mActionDeleteSelected.png
diff --git a/images/themes/gis/mActionDeleteVertex.png b/images/themes/gis/mActionDeleteVertex.png
diff --git a/images/themes/gis/mActionDeselectAll.png b/images/themes/gis/mActionDeselectAll.png
diff --git a/images/themes/gis/mActionDraw.png b/images/themes/gis/mActionDraw.png
diff --git a/images/themes/gis/mActionDuplicateComposer.png b/images/themes/gis/mActionDuplicateComposer.png
diff --git a/images/themes/gis/mActionEditCopy.png b/images/themes/gis/mActionEditCopy.png
diff --git a/images/themes/gis/mActionEditCut.png b/images/themes/gis/mActionEditCut.png
diff --git a/images/themes/gis/mActionEditPaste.png b/images/themes/gis/mActionEditPaste.png
diff --git a/images/themes/gis/mActionFileNew.png b/images/themes/gis/mActionFileNew.png
diff --git a/images/themes/gis/mActionFileOpen.png b/images/themes/gis/mActionFileOpen.png
diff --git a/images/themes/gis/mActionFilePrint.png b/images/themes/gis/mActionFilePrint.png
diff --git a/images/themes/gis/mActionFileSave.png b/images/themes/gis/mActionFileSave.png
diff --git a/images/themes/gis/mActionFileSaveAs.png b/images/themes/gis/mActionFileSaveAs.png
diff --git a/images/themes/gis/mActionFolder.png b/images/themes/gis/mActionFolder.png
diff --git a/images/themes/gis/mActionFormAnnotation.png b/images/themes/gis/mActionFormAnnotation.png
diff --git a/images/themes/gis/mActionGroupItems.png b/images/themes/gis/mActionGroupItems.png
diff --git a/images/themes/gis/mActionHelpContents.png b/images/themes/gis/mActionHelpContents.png
diff --git a/images/themes/gis/mActionHideAllLayers.png b/images/themes/gis/mActionHideAllLayers.png
diff --git a/images/themes/gis/mActionIdentify.png b/images/themes/gis/mActionIdentify.png
diff --git a/images/themes/gis/mActionInOverview.png b/images/themes/gis/mActionInOverview.png
diff --git a/images/themes/gis/mActionIncreaseBrightness.svg b/images/themes/gis/mActionIncreaseBrightness.svg
diff --git a/images/themes/gis/mActionIncreaseContrast.svg b/images/themes/gis/mActionIncreaseContrast.svg
diff --git a/images/themes/gis/mActionInvertSelection.png b/images/themes/gis/mActionInvertSelection.png
diff --git a/images/themes/gis/mActionLabel.png b/images/themes/gis/mActionLabel.png
diff --git a/images/themes/gis/mActionLabeling.png b/images/themes/gis/mActionLabeling.png
diff --git a/images/themes/gis/mActionLowerItems.png b/images/themes/gis/mActionLowerItems.png
diff --git a/images/themes/gis/mActionMapTips.png b/images/themes/gis/mActionMapTips.png
diff --git a/images/themes/gis/mActionMeasure.png b/images/themes/gis/mActionMeasure.png
diff --git a/images/themes/gis/mActionMeasureAngle.png b/images/themes/gis/mActionMeasureAngle.png
diff --git a/images/themes/gis/mActionMeasureArea.png b/images/themes/gis/mActionMeasureArea.png
diff --git a/images/themes/gis/mActionMergeFeatureAttributes.png b/images/themes/gis/mActionMergeFeatureAttributes.png
diff --git a/images/themes/gis/mActionMergeFeatures.png b/images/themes/gis/mActionMergeFeatures.png
diff --git a/images/themes/gis/mActionMoveFeature.png b/images/themes/gis/mActionMoveFeature.png
diff --git a/images/themes/gis/mActionMoveItemContent.png b/images/themes/gis/mActionMoveItemContent.png
diff --git a/images/themes/gis/mActionMoveItemsToBottom.png b/images/themes/gis/mActionMoveItemsToBottom.png
diff --git a/images/themes/gis/mActionMoveItemsToTop.png b/images/themes/gis/mActionMoveItemsToTop.png
diff --git a/images/themes/gis/mActionMoveLabel.png b/images/themes/gis/mActionMoveLabel.png
diff --git a/images/themes/gis/mActionMoveVertex.png b/images/themes/gis/mActionMoveVertex.png
diff --git a/images/themes/gis/mActionNewAttribute.png b/images/themes/gis/mActionNewAttribute.png
diff --git a/images/themes/gis/mActionNewBookmark.png b/images/themes/gis/mActionNewBookmark.png
diff --git a/images/themes/gis/mActionNewComposer.png b/images/themes/gis/mActionNewComposer.png
diff --git a/images/themes/gis/mActionNewVectorLayer.png b/images/themes/gis/mActionNewVectorLayer.png
diff --git a/images/themes/gis/mActionNodeTool.png b/images/themes/gis/mActionNodeTool.png
diff --git a/images/themes/gis/mActionOffsetCurve.png b/images/themes/gis/mActionOffsetCurve.png
diff --git a/images/themes/gis/mActionOpenTable.png b/images/themes/gis/mActionOpenTable.png
diff --git a/images/themes/gis/mActionPan.png b/images/themes/gis/mActionPan.png
diff --git a/images/themes/gis/mActionPanToSelected.png b/images/themes/gis/mActionPanToSelected.png
diff --git a/images/themes/gis/mActionPanToSelected.svg b/images/themes/gis/mActionPanToSelected.svg
diff --git a/images/themes/gis/mActionPinLabels.svg b/images/themes/gis/mActionPinLabels.svg
diff --git a/images/themes/gis/mActionRaiseItems.png b/images/themes/gis/mActionRaiseItems.png
diff --git a/images/themes/gis/mActionRedo.png b/images/themes/gis/mActionRedo.png
diff --git a/images/themes/gis/mActionRemoveLayer.png b/images/themes/gis/mActionRemoveLayer.png
diff --git a/images/themes/gis/mActionReshape.png b/images/themes/gis/mActionReshape.png
diff --git a/images/themes/gis/mActionRollbackAllEdits.svg b/images/themes/gis/mActionRollbackAllEdits.svg
diff --git a/images/themes/gis/mActionRollbackEdits.svg b/images/themes/gis/mActionRollbackEdits.svg
diff --git a/images/themes/gis/mActionRotateFeature.png b/images/themes/gis/mActionRotateFeature.png
diff --git a/images/themes/gis/mActionRotateLabel.png b/images/themes/gis/mActionRotateLabel.png
diff --git a/images/themes/gis/mActionRotateLabel.svg b/images/themes/gis/mActionRotateLabel.svg
diff --git a/images/themes/gis/mActionSaveAllEdits.svg b/images/themes/gis/mActionSaveAllEdits.svg
diff --git a/images/themes/gis/mActionSaveAsPDF.png b/images/themes/gis/mActionSaveAsPDF.png
diff --git a/images/themes/gis/mActionSaveAsSVG.png b/images/themes/gis/mActionSaveAsSVG.png
diff --git a/images/themes/gis/mActionSaveEdits.svg b/images/themes/gis/mActionSaveEdits.svg
diff --git a/images/themes/gis/mActionSaveMapAsImage.png b/images/themes/gis/mActionSaveMapAsImage.png
diff --git a/images/themes/gis/mActionScaleBar.png b/images/themes/gis/mActionScaleBar.png
diff --git a/images/themes/gis/mActionSelect.png b/images/themes/gis/mActionSelect.png
diff --git a/images/themes/gis/mActionSelectFreehand.png b/images/themes/gis/mActionSelectFreehand.png
diff --git a/images/themes/gis/mActionSelectPan.png b/images/themes/gis/mActionSelectPan.png
diff --git a/images/themes/gis/mActionSelectPolygon.png b/images/themes/gis/mActionSelectPolygon.png
diff --git a/images/themes/gis/mActionSelectPolygon.svg b/images/themes/gis/mActionSelectPolygon.svg
diff --git a/images/themes/gis/mActionSelectRadius.png b/images/themes/gis/mActionSelectRadius.png
diff --git a/images/themes/gis/mActionSelectRectangle.png b/images/themes/gis/mActionSelectRectangle.png
diff --git a/images/themes/gis/mActionSelectedToTop.png b/images/themes/gis/mActionSelectedToTop.png
diff --git a/images/themes/gis/mActionShowAllLayers.png b/images/themes/gis/mActionShowAllLayers.png
diff --git a/images/themes/gis/mActionShowBookmarks.png b/images/themes/gis/mActionShowBookmarks.png
diff --git a/images/themes/gis/mActionShowHideLabels.svg b/images/themes/gis/mActionShowHideLabels.svg
diff --git a/images/themes/gis/mActionShowPinnedLabels.svg b/images/themes/gis/mActionShowPinnedLabels.svg
diff --git a/images/themes/gis/mActionShowRasterCalculator.png b/images/themes/gis/mActionShowRasterCalculator.png
diff --git a/images/themes/gis/mActionSimplify.png b/images/themes/gis/mActionSimplify.png
diff --git a/images/themes/gis/mActionSplitFeatures.png b/images/themes/gis/mActionSplitFeatures.png
diff --git a/images/themes/gis/mActionSplitFeatures.svg b/images/themes/gis/mActionSplitFeatures.svg
diff --git a/images/themes/gis/mActionTextAnnotation.png b/images/themes/gis/mActionTextAnnotation.png
diff --git a/images/themes/gis/mActionToggleEditing.png b/images/themes/gis/mActionToggleEditing.png
diff --git a/images/themes/gis/mActionToggleEditing.svg b/images/themes/gis/mActionToggleEditing.svg
diff --git a/images/themes/gis/mActionTouch.png b/images/themes/gis/mActionTouch.png
diff --git a/images/themes/gis/mActionUndo.png b/images/themes/gis/mActionUndo.png
diff --git a/images/themes/gis/mActionUngroupItems.png b/images/themes/gis/mActionUngroupItems.png
diff --git a/images/themes/gis/mActionUnselectAttributes.png b/images/themes/gis/mActionUnselectAttributes.png
diff --git a/images/themes/gis/mActionZoomActual.png b/images/themes/gis/mActionZoomActual.png
diff --git a/images/themes/gis/mActionZoomFullExtent.png b/images/themes/gis/mActionZoomFullExtent.png
diff --git a/images/themes/gis/mActionZoomIn.png b/images/themes/gis/mActionZoomIn.png
diff --git a/images/themes/gis/mActionZoomLast.png b/images/themes/gis/mActionZoomLast.png
diff --git a/images/themes/gis/mActionZoomNext.png b/images/themes/gis/mActionZoomNext.png
diff --git a/images/themes/gis/mActionZoomOut.png b/images/themes/gis/mActionZoomOut.png
diff --git a/images/themes/gis/mActionZoomToLayer.png b/images/themes/gis/mActionZoomToLayer.png
diff --git a/images/themes/gis/mActionZoomToSelected.png b/images/themes/gis/mActionZoomToSelected.png
diff --git a/images/themes/gis/mIconClose.png b/images/themes/gis/mIconClose.png
diff --git a/images/themes/gis/mIconConnect.png b/images/themes/gis/mIconConnect.png
diff --git a/images/themes/gis/mIconDbSchema.png b/images/themes/gis/mIconDbSchema.png