diff -Nur OLD/opt/openoffice.org2.3/share/xdg/base.desktop NEW/opt/openoffice.org2.3/share/xdg/base.desktop
--- OLD/opt/openoffice.org2.3/share/xdg/base.desktop	2007-09-17 01:25:21.000000000 +0000
+++ NEW/opt/openoffice.org2.3/share/xdg/base.desktop	2007-09-17 01:56:10.000000000 +0000
@@ -2,11 +2,11 @@
 Version=1.0
 Encoding=UTF-8
 Terminal=false
-Icon=openofficeorg23-base
+Icon=/usr/share/pixmaps/openofficeorg23-base.png
 Type=Application
 InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases;
-Exec=openoffice.org2.3 -base %U
+Exec=sbase %U
 MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base
 Name=OpenOffice.org 2.3 Base
 GenericName=Database Development
diff -Nur OLD/opt/openoffice.org2.3/share/xdg/calc.desktop NEW/opt/openoffice.org2.3/share/xdg/calc.desktop
--- OLD/opt/openoffice.org2.3/share/xdg/calc.desktop	2007-09-17 01:25:21.000000000 +0000
+++ NEW/opt/openoffice.org2.3/share/xdg/calc.desktop	2007-09-17 01:56:38.000000000 +0000
@@ -2,11 +2,11 @@
 Version=1.0
 Encoding=UTF-8
 Terminal=false
-Icon=openofficeorg23-calc
+Icon=/usr/share/pixmaps/openofficeorg23-calc.png
 Type=Application
 InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
-Exec=openoffice.org2.3 -calc %U
+Exec=scalc %U
 MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel
 Name=OpenOffice.org 2.3 Calc
 GenericName=Spreadsheet
diff -Nur OLD/opt/openoffice.org2.3/share/xdg/draw.desktop NEW/opt/openoffice.org2.3/share/xdg/draw.desktop
--- OLD/opt/openoffice.org2.3/share/xdg/draw.desktop	2007-09-17 01:25:21.000000000 +0000
+++ NEW/opt/openoffice.org2.3/share/xdg/draw.desktop	2007-09-17 01:56:45.000000000 +0000
@@ -2,11 +2,11 @@
 Version=1.0
 Encoding=UTF-8
 Terminal=false
-Icon=openofficeorg23-draw
+Icon=/usr/share/pixmaps/openofficeorg23-draw.png
 Type=Application
 InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
-Exec=openoffice.org2.3 -draw %U
+Exec=sdraw %U
 MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw
 Name=OpenOffice.org 2.3 Draw
 Comment=Create and edit drawings, flow charts, and logos by using Draw.
diff -Nur OLD/opt/openoffice.org2.3/share/xdg/impress.desktop NEW/opt/openoffice.org2.3/share/xdg/impress.desktop
--- OLD/opt/openoffice.org2.3/share/xdg/impress.desktop	2007-09-17 01:25:21.000000000 +0000
+++ NEW/opt/openoffice.org2.3/share/xdg/impress.desktop	2007-09-17 01:57:04.000000000 +0000
@@ -2,11 +2,11 @@
 Version=1.0
 Encoding=UTF-8
 Terminal=false
-Icon=openofficeorg23-impress
+Icon=/usr/share/pixmaps/openofficeorg23-impress.png
 Type=Application
 InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
-Exec=openoffice.org2.3 -impress %U
+Exec=simpress %U
 MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint
 Name=OpenOffice.org 2.3 Impress
 GenericName=Presentation
diff -Nur OLD/opt/openoffice.org2.3/share/xdg/math.desktop NEW/opt/openoffice.org2.3/share/xdg/math.desktop
--- OLD/opt/openoffice.org2.3/share/xdg/math.desktop	2007-09-17 01:25:21.000000000 +0000
+++ NEW/opt/openoffice.org2.3/share/xdg/math.desktop	2007-09-17 01:57:14.000000000 +0000
@@ -2,11 +2,11 @@
 Version=1.0
 Encoding=UTF-8
 Terminal=false
-Icon=openofficeorg23-math
+Icon=/usr/share/pixmaps/openofficeorg23-math.png
 Type=Application
 InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
-Exec=openoffice.org2.3 -math %U
+Exec=smath %U
 MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math
 Name=OpenOffice.org 2.3 Math
 Comment=Create and edit scientific formulas and equations by using Math.
diff -Nur OLD/opt/openoffice.org2.3/share/xdg/printeradmin.desktop NEW/opt/openoffice.org2.3/share/xdg/printeradmin.desktop
--- OLD/opt/openoffice.org2.3/share/xdg/printeradmin.desktop	2007-09-17 01:25:21.000000000 +0000
+++ NEW/opt/openoffice.org2.3/share/xdg/printeradmin.desktop	2007-09-17 01:55:32.000000000 +0000
@@ -2,7 +2,7 @@
 Version=1.0
 Encoding=UTF-8
 Terminal=false
-Icon=openofficeorg23-printeradmin.png
+Icon=/usr/share/pixmaps/openofficeorg23-printeradmin.png
 Type=Application
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice.org2.3-printeradmin
diff -Nur OLD/opt/openoffice.org2.3/share/xdg/writer.desktop NEW/opt/openoffice.org2.3/share/xdg/writer.desktop
--- OLD/opt/openoffice.org2.3/share/xdg/writer.desktop	2007-09-17 01:25:21.000000000 +0000
+++ NEW/opt/openoffice.org2.3/share/xdg/writer.desktop	2007-09-17 01:57:50.000000000 +0000
@@ -2,11 +2,11 @@
 Version=1.0
 Encoding=UTF-8
 Terminal=false
-Icon=openofficeorg23-writer
+Icon=/usr/share/pixmaps/openofficeorg23-writer.png
 Type=Application
 InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
-Exec=openoffice.org2.3 -writer %U
+Exec=swriter %U
 MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect
 Name=OpenOffice.org 2.3 Writer
 GenericName=Word Processor