fdo#37740 remove duplicate icons from soffice.bin/soffice.exe

24 files changed, 166 insertions, 150 deletions

diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 8815432d1457..00fb0057925e 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -103,6 +103,6 @@ $(eval $(call gb_Executable_set_ldflags,\
 
 endif
 
-$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src)) 
+$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 3d0045c1e821..eb83f82242db 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     WinResTarget_sdraw \
     WinResTarget_simpress \
     WinResTarget_soffice \
+    WinResTarget_sofficebin \
     WinResTarget_smath \
     WinResTarget_sweb \
     WinResTarget_swriter \
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index b1333355a802..fe66aa59059a 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -44,6 +44,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
     sysui/desktop/icons/main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader))
+$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk
new file mode 100644
index 000000000000..334c9b780834
--- /dev/null
+++ b/desktop/WinResTarget_sofficebin.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_WinResTarget_WinResTarget,sofficebin/src))
+
+$(eval $(call gb_WinResTarget_set_include,sofficebin/src,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,sofficebin/src,\
+    $$(DEFS) \
+    -DRES_APP_NAME=soffice \
+    -DRES_APP_ICON=icons/main_app.ico \
+    -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,sofficebin/src,\
+    sysui/desktop/icons/main_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,sofficebin/src,desktop/util/officeloader))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index 69710f2ceaab..14ee1c028984 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -78,34 +78,8 @@ VS_VERSION_INFO VERSIONINFO
 7 ICON "icons/oasis-drawing-template.ico"
 8 ICON "icons/oasis-presentation.ico"
 9 ICON "icons/oasis-presentation-template.ico"
-10 ICON "icons/oasis-presentation-template.ico"
-11 ICON "icons/oasis-master-document.ico"
-12 ICON "icons/oasis-web-template.ico"
-13 ICON "icons/oasis-empty-document.ico"
-14 ICON "icons/oasis-database.ico"
-15 ICON "icons/oasis-formula.ico"
-16 ICON "icons/oasis-web-template.ico"
-17 ICON "icons/empty-document.ico"
-18 ICON "icons/empty-document.ico"
-19 ICON "icons/open.ico"
-20 ICON "icons/empty-document.ico"
-21 ICON "icons/writer_app.ico"
-22 ICON "icons/calc_app.ico"
-23 ICON "icons/draw_app.ico"
-24 ICON "icons/impress_app.ico"
-25 ICON "icons/math_app.ico"
-26 ICON "icons/base_app.ico"
-27 ICON "icons/oasis-empty-document.ico"
-28 ICON "icons/text.ico"
-29 ICON "icons/text-template.ico"
-30 ICON "icons/spreadsheet.ico"
-31 ICON "icons/spreadsheet-template.ico"
-32 ICON "icons/drawing.ico"
-33 ICON "icons/drawing-template.ico"
-34 ICON "icons/presentation.ico"
-35 ICON "icons/presentation-template.ico"
-36 ICON "icons/master-document.ico"
-37 ICON "icons/empty-document.ico"
-38 ICON "icons/database.ico"
-39 ICON "icons/formula.ico"
-40 ICON "icons/oxt-extension.ico"
+10 ICON "icons/oasis-master-document.ico"
+11 ICON "icons/oasis-web-template.ico"
+12 ICON "icons/oasis-database.ico"
+13 ICON "icons/oasis-formula.ico"
+14 ICON "icons/oxt-extension.ico"
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index c44609945aea..237e8249740a 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -218,7 +218,7 @@
                     <value ></value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >15</value>
+                    <value >13</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
@@ -260,7 +260,7 @@
                     <value ></value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >11</value>
+                    <value >10</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
@@ -454,7 +454,7 @@
                     <value ></value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >12</value>
+                    <value >1</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
@@ -491,7 +491,7 @@
                     <value >DbRelationWindowState</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >14</value>
+                    <value >12</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
                     <value >GenericCategories</value>
@@ -516,7 +516,7 @@
                     <value >DbQueryWindowState</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >14</value>
+                    <value >12</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
                     <value >GenericCategories</value>
@@ -541,7 +541,7 @@
                     <value >DbQueryWindowState</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >14</value>
+                    <value >12</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
                     <value >GenericCategories</value>
@@ -566,7 +566,7 @@
                     <value >DbTableWindowState</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >14</value>
+                    <value >12</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
                     <value >GenericCategories</value>
@@ -591,7 +591,7 @@
                     <value >DbBrowserWindowState</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >14</value>
+                    <value >12</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
                     <value >GenericCategories</value>
@@ -616,7 +616,7 @@
                     <value>DbTableDataWindowState</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value>14</value>
