diff --git a/TextMakerViewer2010.msi.sha1sum b/TextMakerViewer2010.msi.sha1sum
index 82382ad..c673b69 100644
--- a/TextMakerViewer2010.msi.sha1sum
+++ b/TextMakerViewer2010.msi.sha1sum
@@ -1 +1 @@
-e2b4e120689b18ade0ad2939b69043714423c282  /usr/portage/distfiles/TextMakerViewer2010.msi
+856a26ea083122d26794993e722b8e99ea9e4898  /usr/portage/distfiles/TextMakerViewer2010.msi
diff --git a/TextMakerViewer2010.wxs b/TextMakerViewer2010.wxs
index cf65b08..0d02786 100644
--- a/TextMakerViewer2010.wxs
+++ b/TextMakerViewer2010.wxs
@@ -132,87 +132,87 @@
                                 <Shortcut Id="desktopShortcut" Directory="DesktopFolder" Name="SoftMaker TextMaker 2010 Viewer" WorkingDirectory="INSTALLDIR" Advertise="yes" Icon="DesktopIcon.exe" IconIndex="0" />
                                 <Shortcut Id="ExeShortcut" Directory="ProgramMenuDir" Name="TextMaker Viewer 2010" Advertise="yes" Icon="StartMenuIcon.exe" IconIndex="0" />
                             </File>
-                            <ProgId Id="tmviewer.docx" Description="Microsoft Office Open XML Format Document">
+                            <ProgId Id="tmviewer.docx" Description="Microsoft Office Open XML Format Document" Icon="TMVIEWER.EXE">
                                 <Extension Id="docx" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.docm" Description="Microsoft Office Open XML Format Document with Macros Enabled">
+                            <ProgId Id="tmviewer.docm" Description="Microsoft Office Open XML Format Document with Macros Enabled" Icon="TMVIEWER.EXE">
                                 <Extension Id="docm" ContentType="application/vnd.ms-word.document.macroEnabled.12">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.dotx" Description="Microsoft Office Open XML Format Template">
+                            <ProgId Id="tmviewer.dotx" Description="Microsoft Office Open XML Format Template" Icon="TMVIEWER.EXE">
                                 <Extension Id="dotx" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.template">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.dotm" Description="Microsoft Office Open XML Format Template with Macros Enabled">
+                            <ProgId Id="tmviewer.dotm" Description="Microsoft Office Open XML Format Template with Macros Enabled" Icon="TMVIEWER.EXE">
                                 <Extension Id="dotm" ContentType="application/vnd.ms-word.template.macroEnabled.12">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.doc" Description="Microsoft Office Word Document">
+                            <ProgId Id="tmviewer.doc" Description="Microsoft Office Word Document" Icon="TMVIEWER.EXE">
                                 <Extension Id="doc" ContentType="application/msword">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.dot" Description="Microsoft Office Word Document Template">
+                            <ProgId Id="tmviewer.dot" Description="Microsoft Office Word Document Template" Icon="TMVIEWER.EXE">
                                 <Extension Id="dot" ContentType="application/msword">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.tmd" Description="TextMaker document from SoftMaker">
+                            <ProgId Id="tmviewer.tmd" Description="TextMaker document from SoftMaker" Icon="TMVIEWER.EXE">
                                 <Extension Id="tmd">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.tmv" Description="TextMaker document Template from SoftMaker">
+                            <ProgId Id="tmviewer.tmv" Description="TextMaker document Template from SoftMaker" Icon="TMVIEWER.EXE">
                                 <Extension Id="tmv">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.odt" Description="OpenDocument (Ver 2) Text Document">
+                            <ProgId Id="tmviewer.odt" Description="OpenDocument (Ver 2) Text Document" Icon="TMVIEWER.EXE">
                                 <Extension Id="odt" ContentType="application/vnd.oasis.opendocument.text, application/x-vnd.oasis.opendocument.text">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.ott" Description="OpenDocument (Ver 2) Text Document Template">
+                            <ProgId Id="tmviewer.ott" Description="OpenDocument (Ver 2) Text Document Template" Icon="TMVIEWER.EXE">
                                 <Extension Id="ott" ContentType="application/vnd.oasis.opendocument.text-template, application/x-vnd.oasis.opendocument.text-template">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.sxw" Description="Text Document">
+                            <ProgId Id="tmviewer.sxw" Description="Text Document" Icon="TMVIEWER.EXE">
                                 <Extension Id="sxw" ContentType="application/vnd.sun.xml.writer">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.rtf" Description="Rich Text Format File">
+                            <ProgId Id="tmviewer.rtf" Description="Rich Text Format File" Icon="TMVIEWER.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="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.psw" Description="Pocket Word template file">
+                            <ProgId Id="tmviewer.psw" Description="Pocket Word template file" Icon="TMVIEWER.EXE">
                                 <Extension Id="psw" ContentType="application/msword">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.pwd" Description="Pocket Word file">
+                            <ProgId Id="tmviewer.pwd" Description="Pocket Word file" Icon="TMVIEWER.EXE">
                                 <Extension Id="pwd" ContentType="application/msword">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.htm" Description="Hypertext Markup Language">
+                            <ProgId Id="tmviewer.htm" Description="Hypertext Markup Language" Icon="TMVIEWER.EXE">
                                 <Extension Id="htm" ContentType="text/html">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-                            <ProgId Id="tmviewer.html" Description="Hypertext Markup Language">
+                            <ProgId Id="tmviewer.html" Description="Hypertext Markup Language" Icon="TMVIEWER.EXE">
                                 <Extension Id="html" ContentType="text/html">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
                             </ProgId>
-							<ProgId Id="tmviewer.txt" Description="Text File">
+                            <ProgId Id="tmviewer.txt" Description="Text File" Icon="TMVIEWER.EXE">
                                 <Extension Id="txt" ContentType="text/plain, application/txt, browser/internal, text/anytext, widetext/plain, widetext/paragraph">
                                     <Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="TMVIEWER.EXE" />
                                 </Extension>
@@ -299,7 +299,7 @@
                     <Component Id="StartMenuShortcuts" Guid="E8EEA6EA-99EC-42B3-8E7E-EF91733F5598">
                         <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 Textmaker 2010" Description="Uninstalls the Softmaker TextMaker 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 7cdb140..f2dc204 100644
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 PN="tmviewer"
 VERSION="2010"
-RELEASE="9"
+RELEASE="10"
 PRIORITY="0"
 ADVICE=""
 TYPE="restrict"