diff --git a/images/themes/default/mActionDraw.svg b/images/themes/default/mActionDraw.svg
diff --git a/images/themes/default/mActionIdentify.png b/images/themes/default/mActionIdentify.png
diff --git a/images/themes/default/mActionZoomActual.png b/images/themes/default/mActionZoomActual.png
diff --git a/images/themes/default/mActionZoomActual.svg b/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/mActionZoomFullExtent.svg b/images/themes/default/mActionZoomFullExtent.svg
diff --git a/images/themes/default/mActionZoomIn.png b/images/themes/default/mActionZoomIn.png
diff --git a/images/themes/default/mActionZoomIn.svg b/images/themes/default/mActionZoomIn.svg
diff --git a/images/themes/default/mActionZoomLast.png b/images/themes/default/mActionZoomLast.png
diff --git a/images/themes/default/mActionZoomLast.svg b/images/themes/default/mActionZoomLast.svg
diff --git a/images/themes/default/mActionZoomNext.png b/images/themes/default/mActionZoomNext.png
diff --git a/images/themes/default/mActionZoomNext.svg b/images/themes/default/mActionZoomNext.svg
diff --git a/images/themes/default/mActionZoomOut.png b/images/themes/default/mActionZoomOut.png
diff --git a/images/themes/default/mActionZoomOut.svg b/images/themes/default/mActionZoomOut.svg
diff --git a/images/themes/default/mActionZoomToLayer.png b/images/themes/default/mActionZoomToLayer.png
diff --git a/images/themes/default/mActionZoomToLayer.svg b/images/themes/default/mActionZoomToLayer.svg
diff --git a/images/themes/default/mActionZoomToSelected.png b/images/themes/default/mActionZoomToSelected.png
diff --git a/images/themes/default/mActionZoomToSelected.svg b/images/themes/default/mActionZoomToSelected.svg
diff --git a/images/themes/default/mIconZoom.png b/images/themes/default/mIconZoom.png
diff --git a/images/themes/default/mIconZoom.svg b/images/themes/default/mIconZoom.svg
diff --git a/images/themes/default/propertyicons/action.svg b/images/themes/default/propertyicons/action.svg
diff --git a/images/themes/default/svgbase/action.svg b/images/themes/default/svgbase/action.svg
diff --git a/images/themes/default/svgbase/delete.svg b/images/themes/default/svgbase/delete.svg
diff --git a/images/themes/default/svgbase/deselect.svg b/images/themes/default/svgbase/deselect.svg
diff --git a/images/themes/default/svgbase/mouse-pointer.svg b/images/themes/default/svgbase/mouse-pointer.svg
diff --git a/images/themes/default/svgbase/qgismap.svg b/images/themes/default/svgbase/qgismap.svg
diff --git a/images/themes/default/svgbase/rgb_values.txt b/images/themes/default/svgbase/rgb_values.txt
@@ -0,0 +1,4 @@
+blue of action/metadata: 109 151 196 #6d97c4
+yellow of select actions: 252 233 79 or #fcd94f
+
+
diff --git a/images/themes/default/svgbase/worldmap.svg b/images/themes/default/svgbase/worldmap.svg
diff --git a/images/themes/default/zoomMaster.svg b/images/themes/default/zoomMaster.svg
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -395,10 +395,10 @@ void QgsComposer::setupTheme()
   mActionExportAsSVG->setIcon( QgsApplication::getThemeIcon( "/mActionSaveAsSVG.png" ) );
   mActionExportAsPDF->setIcon( QgsApplication::getThemeIcon( "/mActionSaveAsPDF.png" ) );
   mActionPrint->setIcon( QgsApplication::getThemeIcon( "/mActionFilePrint.png" ) );
-  mActionZoomAll->setIcon( QgsApplication::getThemeIcon( "/mActionZoomFullExtent.png" ) );
-  mActionZoomIn->setIcon( QgsApplication::getThemeIcon( "/mActionZoomIn.png" ) );
-  mActionZoomOut->setIcon( QgsApplication::getThemeIcon( "/mActionZoomOut.png" ) );
-  mActionRefreshView->setIcon( QgsApplication::getThemeIcon( "/mActionDraw.png" ) );
+  mActionZoomAll->setIcon( QgsApplication::getThemeIcon( "/mActionZoomFullExtent.svg" ) );
+  mActionZoomIn->setIcon( QgsApplication::getThemeIcon( "/mActionZoomIn.svg" ) );
+  mActionZoomOut->setIcon( QgsApplication::getThemeIcon( "/mActionZoomOut.svg" ) );
+  mActionRefreshView->setIcon( QgsApplication::getThemeIcon( "/mActionDraw.svg" ) );
   mActionUndo->setIcon( QgsApplication::getThemeIcon( "/mActionUndo.png" ) );
   mActionRedo->setIcon( QgsApplication::getThemeIcon( "/mActionRedo.png" ) );
   mActionAddImage->setIcon( QgsApplication::getThemeIcon( "/mActionAddImage.png" ) );

diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -838,7 +838,7 @@ void QgsLegend::handleRightClickEvent( QTreeWidgetItem* item, const QPoint& posi
     }
     else if ( li->type() == QgsLegendItem::LEGEND_GROUP )
     {
-      theMenu.addAction( QgsApplication::getThemeIcon( "/mActionZoomToLayer.png" ),
+      theMenu.addAction( QgsApplication::getThemeIcon( "/mActionZoomToLayer.svg" ),
                          tr( "Zoom to Group" ), this, SLOT( legendLayerZoom() ) );
 
       // use QGisApp::removeLayer() to remove all selected layers+groups

diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -338,7 +338,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
   QAction *allEditsAction = QgisApp::instance()->actionAllEdits();
 
   // zoom to layer extent
-  theMenu.addAction( QgsApplication::getThemeIcon( "/mActionZoomToLayer.png" ),
+  theMenu.addAction( QgsApplication::getThemeIcon( "/mActionZoomToLayer.svg" ),
                      tr( "&Zoom to Layer Extent" ), legend(), SLOT( legendLayerZoom() ) );
   if ( lyr->type() == QgsMapLayer::RasterLayer )
   {

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1728,7 +1728,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionQgisHomePage->setIcon( QgsApplication::getThemeIcon( "/mActionQgisHomePage.png" ) );
   mActionAbout->setIcon( QgsApplication::getThemeIcon( "/mActionHelpAbout.png" ) );
   mActionSponsors->setIcon( QgsApplication::getThemeIcon( "/mActionHelpSponsors.png" ) );
-  mActionDraw->setIcon( QgsApplication::getThemeIcon( "/mActionDraw.png" ) );
+  mActionDraw->setIcon( QgsApplication::getThemeIcon( "/mActionDraw.svg" ) );
   mActionToggleEditing->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ) );
   mActionSaveLayerEdits->setIcon( QgsApplication::getThemeIcon( "/mActionSaveAllEdits.svg" ) );
   mActionAllEdits->setIcon( QgsApplication::getThemeIcon( "/mActionAllEdits.svg" ) );
@@ -1759,20 +1759,20 @@ void QgisApp::setTheme( QString theThemeName )
   mActionOffsetCurve->setIcon( QgsApplication::getThemeIcon( "/mActionOffsetCurve.png" ) );
   mActionMergeFeatureAttributes->setIcon( QgsApplication::getThemeIcon( "/mActionMergeFeatureAttributes.png" ) );
   mActionRotatePointSymbols->setIcon( QgsApplication::getThemeIcon( "mActionRotatePointSymbols.png" ) );
-  mActionZoomIn->setIcon( QgsApplication::getThemeIcon( "/mActionZoomIn.png" ) );
-  mActionZoomOut->setIcon( QgsApplication::getThemeIcon( "/mActionZoomOut.png" ) );
-  mActionZoomFullExtent->setIcon( QgsApplication::getThemeIcon( "/mActionZoomFullExtent.png" ) );
-  mActionZoomToSelected->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToSelected.png" ) );
+  mActionZoomIn->setIcon( QgsApplication::getThemeIcon( "/mActionZoomIn.svg" ) );
+  mActionZoomOut->setIcon( QgsApplication::getThemeIcon( "/mActionZoomOut.svg" ) );
+  mActionZoomFullExtent->setIcon( QgsApplication::getThemeIcon( "/mActionZoomFullExtent.svg" ) );
+  mActionZoomToSelected->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToSelected.svg" ) );
   mActionShowRasterCalculator->setIcon( QgsApplication::getThemeIcon( "/mActionShowRasterCalculator.png" ) );
 #ifdef HAVE_TOUCH
   mActionTouch->setIcon( QgsApplication::getThemeIcon( "/mActionTouch.png" ) );
 #endif
   mActionPan->setIcon( QgsApplication::getThemeIcon( "/mActionPan.png" ) );
   mActionPanToSelected->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.svg" ) );
-  mActionZoomLast->setIcon( QgsApplication::getThemeIcon( "/mActionZoomLast.png" ) );
-  mActionZoomNext->setIcon( QgsApplication::getThemeIcon( "/mActionZoomNext.png" ) );
-  mActionZoomToLayer->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToLayer.png" ) );
-  mActionZoomActualSize->setIcon( QgsApplication::getThemeIcon( "/mActionZoomActual.png" ) );
+  mActionZoomLast->setIcon( QgsApplication::getThemeIcon( "/mActionZoomLast.svg" ) );
+  mActionZoomNext->setIcon( QgsApplication::getThemeIcon( "/mActionZoomNext.svg" ) );
+  mActionZoomToLayer->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToLayer.svg" ) );
+  mActionZoomActualSize->setIcon( QgsApplication::getThemeIcon( "/mActionZoomActual.svg" ) );
   mActionIdentify->setIcon( QgsApplication::getThemeIcon( "/mActionIdentify.svg" ) );
   mActionFeatureAction->setIcon( QgsApplication::getThemeIcon( "/mAction.svg" ) );
   mActionSelect->setIcon( QgsApplication::getThemeIcon( "/mActionSelect.svg" ) );

diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -135,7 +135,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   mRemoveSelectionButton->setIcon( QgsApplication::getThemeIcon( "/mActionUnselectAttributes.png" ) );
   mSelectedToTopButton->setIcon( QgsApplication::getThemeIcon( "/mActionSelectedToTop.png" ) );
   mCopySelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionCopySelected.png" ) );
-  mZoomMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToSelected.png" ) );
+  mZoomMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToSelected.svg" ) );
   mPanMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.png" ) );
   mInvertSelectionButton->setIcon( QgsApplication::getThemeIcon( "/mActionInvertSelection.png" ) );
   mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ) );

diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -81,8 +81,8 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
   // and connecting QDialogButtonBox's accepted/rejected signals to dialog's accept/reject slots
   initOptionsBase( false );
 
-  mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.png" ) );
-  mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.png" ) );
+  mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.svg" ) );
+  mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.svg" ) );
 
   connect( this, SIGNAL( accepted() ), this, SLOT( apply() ) );
   connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -81,8 +81,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   // and connecting QDialogButtonBox's accepted/rejected signals to dialog's accept/reject slots
   initOptionsBase( false );
 
-  mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.png" ) );
-  mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.png" ) );
+  mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.svg" ) );
+  mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.svg" ) );
 
   connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );
   connect( this, SIGNAL( accepted() ), this, SLOT( apply() ) );

diff --git a/src/browser/qgsbrowserbase.ui b/src/browser/qgsbrowserbase.ui
@@ -199,7 +199,7 @@
   <action name="mActionRefresh">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionDraw.png</normaloff>:/images/themes/default/mActionDraw.png</iconset>
+     <normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
    </property>
    <property name="text">
     <string>Refresh</string>

diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp
@@ -550,7 +550,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
   disconnect( mRasterLayer, SIGNAL( progressUpdate( int ) ), mHistogramProgress, SLOT( setValue( int ) ) );
   stackedWidget2->setCurrentIndex( 0 );
   // icon from http://findicons.com/icon/169577/14_zoom?id=171427
-  mpPlot->canvas()->setCursor( QCursor( QgsApplication::getThemePixmap( "/mIconZoom.png" ) ) );
+  mpPlot->canvas()->setCursor( QCursor( QgsApplication::getThemePixmap( "/mIconZoom.svg" ) ) );
   //  on_cboHistoBand_currentIndexChanged( -1 );
   QApplication::restoreOverrideCursor();
 }

diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
@@ -181,12 +181,12 @@ bool eVisGenericEventBrowserGui::initBrowser( )
   chkboxUseOnlyFilename->setChecked( false );
 
   QString myThemePath = QgsApplication::activeThemePath( );
-  pbtnResetEventImagePathData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.png" ) ) );
-  pbtnResetCompassBearingData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.png" ) ) );
-  pbtnResetCompassOffsetData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.png" ) ) );
-  pbtnResetBasePathData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.png" ) ) );
-  pbtnResetUseOnlyFilenameData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.png" ) ) );
-  pbtnResetApplyPathRulesToDocs->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.png" ) ) );
+  pbtnResetEventImagePathData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
+  pbtnResetCompassBearingData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
+  pbtnResetCompassOffsetData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
+  pbtnResetBasePathData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
+  pbtnResetUseOnlyFilenameData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
+  pbtnResetApplyPathRulesToDocs->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
 
   chkboxSaveEventImagePathData->setChecked( false );
   chkboxSaveCompassBearingData->setChecked( false );

