diff -uNr old/toolbarmanager.cxx new/toolbarmanager.cxx
--- old/toolbarmanager.cxx	2007-07-10 10:58:26.000000000 +0800
+++ new/toolbarmanager.cxx	2007-07-09 16:17:32.000000000 +0800
@@ -171,6 +171,9 @@
 #include <svtools/menuoptions.hxx>
 #endif
 #include <svtools/cmdoptions.hxx>
+#ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ 
+#include <classes/addonsoptions.hxx> 
+#endif 
 
 //_________________________________________________________________________________________________________________
 //	namespaces
@@ -457,10 +460,10 @@
         if ( nId > 0 )
         {
             OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
-	    m_pToolBar->SetItemImage( nId, GetImageFromURL( m_xFrame, 
-	                                                    aCommandURL, 
-	                                                    bBigImages, 
-	                                                    m_bIsHiContrast ) );
+			Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages, m_bIsHiContrast ); 
+			if ( !aImage )
+				aImage = QueryAddonsImage( aCommandURL, bBigImages, m_bIsHiContrast );
+			m_pToolBar->SetItemImage( nId, aImage );
         }
     }
 
@@ -1397,6 +1400,7 @@
         ++pIter;
     }
     
+	sal_Bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); 
     m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetFaceColor().IsDark();
     sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast );
 
@@ -1413,7 +1417,9 @@
             aImage = Image( aDocGraphicSeq[i] );
         if ( !aImage )
         {
-            aImage = Image( aModGraphicSeq[i] ); 
+            aImage = Image( aModGraphicSeq[i] );
+			if ( !aImage ) 
+				aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages, m_bIsHiContrast ); 
             m_pToolBar->SetItemImage( pIter->second.nId, aImage );
             if ( pIter->second.aIds.size() > 0 )
             {
@@ -2035,4 +2041,10 @@
     return 0;
 }
 
+Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast ) 
+{
+	Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages, bHiContrast );
+	return aImage;
+}
+ 
 }
diff -uNr old/toolbarmanager.hxx new/toolbarmanager.hxx
--- old/toolbarmanager.hxx	2007-07-10 10:52:56.000000000 +0800
+++ new/toolbarmanager.hxx	2007-07-09 16:16:28.000000000 +0800
@@ -229,6 +229,7 @@
         sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle );
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const; 
         sal_Bool IsPluginMode() const;
+		Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast ); 
 
     protected:
         struct CommandInfo