diff --git a/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
index 45fc3e847..299ac5e2a 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
@@ -21,7 +21,7 @@
       </div>
       <md-button class="sg-icon-button" var:href="pathForDownload">
         <md-tooltip md-direction="left"><var:string label:value="Save Attachment"/></md-tooltip>
-        <md-icon>save</md-icon>
+        <md-icon>file_download</md-icon>
       </md-button>
     </md-dialog-actions>
   </md-card>
diff --git a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
index dded382be..37e5d6cef 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
@@ -7,7 +7,7 @@
   <md-card>
     <md-card-content>
       <p class="md-caption" var:title="filenameForDisplay">
-        <span class="sg-label-outline"><var:string value="preferredPathExtension"/></span>
+        <var:if condition="preferredPathExtension.length"><span class="sg-label-outline"><var:string value="preferredPathExtension"/></span></var:if>
         <var:string value="filenameForDisplay"/>
       </p>
     </md-card-content>