diff --git a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
@@ -53,9 +53,9 @@ eVisImageDisplayWidget::eVisImageDisplayWidget( QWidget* parent, Qt::WFlags fl )
   pbtnZoomOut->setWhatsThis( tr( "Zoom out to see more area." ) );
   pbtnZoomFull->setToolTip( tr( "Zoom to full extent" ) );
   pbtnZoomFull->setWhatsThis( tr( "Zoom to display the entire image." ) );
-  pbtnZoomIn->setIcon( QIcon( QPixmap( myThemePath + "/mActionZoomIn.png" ) ) );
-  pbtnZoomOut->setIcon( QIcon( QPixmap( myThemePath + "/mActionZoomOut.png" ) ) );
-  pbtnZoomFull->setIcon( QIcon( QPixmap( myThemePath + "/mActionZoomFullExtent.png" ) ) );
+  pbtnZoomIn->setIcon( QIcon( QPixmap( myThemePath + "/mActionZoomIn.svg" ) ) );
+  pbtnZoomOut->setIcon( QIcon( QPixmap( myThemePath + "/mActionZoomOut.svg" ) ) );
+  pbtnZoomFull->setIcon( QIcon( QPixmap( myThemePath + "/mActionZoomFullExtent.svg" ) ) );
   connect( pbtnZoomIn, SIGNAL( clicked( ) ), this, SLOT( on_pbtnZoomIn_clicked( ) ) );
   connect( pbtnZoomOut, SIGNAL( clicked( ) ), this, SLOT( on_pbtnZoomOut_clicked( ) ) );
   connect( pbtnZoomFull, SIGNAL( clicked( ) ), this, SLOT( on_pbtnZoomFull_clicked( ) ) );

diff --git a/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui b/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
@@ -277,7 +277,7 @@
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.svg</normaloff>../../../images/themes/default/mActionDraw.svg</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -399,7 +399,7 @@
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.svg</normaloff>../../../images/themes/default/mActionDraw.svg</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -568,7 +568,7 @@
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.svg</normaloff>../../../images/themes/default/mActionDraw.svg</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -665,7 +665,7 @@
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.svg</normaloff>../../../images/themes/default/mActionDraw.svg</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -730,7 +730,7 @@ Base Path (i.e. keep only filename from attribute)</string>
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.svg</normaloff>../../../images/themes/default/mActionDraw.svg</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -794,7 +794,7 @@ Base Path (i.e. keep only filename from attribute)</string>
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../images/themes/default/mActionDraw.png</normaloff>../../../images/themes/default/mActionDraw.png</iconset>
+              <normaloff>../../../images/themes/default/mActionDraw.svg</normaloff>../../../images/themes/default/mActionDraw.svg</iconset>
             </property>
             <property name="iconSize">
              <size>

diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -832,19 +832,19 @@ void QgsGeorefPluginGui::createActions()
   mActionPan->setIcon( getThemeIcon( "/mActionPan.png" ) );
   connect( mActionPan, SIGNAL( triggered() ), this, SLOT( setPanTool() ) );
 
-  mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.png" ) );
+  mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.svg" ) );
   connect( mActionZoomIn, SIGNAL( triggered() ), this, SLOT( setZoomInTool() ) );
 
-  mActionZoomOut->setIcon( getThemeIcon( "/mActionZoomOut.png" ) );
+  mActionZoomOut->setIcon( getThemeIcon( "/mActionZoomOut.svg" ) );
   connect( mActionZoomOut, SIGNAL( triggered() ), this, SLOT( setZoomOutTool() ) );
 
-  mActionZoomToLayer->setIcon( getThemeIcon( "/mActionZoomToLayer.png" ) );
+  mActionZoomToLayer->setIcon( getThemeIcon( "/mActionZoomToLayer.svg" ) );
   connect( mActionZoomToLayer, SIGNAL( triggered() ), this, SLOT( zoomToLayerTool() ) );
 
-  mActionZoomLast->setIcon( getThemeIcon( "/mActionZoomLast.png" ) );
+  mActionZoomLast->setIcon( getThemeIcon( "/mActionZoomLast.svg" ) );
   connect( mActionZoomLast, SIGNAL( triggered() ), this, SLOT( zoomToLast() ) );
 