+                    <value>12</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
                     <value>GenericCategories</value>
@@ -709,7 +709,7 @@
                     <value ></value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >13</value>
+                    <value >1</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
@@ -751,7 +751,7 @@
                     <value ></value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >14</value>
+                    <value >12</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
diff --git a/reportbuilder/registry/data/org/openoffice/Setup.xcu b/reportbuilder/registry/data/org/openoffice/Setup.xcu
index 55ff435f718e..61f9d6895d57 100644
--- a/reportbuilder/registry/data/org/openoffice/Setup.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Setup.xcu
@@ -39,7 +39,7 @@
                     <value >DbReportWindowState</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryIcon">
-                    <value >14</value>
+                    <value >12</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
                     <value >GenericCategories</value>
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 820a9e222704..c54049548165 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -391,7 +391,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
-        Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
+        Value = "<progpath>\program\soffice.bin," STRING(icon_id); \
     End
 
 #define REGISTRY_ENTRY_SHELL(name,default,modid) \
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index abd35eeab36b..29bde7b43e60 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -91,7 +91,7 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DatabaseDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "<progpath>\program\soffice.exe,13";
+    Value = "<progpath>\program\soffice.bin,11";
 End
 
 #ifdef _MSC_VER
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
index fa4e2297516d..a1e884e14f86 100644
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ b/scp2/source/binfilter/registryitem_binfilter.scp
@@ -110,7 +110,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = "soffice.StarWriterDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,27";
+    Value = "<progpath>\program\soffice.bin,1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell
@@ -166,7 +166,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon";
     ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,35";
+    Value = "<progpath>\program\soffice.bin,9";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell
@@ -248,7 +248,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = "soffice.StarCalcDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,29";
+    Value = "<progpath>\program\soffice.bin,3";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
@@ -361,7 +361,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = "soffice.StarImpressDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,33";
+    Value = "<progpath>\program\soffice.bin,7";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell
@@ -476,7 +476,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = "soffice.StarDrawDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,31";
+    Value = "<progpath>\program\soffice.bin,5";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell
@@ -573,7 +573,7 @@ RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarChartDocument.5\DefaultIcon";
     ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,36";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell
@@ -636,7 +636,7 @@ RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarOfficeTemplate.5\DefaultIcon";
     ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,15";
+    Value = "<progpath>\program\soffice.bin,10";
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell
@@ -749,7 +749,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = "soffice.StarMathDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,38";
+    Value = "<progpath>\program\soffice.bin,12";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 9ebfadeaa074..29555e1a7469 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -76,7 +76,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochandler32
@@ -195,7 +195,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochandler32
@@ -291,7 +291,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "soffice.StarCalcDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,29";
+    Value = "<progpath>\program\soffice.bin,3";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
@@ -388,7 +388,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarCalcTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "<progpath>\program\soffice.exe,30";
+    Value = "<progpath>\program\soffice.bin,4";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
@@ -665,7 +665,7 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "opendocument.CalcDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,3";
+    Value = "<progpath>\program\soffice.bin,3";
 End
 
 #ifdef _MSC_VER
@@ -858,7 +858,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.CalcTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "<progpath>\program\soffice.exe,4";
+    Value = "<progpath>\program\soffice.bin,4";
 End
 
 #ifdef _MSC_VER
@@ -1176,11 +1176,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
 
 // registering the mso file types
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
 
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index c9d4e9ece754..1c9b3a153a3d 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -76,7 +76,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochandler32
@@ -195,7 +195,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochandler32
@@ -291,7 +291,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "soffice.StarDrawDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,31";
+    Value = "<progpath>\program\soffice.bin,5";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell
@@ -388,7 +388,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarDrawTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "<progpath>\program\soffice.exe,32";
+    Value = "<progpath>\program\soffice.bin,6";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell
@@ -664,7 +664,7 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "opendocument.DrawDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,5";
+    Value = "<progpath>\program\soffice.bin,5";
 End
 
 #ifdef _MSC_VER
@@ -857,7 +857,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DrawTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "<progpath>\program\soffice.exe,6";
+    Value = "<progpath>\program\soffice.bin,6";
 End
 
 #ifdef _MSC_VER
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index aeee461f83e9..57c58fbace8d 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -76,7 +76,7 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochandler32
@@ -195,7 +195,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochandler32
@@ -291,7 +291,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "soffice.StarImpressDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,33";
+    Value = "<progpath>\program\soffice.bin,7";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Insertable
@@ -402,7 +402,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "<progpath>\program\soffice.exe,34";
+    Value = "<progpath>\program\soffice.bin,8";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell
@@ -679,7 +679,7 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "opendocument.ImpressDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,7";
+    Value = "<progpath>\program\soffice.bin,7";
 End
 
 #ifdef _MSC_VER
