diff --git a/PlanMakerViewer2010.msi.sha1sum b/PlanMakerViewer2010.msi.sha1sum
index d3a1cde..0d00445 100644
--- a/PlanMakerViewer2010.msi.sha1sum
+++ b/PlanMakerViewer2010.msi.sha1sum
@@ -1 +1 @@
-2572cab74fd6dd7269a239eb553b2675134880e7  /usr/portage/distfiles/PlanMakerViewer2010.msi
+1bc855fdf28c3ab185d7e848e7a227e2ea20042b  /usr/portage/distfiles/PlanMakerViewer2010.msi
diff --git a/PlanMakerViewer2010.wxs b/PlanMakerViewer2010.wxs
index 2bd3ce8..fc5e692 100644
--- a/PlanMakerViewer2010.wxs
+++ b/PlanMakerViewer2010.wxs
@@ -90,77 +90,77 @@
                                 <Shortcut Id="desktopShortcut" Directory="DesktopFolder" Name="SoftMaker PlanMaker 2010 Viewer" WorkingDirectory="INSTALLDIR" Advertise="yes" Icon="DesktopIcon.exe" IconIndex="0" />
                                 <Shortcut Id="ExeShortcut" Directory="ProgramMenuDir" Name="PlanMaker Viewer 2010" Advertise="yes" Icon="StartMenuIcon.exe" IconIndex="0" />
                             </File>
-                            <ProgId Id="pmviewer.xlsx" Description="Microsoft Office Open XML Format Spreadsheet">
+                            <ProgId Id="pmviewer.xlsx" Description="Microsoft Office Open XML Format Spreadsheet" Icon="PMVIEWER.EXE">
                                 <Extension Id="xlsx" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.xlsm" Description="Microsoft Office Open XML Format Spreadsheet with Macros Enabled">
+                            <ProgId Id="pmviewer.xlsm" Description="Microsoft Office Open XML Format Spreadsheet with Macros Enabled" Icon="PMVIEWER.EXE">
                                 <Extension Id="xlsm" ContentType="application/vnd.ms-excel.sheet.macroEnabled.12">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.xltx" Description="Microsoft Office Open XML Format Template">
+                            <ProgId Id="pmviewer.xltx" Description="Microsoft Office Open XML Format Template" Icon="PMVIEWER.EXE">
                                 <Extension Id="xltx" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.template">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.xltm" Description="Microsoft Office Open XML Format Template with Macros Enabled">
+                            <ProgId Id="pmviewer.xltm" Description="Microsoft Office Open XML Format Template with Macros Enabled" Icon="PMVIEWER.EXE">
                                 <Extension Id="xltm" ContentType="application/vnd.ms-excel.template.macroEnabled.12">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.xls" Description="Microsoft Office Excel Document">
+                            <ProgId Id="pmviewer.xls" Description="Microsoft Office Excel Document" Icon="PMVIEWER.EXE">
                                 <Extension Id="xls" ContentType="application/vnd.ms-excel [official], application/msexcel, application/x-msexcel, application/x-ms-excel, application/vnd.ms-excel, application/x-excel, application/x-dos_ms_excel, application/xls">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.xlt" Description="Microsoft Office Excel Document Template">
+                            <ProgId Id="pmviewer.xlt" Description="Microsoft Office Excel Document Template" Icon="PMVIEWER.EXE">
                                 <Extension Id="xlt" ContentType="application/vnd.ms-excel [official], application/excel, application/msexcel, application/x-excel, application/xlt, application/x-msexcel">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.pmd" Description="PlanMaker document from SoftMaker">
+                            <ProgId Id="pmviewer.pmd" Description="PlanMaker document from SoftMaker" Icon="PMVIEWER.EXE">
                                 <Extension Id="pmd">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.pmv" Description="PlanMaker document Template from SoftMaker">
+                            <ProgId Id="pmviewer.pmv" Description="PlanMaker document Template from SoftMaker" Icon="PMVIEWER.EXE">
                                 <Extension Id="pmv">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.pmw" Description="PlanMaker document from SoftMaker">
+                            <ProgId Id="pmviewer.pmw" Description="PlanMaker document from SoftMaker" Icon="PMVIEWER.EXE">
                                 <Extension Id="pmw">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.sdc" Description="Spreadsheet">
+                            <ProgId Id="pmviewer.sdc" Description="Spreadsheet" Icon="PMVIEWER.EXE">
                                 <Extension Id="sdc" ContentType="application/soffice, application/x-soffice, application/x-staroffice, application/vnd.stardivision.calc">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.slk" Description="Data Exchange File">
+                            <ProgId Id="pmviewer.slk" Description="Data Exchange File" Icon="PMVIEWER.EXE">
                                 <Extension Id="slk" ContentType="application/excel">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.rtf" Description="Rich Text Format File">
+                            <ProgId Id="pmviewer.rtf" Description="Rich Text Format File" Icon="PMVIEWER.EXE">
                                 <Extension Id="rtf" ContentType="application/rtf, application/x-rtf, text/rtf, text/richtext, application/msword, application/doc, application/x-soffice">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.dbf" Description="Database">
+                            <ProgId Id="pmviewer.dbf" Description="Database" Icon="PMVIEWER.EXE">
                                 <Extension Id="dbf" ContentType="application/dbase, application/x-dbase, application/dbf, application/x-dbf, zz-application/zz-winassoc-dbf">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.csv" Description="Comma-Separated Variables">
+                            <ProgId Id="pmviewer.csv" Description="Comma-Separated Variables" Icon="PMVIEWER.EXE">
                                 <Extension Id="csv" ContentType="text/comma-separated-values, text/csv, application/csv, application/excel, application/vnd.ms-excel, application/vnd.msexcel, text/anytext">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="pmviewer.prn" Description="Printer Text File">
+                            <ProgId Id="pmviewer.prn" Description="Printer Text File" Icon="PMVIEWER.EXE">
                                 <Extension Id="prn">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="PMVIEWER.EXE" />
                                 </Extension>
@@ -283,7 +283,7 @@
                     <Component Id="StartMenuShortcuts" Guid="F5B6FC3B-0B86-4550-9918-2CA94E28DF8B">
                         <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
                         <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" />
-                        <Shortcut Id="UninstallProduct" Name="Uninstall" Description="Uninstalls the application" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
+                        <Shortcut Id="UninstallProduct" Name="Uninstall PlanMaker 2010" Description="Uninstalls the SoftMaker PlanMaker Viewer 2010" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
                         <util:InternetShortcut Id="WebsiteShortcut" Name="The Office Viewers" Target="http://www.officeviewers.de/" />
                     </Component>
                 </Directory>
diff --git a/build.sh b/build.sh
index 9c011b1..cc7a3ec 100644
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 PN="pmviewer"
 VERSION="2010"
-RELEASE="9"
+RELEASE="10"
 PRIORITY="0"
 ADVICE=""
 TYPE="restrict"