diff --git a/images/themes/default/mActionShowPluginManager.svg b/images/themes/default/mActionShowPluginManager.svg
diff --git a/...es/themes/default/plugins/north_arrow.png → images/themes/default/north_arrow.png b/...es/themes/default/plugins/north_arrow.png → images/themes/default/north_arrow.png
diff --git a/images/themes/default/plugins/CMakeLists.txt b/images/themes/default/plugins/CMakeLists.txt
diff --git a/images/themes/default/plugins/coordinate_capture/CMakeLists.txt b/images/themes/default/plugins/coordinate_capture/CMakeLists.txt
diff --git a/images/themes/default/plugins/coordinate_capture/coordinate_capture.png b/images/themes/default/plugins/coordinate_capture/coordinate_capture.png
diff --git a/images/themes/default/plugins/dxf2shp_converter.png b/images/themes/default/plugins/dxf2shp_converter.png
diff --git a/images/themes/default/plugins/gps_importer.png b/images/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
diff --git a/images/themes/default/plugins/interpolation.png b/images/themes/default/plugins/interpolation.png
diff --git a/images/themes/default/plugins/mGeorefRun.png b/images/themes/default/plugins/mGeorefRun.png
diff --git a/images/themes/default/plugins/mapserver_export.png b/images/themes/default/plugins/mapserver_export.png
diff --git a/images/themes/default/plugins/ogr_converter.png b/images/themes/default/plugins/ogr_converter.png
diff --git a/images/themes/default/plugins/quick_print.png b/images/themes/default/plugins/quick_print.png
diff --git a/images/themes/default/plugins/spit.png b/images/themes/default/plugins/spit.png
diff --git a/images/themes/default/plugins/scale_bar.png → images/themes/default/scale_bar.png b/images/themes/default/plugins/scale_bar.png → images/themes/default/scale_bar.png
diff --git a/images/themes_old/default/plugins/coordinate_capture/coordinate_capture.png b/images/themes_old/default/plugins/coordinate_capture/coordinate_capture.png
diff --git a/...coordinate_capture/coordinate_capture.svg → ...coordinate_capture/coordinate_capture.svg b/...coordinate_capture/coordinate_capture.svg → ...coordinate_capture/coordinate_capture.svg
diff --git a/images/themes_old/default/plugins/dxf2shp_converter.png b/images/themes_old/default/plugins/dxf2shp_converter.png
diff --git a/images/themes_old/default/plugins/spit.png b/images/themes_old/default/plugins/spit.png
diff --git a/python/plugins/mapserver_export/mapserver_export.png b/python/plugins/mapserver_export/mapserver_export.png
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1689,7 +1689,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionRemoveAllFromOverview->setIcon( QgsApplication::getThemeIcon( "/mActionRemoveAllFromOverview.png" ) );
   mActionToggleFullScreen->setIcon( QgsApplication::getThemeIcon( "/mActionToggleFullScreen.png" ) );
   mActionProjectProperties->setIcon( QgsApplication::getThemeIcon( "/mActionProjectProperties.png" ) );
-  mActionManagePlugins->setIcon( QgsApplication::getThemeIcon( "/mActionShowPluginManager.png" ) );
+  mActionManagePlugins->setIcon( QgsApplication::getThemeIcon( "/mActionShowPluginManager.svg" ) );
   mActionShowPythonDialog->setIcon( QgsApplication::getThemeIcon( "console/iconRunConsole.png" ) );
   mActionCheckQgisVersion->setIcon( QgsApplication::getThemeIcon( "/mActionCheckQgisVersion.png" ) );
   mActionOptions->setIcon( QgsApplication::getThemeIcon( "/mActionOptions.svg" ) );
@@ -1784,9 +1784,9 @@ void QgisApp::setTheme( QString theThemeName )
   mActionMoveLabel->setIcon( QgsApplication::getThemeIcon( "/mActionMoveLabel.png" ) );
   mActionRotateLabel->setIcon( QgsApplication::getThemeIcon( "/mActionRotateLabel.svg" ) );
   mActionChangeLabelProperties->setIcon( QgsApplication::getThemeIcon( "/mActionChangeLabelProperties.png" ) );