-  mActionZoomNext->setIcon( getThemeIcon( "/mActionZoomNext.png" ) );
+  mActionZoomNext->setIcon( getThemeIcon( "/mActionZoomNext.svg" ) );
   connect( mActionZoomNext, SIGNAL( triggered() ), this, SLOT( zoomToNext() ) );
 
   mActionLinkGeorefToQGis->setIcon( getThemeIcon( "/mActionLinkGeorefToQGis.png" ) );
@@ -1090,11 +1090,11 @@ void QgsGeorefPluginGui::updateIconTheme( QString theme )
 
   // View actions
   mActionPan->setIcon( getThemeIcon( "/mActionPan.png" ) );
-  mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.png" ) );
-  mActionZoomOut->setIcon( getThemeIcon( "/mActionZoomOut.png" ) );
-  mActionZoomToLayer->setIcon( getThemeIcon( "/mActionZoomToLayer.png" ) );
-  mActionZoomLast->setIcon( getThemeIcon( "/mActionZoomLast.png" ) );
-  mActionZoomNext->setIcon( getThemeIcon( "/mActionZoomNext.png" ) );
+  mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.svg" ) );
+  mActionZoomOut->setIcon( getThemeIcon( "/mActionZoomOut.svg" ) );
+  mActionZoomToLayer->setIcon( getThemeIcon( "/mActionZoomToLayer.svg" ) );
+  mActionZoomLast->setIcon( getThemeIcon( "/mActionZoomLast.svg" ) );
+  mActionZoomNext->setIcon( getThemeIcon( "/mActionZoomNext.svg" ) );
   mActionLinkGeorefToQGis->setIcon( getThemeIcon( "/mActionLinkGeorefToQGis.png" ) );
   mActionLinkQGisToGeoref->setIcon( getThemeIcon( "/mActionLinkQGisToGeoref.png" ) );
 

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -810,7 +810,7 @@
    </property>
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionZoomIn.png</normaloff>:/images/themes/default/mActionZoomIn.png</iconset>
+     <normaloff>:/images/themes/default/mActionZoomIn.svg</normaloff>:/images/themes/default/mActionZoomIn.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom In</string>
@@ -825,7 +825,7 @@
    </property>
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionZoomOut.png</normaloff>:/images/themes/default/mActionZoomOut.png</iconset>
+     <normaloff>:/images/themes/default/mActionZoomOut.svg</normaloff>:/images/themes/default/mActionZoomOut.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom Out</string>
@@ -963,7 +963,7 @@
   <action name="mActionZoomFullExtent">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionZoomFullExtent.png</normaloff>:/images/themes/default/mActionZoomFullExtent.png</iconset>
+     <normaloff>:/images/themes/default/mActionZoomFullExtent.svg</normaloff>:/images/themes/default/mActionZoomFullExtent.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom Full</string>
@@ -975,7 +975,7 @@
   <action name="mActionZoomToLayer">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionZoomToLayer.png</normaloff>:/images/themes/default/mActionZoomToLayer.png</iconset>
+     <normaloff>:/images/themes/default/mActionZoomToLayer.svg</normaloff>:/images/themes/default/mActionZoomToLayer.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom to Layer</string>
@@ -984,7 +984,7 @@
   <action name="mActionZoomToSelected">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionZoomToSelected.png</normaloff>:/images/themes/default/mActionZoomToSelected.png</iconset>
+     <normaloff>:/images/themes/default/mActionZoomToSelected.svg</normaloff>:/images/themes/default/mActionZoomToSelected.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom to Selection</string>
@@ -996,7 +996,7 @@
   <action name="mActionZoomLast">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionZoomLast.png</normaloff>:/images/themes/default/mActionZoomLast.png</iconset>
+     <normaloff>:/images/themes/default/mActionZoomLast.svg</normaloff>:/images/themes/default/mActionZoomLast.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom Last</string>
@@ -1005,7 +1005,7 @@
   <action name="mActionZoomNext">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionZoomNext.png</normaloff>:/images/themes/default/mActionZoomNext.png</iconset>
+     <normaloff>:/images/themes/default/mActionZoomNext.svg</normaloff>:/images/themes/default/mActionZoomNext.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom Next</string>
@@ -1014,7 +1014,7 @@
   <action name="mActionZoomActualSize">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionZoomActual.png</normaloff>:/images/themes/default/mActionZoomActual.png</iconset>
