diff --git a/images/themes/default/mActionOptions.svg b/images/themes/default/mActionOptions.svg
diff --git a/images/themes/default/mIconProperties.png b/images/themes/default/mIconProperties.png
diff --git a/images/themes/default/mIconProperties.svg b/images/themes/default/mIconProperties.svg
diff --git a/images/themes/default/propertyicons/general.png b/images/themes/default/propertyicons/general.png
diff --git a/images/themes/default/propertyicons/general.svg b/images/themes/default/propertyicons/general.svg
diff --git a/images/themes/default/propertyicons/system.svg b/images/themes/default/propertyicons/system.svg
diff --git a/images/themes/default/svgbase/action.svg b/images/themes/default/svgbase/action.svg
diff --git a/images/themes/default/svgbase/hammer.svg b/images/themes/default/svgbase/hammer.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/screwdriver.svg b/images/themes/default/svgbase/screwdriver.svg
diff --git a/images/themes/default/svgbase/wrench.svg b/images/themes/default/svgbase/wrench.svg
diff --git a/src/app/legend/qgslegendpropertygroup.cpp b/src/app/legend/qgslegendpropertygroup.cpp
@@ -22,7 +22,7 @@ QgsLegendPropertyGroup::QgsLegendPropertyGroup( QTreeWidgetItem* theLegendItem,
     : QgsLegendItem( theLegendItem, theString )
 {
   mType = LEGEND_PROPERTY_GROUP;
-  QIcon myIcon = QgsApplication::getThemeIcon( "/mIconProperties.png" );
+  QIcon myIcon = QgsApplication::getThemeIcon( "/mIconProperties.svg" );
   setText( 0, theString );
   setIcon( 0, myIcon );
 }

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1692,9 +1692,9 @@ void QgisApp::setTheme( QString theThemeName )
   mActionManagePlugins->setIcon( QgsApplication::getThemeIcon( "/mActionShowPluginManager.png" ) );
   mActionShowPythonDialog->setIcon( QgsApplication::getThemeIcon( "console/iconRunConsole.png" ) );
   mActionCheckQgisVersion->setIcon( QgsApplication::getThemeIcon( "/mActionCheckQgisVersion.png" ) );
-  mActionOptions->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.png" ) );
-  mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.png" ) );
-  mActionCustomization->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.png" ) );
+  mActionOptions->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.svg" ) );
+  mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.svg" ) );
+  mActionCustomization->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.svg" ) );
   mActionHelpContents->setIcon( QgsApplication::getThemeIcon( "/mActionHelpContents.png" ) );
   mActionLocalHistogramStretch->setIcon( QgsApplication::getThemeIcon( "/mActionLocalHistogramStretch.png" ) );
   mActionFullHistogramStretch->setIcon( QgsApplication::getThemeIcon( "/mActionFullHistogramStretch.png" ) );

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -1407,7 +1407,7 @@
   <action name="mActionOptions">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionOptions.png</normaloff>:/images/themes/default/mActionOptions.png</iconset>
+     <normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
    </property>
    <property name="text">
     <string>Options...</string>
@@ -1428,7 +1428,7 @@
   <action name="mActionConfigureShortcuts">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionOptions.png</normaloff>:/images/themes/default/mActionOptions.png</iconset>
+     <normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
    </property>
    <property name="text">
     <string>Configure shortcuts...</string>
@@ -1597,7 +1597,7 @@ Ctl (Cmd) increments by 15 deg.</string>
   <action name="mActionCustomization">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionOptions.png</normaloff>:/images/themes/default/mActionOptions.png</iconset>
+     <normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
    </property>
    <property name="text">
     <string>Customization...</string>

diff --git a/src/ui/qgsbrowserdockwidgetbase.ui b/src/ui/qgsbrowserdockwidgetbase.ui
@@ -195,7 +195,7 @@
             </property>
             <property name="icon">
              <iconset resource="../../images/images.qrc">
-              <normaloff>:/images/themes/default/mActionOptions.png</normaloff>:/images/themes/default/mActionOptions.png</iconset>
+              <normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
             </property>
             <property name="popupMode">
              <enum>QToolButton::InstantPopup</enum>

diff --git a/src/ui/qgsgpsinformationwidgetbase.ui b/src/ui/qgsgpsinformationwidgetbase.ui
@@ -195,7 +195,7 @@ gray = no data
        </property>
        <property name="icon">
         <iconset resource="../../images/images.qrc">
-         <normaloff>:/images/themes/default/mActionOptions.png</normaloff>:/images/themes/default/mActionOptions.png</iconset>
+         <normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
        </property>
       </widget>
      </item>

diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -89,7 +89,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../images/images.qrc">
-            <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
+            <normaloff>:/images/themes/default/propertyicons/general.svg</normaloff>:/images/themes/default/propertyicons/general.svg</iconset>
           </property>
          </item>
          <item>
@@ -101,7 +101,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../images/images.qrc">
-            <normaloff>:/images/themes/default/propertyicons/action.svg</normaloff>:/images/themes/default/propertyicons/action.svg</iconset>
+            <normaloff>:/images/themes/default/propertyicons/system.svg</normaloff>:/images/themes/default/propertyicons/system.svg</iconset>
           </property>
          </item>
          <item>

diff --git a/src/ui/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui
@@ -89,7 +89,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../images/images.qrc">
-            <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
+            <normaloff>:/images/themes/default/propertyicons/general.svg</normaloff>:/images/themes/default/propertyicons/general.svg</iconset>
           </property>
          </item>
          <item>

diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui
@@ -89,7 +89,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../images/images.qrc">
-            <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
+            <normaloff>:/images/themes/default/propertyicons/general.svg</normaloff>:/images/themes/default/propertyicons/general.svg</iconset>
           </property>
          </item>
          <item>

diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -93,7 +93,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../images/images.qrc">
-            <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
+            <normaloff>:/images/themes/default/propertyicons/general.svg</normaloff>:/images/themes/default/propertyicons/general.svg</iconset>
           </property>
          </item>
          <item>