-  mActionDecorationCopyright->setIcon( QgsApplication::getThemeIcon( "/plugins/copyright_label.png" ) );
-  mActionDecorationNorthArrow->setIcon( QgsApplication::getThemeIcon( "/plugins/north_arrow.png" ) );
-  mActionDecorationScaleBar->setIcon( QgsApplication::getThemeIcon( "/plugins/scale_bar.png" ) );
+  mActionDecorationCopyright->setIcon( QgsApplication::getThemeIcon( "/copyright_label.png" ) );
+  mActionDecorationNorthArrow->setIcon( QgsApplication::getThemeIcon( "/north_arrow.png" ) );
+  mActionDecorationScaleBar->setIcon( QgsApplication::getThemeIcon( "/scale_bar.png" ) );
   mActionDecorationGrid->setIcon( QgsApplication::getThemeIcon( "/transformed.png" ) );
 
   //change themes of all composers

diff --git a/src/plugins/coordinate_capture/coordinate_capture.png b/src/plugins/coordinate_capture/coordinate_capture.png
diff --git a/src/plugins/dxf2shp_converter/dxf2shp_converter.png b/src/plugins/dxf2shp_converter/dxf2shp_converter.png
diff --git a/src/plugins/evis/evis.cpp b/src/plugins/evis/evis.cpp
@@ -84,6 +84,8 @@ static const QString sDescription = QObject::tr( "An event visualization tool -
 static const QString sCategory = QObject::tr( "Database" );
 static const QString sPluginVersion = QObject::tr( "Version 1.1.0" );
 static const QgisPlugin::PLUGINTYPE sPluginType = QgisPlugin::UI;
+static const QString sIcon = ":/evis/eVisEventBrowser.png";
+
 
 
 eVis::eVis( QgisInterface * theQgisInterface ):
@@ -239,6 +241,12 @@ QGISEXTERN int type( )
   return sPluginType;
 }
 
+// Return the icon
+QGISEXTERN QString icon()
+{
+  return sIcon;
+}
+
 // Return the version number for the plugin
 QGISEXTERN QString version( )
 {

diff --git a/src/plugins/georeferencer/icons/default/mGeorefRun.png b/src/plugins/georeferencer/icons/default/mGeorefRun.png
diff --git a/src/plugins/georeferencer/icons_old/default/mGeorefRun.png b/src/plugins/georeferencer/icons_old/default/mGeorefRun.png
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -71,6 +71,7 @@ static const QString sDescription = QObject::tr( "Overlay data on a 3D globe" );
 static const QString sCategory = QObject::tr( "Plugins" );
 static const QString sPluginVersion = QObject::tr( "Version 0.1" );
 static const QgisPlugin::PLUGINTYPE sPluginType = QgisPlugin::UI;
+static const QString sIcon = ":/globe/globe.png";
 static const QString sExperimental = QString( "true" );
 
 
@@ -1198,6 +1199,12 @@ QGISEXTERN QString version()
   return sPluginVersion;
 }
 