@@ -886,7 +886,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.ImpressTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "<progpath>\program\soffice.exe,8";
+    Value = "<progpath>\program\soffice.bin,8";
 End
 
 #ifdef _MSC_VER
@@ -1040,11 +1040,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
 
 // registering the mso file types
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 9d043ce0c019..60826aaacf1b 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -75,7 +75,7 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochandler32
@@ -194,7 +194,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochandler32
@@ -290,7 +290,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "soffice.StarMathDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,38";
+    Value = "<progpath>\program\soffice.bin,12";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Insertable
@@ -546,7 +546,7 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "opendocument.MathDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,14";
+    Value = "<progpath>\program\soffice.bin,12";
 End
 
 #ifdef _MSC_VER
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 2afd875b4dcc..5bc40d6bf36d 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -603,7 +603,7 @@ RegistryItem gid_Regitem_Office_Extension_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Root;
     Subkey = "office.Extension.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,39";
+    Value = "<progpath>\program\soffice.bin,13";
     Styles = ();
 End
 
@@ -635,7 +635,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
 	ModuleID = gid_Module_Root;
 	Name = "ApplicationIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 	Styles = ();
 End
 
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index c6f08f23ceaa..97df01cdf88a 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -76,7 +76,7 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochandler32
@@ -195,7 +195,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Defaultico
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
+    Value = "<progpath>\program\soffice.bin,0";
 End
 
 RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochandler32
@@ -291,7 +291,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,27";
+    Value = "<progpath>\program\soffice.bin,1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Insertable
@@ -395,7 +395,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterGlobalDocument.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,35";
+    Value = "<progpath>\program\soffice.bin,9";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell
@@ -465,7 +465,7 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,28";
+    Value = "<progpath>\program\soffice.bin,2";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell
@@ -788,7 +788,7 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "opendocument.WriterDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,1";
+    Value = "<progpath>\program\soffice.bin,1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
@@ -1004,7 +1004,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,2";
+    Value = "<progpath>\program\soffice.bin,2";
 End
 
 #ifdef _MSC_VER
@@ -1130,7 +1130,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterGlobalDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,10";
+    Value = "<progpath>\program\soffice.bin,9";
 End
 
 #ifdef _MSC_VER
