5 files changed, 7 insertions, 7 deletions
diff --git a/mysqlc/images/sun_extension.png b/mysqlc/images/sun_extension.png
deleted file mode 100644
index cf3fe5f0d598..000000000000
--- a/mysqlc/images/sun_extension.png
+++ /dev/null
diff --git a/mysqlc/images/sun_extension_hc.png b/mysqlc/images/sun_extension_hc.png
deleted file mode 100644
index 535a6bfdff4f..000000000000
--- a/mysqlc/images/sun_extension_hc.png
+++ /dev/null
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml
index 0dc3284fa869..bc7563d39177 100644..100755
--- a/mysqlc/source/description.xml
+++ b/mysqlc/source/description.xml
@@ -20,8 +20,8 @@
         <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
     </publisher>
     <icon>
-        <default xlink:href="images/sun_extension.png" />
-        <high-contrast xlink:href="images/sun_extension_hc.png" />
+        <default xlink:href="images/extension_32.png" />
+        <high-contrast xlink:href="images/extension_32_h.png" />
     </icon>
     <extension-description>
         <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/>
diff --git a/mysqlc/source/description/description_en-US.txt b/mysqlc/source/description/description_en-US.txt
index bb3cf174a772..a8ddd5985cfc 100644..100755
--- a/mysqlc/source/description/description_en-US.txt
+++ b/mysqlc/source/description/description_en-US.txt
@@ -1 +1 @@
-The MySQL Connector for Oracle Open Office (formerly StarOffice) and OpenOffice.org installs a native MySQL database driver. It is faster, seamless integrated, easier to administrate and there is no need to install and setup a JDBC or ODBC driver separately. It was never easier to use MySQL databases in OpenOffice.org Base.
+The MySQL Connector for OpenOffice.org installs a native MySQL database driver. It is faster, seamless integrated, easier to administrate and there is no need to install and setup a JDBC or ODBC driver separately. It was never easier to use MySQL databases in OpenOffice.org Base.
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index 516f10a7dc0a..49c67344698f 100644..100755
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -225,8 +225,8 @@ COMPONENT_LIBRARIES=\
             $(COMPONENT_LIBRARY)
 
 COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)$/images$/sun_extension.png \
-    $(EXTENSIONDIR)$/images$/sun_extension_hc.png
+    $(EXTENSIONDIR)$/images$/extension_32.png \
+    $(EXTENSIONDIR)$/images$/extension_32_h.png
 
 
 # ........ component description ........
@@ -267,9 +267,9 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE)
 .INCLUDE : target.mk
 .INCLUDE : extension_post.mk
 
-$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@ > $(NULLDEV)
+    $(COPY) $< $@
 
 # existing descriptions: just copy
 $(EXTENSIONDIR)$/description$/%.txt: .$/description$/%.txt