+// Return the icon
+QGISEXTERN QString icon()
+{
+  return sIcon;
+}
+
 // Return the experimental status for the plugin
 QGISEXTERN QString experimental()
 {

diff --git a/...fault/plugins/gps_importer/create_gpx.png → src/plugins/gps_importer/create_gpx.png b/...fault/plugins/gps_importer/create_gpx.png → src/plugins/gps_importer/create_gpx.png
diff --git a/src/plugins/gps_importer/gps_importer.png b/src/plugins/gps_importer/gps_importer.png
diff --git a/...fault/plugins/gps_importer/import_gpx.png → src/plugins/gps_importer/import_gpx.png b/...fault/plugins/gps_importer/import_gpx.png → src/plugins/gps_importer/import_gpx.png
diff --git a/src/plugins/gps_importer/qgsgps_plugin.qrc b/src/plugins/gps_importer/qgsgps_plugin.qrc
@@ -1,5 +1,7 @@
 <RCC>
     <qresource prefix="/" >
         <file>gps_importer.png</file>
+        <file>create_gpx.png</file>
+        <file>import_gpx.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp
@@ -663,22 +663,22 @@ void QgsGPSPlugin::setCurrentTheme( QString theThemeName )
 {
   Q_UNUSED( theThemeName );
   QString myCurThemePath = QgsApplication::activeThemePath() + "/plugins/gps_importer/";
-  QString myDefThemePath = QgsApplication::defaultThemePath() + "/plugins/gps_importer.png";
-  QString myQrcPath = ":/gps_importer.png";
+  QString myDefThemePath = QgsApplication::defaultThemePath() + "/plugins/gps_importer/";
+  QString myQrcPath = ":/";
   if ( QFile::exists( myCurThemePath ) )
   {
     mQActionPointer->setIcon( QIcon( myCurThemePath + "import_gpx.png" ) );
     mCreateGPXAction->setIcon( QIcon( myCurThemePath + "create_gpx.png" ) );
   }
   else if ( QFile::exists( myDefThemePath ) )
   {
-    mQActionPointer->setIcon( QIcon( myDefThemePath ) );
-    mCreateGPXAction->setIcon( QIcon( myDefThemePath ) );
+    mQActionPointer->setIcon( QIcon( myDefThemePath + "import_gpx.png" ) );
+    mCreateGPXAction->setIcon( QIcon( myDefThemePath + "create_gpx.png" ) );
   }
   else if ( QFile::exists( myQrcPath ) )
   {
-    mQActionPointer->setIcon( QIcon( myQrcPath ) );
-    mCreateGPXAction->setIcon( QIcon( myQrcPath ) );
+    mQActionPointer->setIcon( QIcon( myQrcPath + "import_gpx.png" ) );
+    mCreateGPXAction->setIcon( QIcon( myQrcPath + "create_gpx.png" ) );
   }
   else
   {

diff --git a/src/plugins/spit/spit.png b/src/plugins/spit/spit.png
diff --git a/src/plugins/spit/spit.qrc b/src/plugins/spit/spit.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/" >
         <file>spit.png</file>
-        <file>spit_icon.png</file>
-        <file>spit_image.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/spit/spit_icon.png b/src/plugins/spit/spit_icon.png
diff --git a/src/plugins/spit/spit_image.png b/src/plugins/spit/spit_image.png
diff --git a/src/plugins/sqlanywhere/sqlanywhere.cpp b/src/plugins/sqlanywhere/sqlanywhere.cpp
@@ -50,6 +50,7 @@ static const QString sDescription = QObject::tr( "Store vector layers within a S
 static const QString sCategory = QObject::tr( "Layers" );
 static const QString sPluginVersion = QObject::tr( "Version 0.1" );
 static const QgisPlugin::PLUGINTYPE sPluginType = QgisPlugin::UI;
+static const QString sIcon = ":/sqlanywhere/sqlanywhere.png";
 
 
 /**
@@ -250,6 +251,12 @@ QGISEXTERN QString version()
   return sPluginVersion;
 }
 
+// Return the icon
+QGISEXTERN QString icon()
+{
+  return sIcon;
+}
+
 // Delete ourself
 QGISEXTERN void unload( QgisPlugin * thePluginPointer )
 {

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -1378,7 +1378,7 @@
   <action name="mActionManagePlugins">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionShowPluginManager.png</normaloff>:/images/themes/default/mActionShowPluginManager.png</iconset>
+     <normaloff>:/images/themes/default/mActionShowPluginManager.svg</normaloff>:/images/themes/default/mActionShowPluginManager.svg</iconset>
    </property>
    <property name="text">
     <string>Manage and Install Plugins...</string>
@@ -1625,7 +1625,7 @@ Ctl (Cmd) increments by 15 deg.</string>
   <action name="mActionDecorationCopyright">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/plugins/copyright_label.png</normaloff>:/images/themes/default/plugins/copyright_label.png</iconset>
+     <normaloff>:/images/themes/default/copyright_label.png</normaloff>:/images/themes/default/copyright_label.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Copyright Label</string>
@@ -1637,7 +1637,7 @@ Ctl (Cmd) increments by 15 deg.</string>
   <action name="mActionDecorationNorthArrow">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/plugins/north_arrow.png</normaloff>:/images/themes/default/plugins/north_arrow.png</iconset>
+     <normaloff>:/images/themes/default/north_arrow.png</normaloff>:/images/themes/default/north_arrow.png</iconset>
    </property>
    <property name="text">
     <string>&amp;North Arrow</string>
@@ -1649,7 +1649,7 @@ Ctl (Cmd) increments by 15 deg.</string>
   <action name="mActionDecorationScaleBar">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/plugins/scale_bar.png</normaloff>:/images/themes/default/plugins/scale_bar.png</iconset>
+     <normaloff>:/images/themes/default/scale_bar.png</normaloff>:/images/themes/default/scale_bar.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Scale Bar</string>