@@ -1256,7 +1256,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterWebTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,11";
+    Value = "<progpath>\program\soffice.bin,10";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
@@ -1568,11 +1568,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg )
 // registering the mso file types
 // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_MSO_Reg, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_MSO_Reg, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_MSO_Reg, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_MSO_Reg, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 2, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
 
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
index e301303fade0..89d82d4e6033 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
@@ -20,6 +20,7 @@ RegistrationContextInformation::RegistrationContextInformation(MSIHANDLE hMsi, c
 {
     assert(m_OOExecPath.length());
     ExtractOpenOfficeExecNameFromPath();
+    m_OOIconPath = m_OOExecPath.replace(m_OOExecPath.find(m_OOExecName), m_OOExecName.size(), std::wstring(TEXT("soffice.bin")));
 }
 
 std::wstring RegistrationContextInformation::GetWordDocumentDisplayName() const
@@ -36,7 +37,7 @@ std::wstring RegistrationContextInformation::GetWordDocumentFileExtension() cons
 
 std::wstring RegistrationContextInformation::GetWordDocumentDefaultIconEntry() const
 {
-    return m_OOExecPath + std::wstring(TEXT(",1"));
+    return m_OOIconPath + std::wstring(TEXT(",1"));
 }
 
 std::wstring RegistrationContextInformation::GetWordDocumentDefaultShellCommand() const
@@ -70,7 +71,7 @@ std::wstring RegistrationContextInformation::GetWordTemplateFileExtension() cons
 
 std::wstring RegistrationContextInformation::GetWordTemplateDefaultIconEntry() const
 {
-    return m_OOExecPath + std::wstring(TEXT(",2"));
+    return m_OOIconPath + std::wstring(TEXT(",2"));
 }
 
 std::wstring RegistrationContextInformation::GetWordTemplateDefaultShellCommand() const
@@ -92,7 +93,7 @@ std::wstring RegistrationContextInformation::GetRtfDocumentFileExtension() const
 
 std::wstring RegistrationContextInformation::GetRtfDocumentDefaultIconEntry() const
 {
-    return m_OOExecPath + std::wstring(TEXT(",1"));
+    return m_OOIconPath + std::wstring(TEXT(",1"));
 }
 
 std::wstring RegistrationContextInformation::GetRtfDocumentDefaultShellCommand() const
@@ -114,7 +115,7 @@ std::wstring RegistrationContextInformation::GetExcelSheetFileExtension() const
 
 std::wstring RegistrationContextInformation::GetExcelSheetDefaultIconEntry() const
 {
-    return m_OOExecPath + std::wstring(TEXT(",3"));
+    return m_OOIconPath + std::wstring(TEXT(",3"));
 }
 
 std::wstring RegistrationContextInformation::GetExcelSheetDefaultShellCommand() const
@@ -148,7 +149,7 @@ std::wstring RegistrationContextInformation::GetExcelTemplateFileExtension() con
 
 std::wstring RegistrationContextInformation::GetExcelTemplateDefaultIconEntry() const
 {
-    return m_OOExecPath + std::wstring(TEXT(",4"));
+    return m_OOIconPath + std::wstring(TEXT(",4"));
 }
 
 std::wstring RegistrationContextInformation::GetExcelTemplateDefaultShellCommand() const
@@ -170,7 +171,7 @@ std::wstring RegistrationContextInformation::GetPowerPointDocumentFileExtension(
 
 std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultIconEntry() const
 {
-    return m_OOExecPath + std::wstring(TEXT(",7"));
+    return m_OOIconPath + std::wstring(TEXT(",7"));
 }
 
 std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultShellCommand() const
@@ -204,7 +205,7 @@ std::wstring RegistrationContextInformation::GetPowerPointTemplateFileExtension(
 
 std::wstring RegistrationContextInformation::GetPowerPointTemplateDefaultIconEntry() const
 {
-    return m_OOExecPath + std::wstring(TEXT(",8"));
+    return m_OOIconPath + std::wstring(TEXT(",8"));
 }
 
 std::wstring RegistrationContextInformation::GetPowerPointTemplateDefaultShellCommand() const
@@ -226,7 +227,7 @@ std::wstring RegistrationContextInformation::GetPowerPointShowFileExtension() co
 
 std::wstring RegistrationContextInformation::GetPowerPointShowDefaultIconEntry() const
 {
-    return m_OOExecPath + std::wstring(TEXT(",7"));
+    return m_OOIconPath + std::wstring(TEXT(",7"));
 }
 
 std::wstring RegistrationContextInformation::GetPowerPointShowDefaultShellCommand() const
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
index c27b2a495a45..1ba9a4d99a36 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
@@ -165,6 +165,7 @@ private:
     MSIHANDLE    msihandle_;
     std::wstring m_OOExecPath;
     std::wstring m_OOExecName;
+    std::wstring m_OOIconPath;
 };
 
 #endif
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
index 6b8a85eb163f..e1679dd9754d 100644
--- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
@@ -84,18 +84,16 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
 
     if (osverinfo.dwMajorVersion < 6 /* && osverinfo.dwMinorVersion  */ )
     {
-        // This icon (18) is a Windows folder until XP Version (number is 0 based)
         WritePrivateProfileString(
             TEXT(".ShellClassInfo"),
             TEXT("IconFile"),
             sIconFile.c_str(),
             sDesktopFile.c_str() );
 
-        // FYI: in tool 'ResHack' this icon can be found on position '19' (number is 1 based)
         WritePrivateProfileString(
             TEXT(".ShellClassInfo"),
             TEXT("IconIndex"),
-            TEXT("18"),
+            TEXT("0"),
             sDesktopFile.c_str() );
     }
     // else
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index d0b17edc9ec9..0edafdb8ff7c 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -30,9 +30,9 @@
 #define SV_ICON_ID_SPREADSHEET                  4
 #define SV_ICON_ID_DRAWING                      6
 #define SV_ICON_ID_PRESENTATION                 8
-#define SV_ICON_ID_DATABASE                    14
-#define SV_ICON_ID_FORMULA                     15
-#define SV_ICON_ID_TEMPLATE                    16
+#define SV_ICON_ID_TEMPLATE                    11
+#define SV_ICON_ID_DATABASE                    12
+#define SV_ICON_ID_FORMULA                     13
 
 using namespace ::rtl;
 using namespace ::osl;
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index c4cd1381d26c..1a3a594f240d 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -81,7 +81,7 @@ using ::com::sun::star::beans::PropertyValue;
 #define IDM_UNINSTALL               11
 
 
-#define ICON_SO_DEFAULT                 1
+#define ICON_LO_DEFAULT                 1
 #define ICON_TEXT_DOCUMENT              2
 #define ICON_TEXT_TEMPLATE              3
 #define ICON_SPREADSHEET_DOCUMENT       4
@@ -90,15 +90,11 @@ using ::com::sun::star::beans::PropertyValue;
 #define ICON_DRAWING_TEMPLATE           7
 #define ICON_PRESENTATION_DOCUMENT      8
 #define ICON_PRESENTATION_TEMPLATE      9
-#define ICON_PRESENTATION_COMPRESSED    10
-#define ICON_GLOBAL_DOCUMENT            11
-#define ICON_HTML_DOCUMENT              12
-#define ICON_CHART_DOCUMENT             13
-#define ICON_DATABASE_DOCUMENT          14
-#define ICON_MATH_DOCUMENT              15
-#define ICON_TEMPLATE                   16
-#define ICON_MACROLIBRARY               17
-#define ICON_CONFIGURATION              18
+#define ICON_MASTER_DOCUMENT            10
+#define ICON_TEMPLATE                   11
+#define ICON_DATABASE_DOCUMENT          12
+#define ICON_MATH_DOCUMENT              13
+#define ICON_MACROLIBRARY               1
 #define ICON_OPEN                       5   // See index of open folder icon in shell32.dll
 #define ICON_SETUP                      500
 
@@ -289,7 +285,7 @@ static void addTaskbarIcon( HWND hWnd )
 
     // add taskbar icon
     NOTIFYICONDATAA nid;
-    nid.hIcon = (HICON)LoadImageA( GetModuleHandle( NULL ), MAKEINTRESOURCE( ICON_SO_DEFAULT ),
+    nid.hIcon = (HICON)LoadImageA( GetModuleHandle( NULL ), MAKEINTRESOURCE( ICON_LO_DEFAULT ),
         IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ),
         LR_DEFAULTCOLOR | LR_SHARED );
 
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 1f60241d6716..5eba31828f38 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -256,10 +256,10 @@
 #define SV_ICON_ID_SPREADSHEET_TEMPLATE         5
 #define SV_ICON_ID_DRAWING                      6
 #define SV_ICON_ID_PRESENTATION                 8
-#define SV_ICON_ID_MASTER_DOCUMENT             11
-#define SV_ICON_ID_DATABASE                    14
-#define SV_ICON_ID_FORMULA                     15
-#define SV_ICON_ID_TEMPLATE                    16
+#define SV_ICON_ID_MASTER_DOCUMENT             10
+#define SV_ICON_ID_TEMPLATE                    11
+#define SV_ICON_ID_DATABASE                    12
+#define SV_ICON_ID_FORMULA                     13
 #define SV_ICON_ID_PRINTERADMIN               501
 
 #define HID_PRINTDLG                        HID_VCL_START
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index 832ebd2cec17..7370280c53d1 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -41,8 +41,7 @@ class TaskPaneList;
 // - Icon-Types -
 // --------------
 
-#define ICON_DEFAULT                    0
-#define ICON_SO_DEFAULT                 1
+#define ICON_LO_DEFAULT                 1
 #define ICON_TEXT_DOCUMENT              2
 #define ICON_TEXT_TEMPLATE              3
 #define ICON_SPREADSHEET_DOCUMENT       4
@@ -51,14 +50,11 @@ class TaskPaneList;
 #define ICON_DRAWING_TEMPLATE           7
 #define ICON_PRESENTATION_DOCUMENT      8
 #define ICON_PRESENTATION_TEMPLATE      9
-#define ICON_PRESENTATION_COMPRESSED    10
-#define ICON_GLOBAL_DOCUMENT            11
-#define ICON_HTML_DOCUMENT              12
-#define ICON_CHART_DOCUMENT             13
-#define ICON_DATABASE_DOCUMENT          14
-#define ICON_MATH_DOCUMENT              15
-#define ICON_TEMPLATE                   16
-#define ICON_MACROLIBRARY               17
+#define ICON_MASTER_DOCUMENT            10
+#define ICON_TEMPLATE                   11
+#define ICON_DATABASE_DOCUMENT          12
+#define ICON_MATH_DOCUMENT              13
+#define ICON_MACROLIBRARY               1
 #define ICON_PLAYER                     100
 #define ICON_SETUP                      500
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 9ab7a1ac2f32..dca1609a727e 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -717,7 +717,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle,
     mbShaded                    = false;
     mbFullScreen                = false;
 
-    mnIconID                    = 1; // ICON_DEFAULT
+    mnIconID                    = 1; // ICON_LO_DEFAULT
 
     m_pClipRectangles           = NULL;
     m_nCurClipRect              = 0;