+     <normaloff>:/images/themes/default/mActionZoomActual.svg</normaloff>:/images/themes/default/mActionZoomActual.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom Actual Size</string>
@@ -1065,7 +1065,7 @@
   <action name="mActionDraw">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionDraw.png</normaloff>:/images/themes/default/mActionDraw.png</iconset>
+     <normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
    </property>
    <property name="text">
     <string>Refresh</string>

diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -270,7 +270,7 @@
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>../../images/themes/default/mActionZoomToSelected.png</normaloff>../../images/themes/default/mActionZoomToSelected.png</iconset>
+         <normaloff>../../images/themes/default/mActionZoomToSelected.svg</normaloff>../../images/themes/default/mActionZoomToSelected.svg</iconset>
        </property>
        <property name="iconSize">
         <size>

diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -138,7 +138,7 @@
   <action name="mActionZoomAll">
    <property name="icon">
     <iconset>
-     <normaloff>../themes/default/mActionZoomFullExtent.png</normaloff>../themes/default/mActionZoomFullExtent.png</iconset>
+     <normaloff>../themes/default/mActionZoomFullExtent.svg</normaloff>../themes/default/mActionZoomFullExtent.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom Full</string>
@@ -150,7 +150,7 @@
   <action name="mActionZoomIn">
    <property name="icon">
     <iconset>
-     <normaloff>../themes/default/mActionZoomIn.png</normaloff>../themes/default/mActionZoomIn.png</iconset>
+     <normaloff>../themes/default/mActionZoomIn.svg</normaloff>../themes/default/mActionZoomIn.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom In</string>
@@ -162,7 +162,7 @@
   <action name="mActionZoomOut">
    <property name="icon">
     <iconset>
-     <normaloff>../themes/default/mActionZoomOut.png</normaloff>../themes/default/mActionZoomOut.png</iconset>
+     <normaloff>../themes/default/mActionZoomOut.svg</normaloff>../themes/default/mActionZoomOut.svg</iconset>
    </property>
    <property name="text">
     <string>Zoom Out</string>
@@ -264,7 +264,7 @@
   <action name="mActionRefreshView">
    <property name="icon">
     <iconset>
-     <normaloff>../themes/default/mActionDraw.png</normaloff>../themes/default/mActionDraw.png</iconset>
+     <normaloff>../themes/default/mActionDraw.svg</normaloff>../themes/default/mActionDraw.svg</iconset>
    </property>
    <property name="text">
     <string>Refresh</string>

diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui
@@ -472,7 +472,7 @@
                      <string/>
                     </property>
                     <property name="pixmap">
-                     <pixmap resource="../../images/images.qrc">:/images/themes/default/mActionZoomIn.png</pixmap>
+                     <pixmap resource="../../images/images.qrc">:/images/themes/default/mActionZoomIn.svg</pixmap>
                     </property>
                     <property name="scaledContents">
                      <bool>true</bool>
@@ -503,7 +503,7 @@
                      <string/>
                     </property>
                     <property name="pixmap">
-                     <pixmap resource="../../images/images.qrc">:/images/themes/default/mActionZoomOut.png</pixmap>
+                     <pixmap resource="../../images/images.qrc">:/images/themes/default/mActionZoomOut.svg</pixmap>
                     </property>
                     <property name="scaledContents">
                      <bool>true</bool>

diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
@@ -94,7 +94,7 @@
          </property>
          <property name="icon">
           <iconset resource="../../images/images.qrc">
-           <normaloff>:/images/themes/default/mActionDraw.png</normaloff>:/images/themes/default/mActionDraw.png</iconset>
+           <normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
          </property>
         </widget>
        </item>

diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -558,7 +558,7 @@
                      <string/>
                     </property>
                     <property name="pixmap">
-                     <pixmap resource="../../images/images.qrc">:/images/themes/default/mActionZoomIn.png</pixmap>
+                     <pixmap resource="../../images/images.qrc">:/images/themes/default/mActionZoomIn.svg</pixmap>
                     </property>
                     <property name="scaledContents">
                      <bool>true</bool>
@@ -589,7 +589,7 @@
                      <string/>
                     </property>
                     <property name="pixmap">
-                     <pixmap resource="../../images/images.qrc">:/images/themes/default/mActionZoomOut.png</pixmap>
+                     <pixmap resource="../../images/images.qrc">:/images/themes/default/mActionZoomOut.svg</pixmap>
                     </property>
                     <property name="scaledContents">
                      <bool>true</bool>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		blue of action/metadata: 109 151 196 #6d97c4
		yellow of select actions: 252 233 79 or #fcd94f