diff --git a/public/locales/send.en-US.ftl b/public/locales/send.en-US.ftl
index de26db46..da7dfb80 100644
--- a/public/locales/send.en-US.ftl
+++ b/public/locales/send.en-US.ftl
@@ -23,8 +23,10 @@ uploadingPageLargeFileMessage = This file is large and may take awhile to upload
 uploadingFileNotification = Notify me when the upload is complete.
 uploadSuccessConfirmHeader = Ready to Send
 
+uploadSvgAlt.alt = Upload
 
-//Notethe spec suggests that this string is editable. That feature will not appear at Launch
+
+//Note the spec suggests that this string is editable. That feature will not appear at Launch
 uploadSuccessTimingHeader = The link to your file will expire after 1 download or in 24 hours.
 copyUrlFormLabel = Copy and share the link to send your file:
 copyUrlFormLabelWithName = Copy and share the link to send your file: { $filename }
@@ -39,7 +41,7 @@ deleteFileButton = Delete file
 sendAnotherFileLink = Send another file
   .title = {sendAnotherFileLink}
 
-
+downloadAltText.alt = Download
 downloadFileName  = Download { $filename }
 downloadFileSize = ({ $size })
 downloadMessage = Your friend is sending you a file with Firefox Send, a service that allows you to share files with a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever.
@@ -53,10 +55,13 @@ sendYourFilesLink = Try Firefox Send
 downloadingPageProgress = Downloading { $filename } ({ $size })
 downloadingPageMessage = Please leave this tab open while we fetch your file and decrypt it.
 
+errorAltText.alt = Upload error
 errorPageHeader = Something went wrong!
 errorPageMessage = There has been an error uploading the file.
 errorPageLink = Send another file
 
+
+linkExpiredAlt.alt = Link expired
 expiredPageHeader = This link has expired or never existed in the first place!
 notSupportedHeader = Your browser is not supported.
 notSupportedDetail = Unfortunately this browser does not support the web technology that powers Firefox Send. You'll need to try another browser. We recommend Firefox!
diff --git a/views/download.handlebars b/views/download.handlebars
index 4279f3bf..15bd5f2d 100644
--- a/views/download.handlebars
+++ b/views/download.handlebars
@@ -9,12 +9,12 @@
       <div class="title">
         <span id="dl-filename" 
               data-l10n-id="downloadFileName"
-              data-l10n-args='{"filename": "{{{filename}}}"}'></span>
+              data-l10n-args='{"filename": "{{filename}}"}'></span>
         <span data-l10n-id="downloadFileSize"
-              data-l10n-args='{"size": "{{{filesize}}}"}'></span>
+              data-l10n-args='{"size": "{{filesize}}"}'></span>
       </div>
       <div class="description" data-l10n-id="downloadMessage"></div>
-      <img src="/resources/illustration_download.svg" id="download-img" alt="Download"/>
+      <img src="/resources/illustration_download.svg" id="download-img" data-l10n-id="downloadAltText"/>
       <div>
         <button id="download-btn" data-l10n-id="downloadButtonLabel"></button>
       </div>
@@ -23,7 +23,7 @@
     <div id="download-progress">
       <div class="title"
            data-l10n-id="downloadingPageProgress"
-           data-l10n-args='{"filename": "{{{filename}}}", "size": "{{{filesize}}}"}'>
+           data-l10n-args='{"filename": "{{filename}}", "size": "{{filesize}}"}'>
       </div>
       <div class="description" data-l10n-id="downloadingPageMessage"></div>
       <!-- progress bar here -->
@@ -34,7 +34,7 @@
         </div>
       </div>
       <div class="upload">
-        <div class="progress-text">{{{filename}}}</div>
+        <div class="progress-text">{{filename}}</div>
       </div>
     </div>
 
@@ -43,7 +43,7 @@
     <div class="title" data-l10n-id="expiredPageHeader"></div>
 
     <div class="share-window">
-      <img src="/resources/illustration_expired.svg" id="expired-img" alt="Link expired" />
+      <img src="/resources/illustration_expired.svg" id="expired-img" data-l10n-id="linkExpiredAlt"/>
     </div>
     <div class="expired-description" data-l10n-id="uploadPageExplainer"></div>
     <div class="send-new" data-l10n-id="sendYourFilesLink"></div>
diff --git a/views/index.handlebars b/views/index.handlebars
index fd665014..66e2fc91 100644
--- a/views/index.handlebars
+++ b/views/index.handlebars
@@ -10,7 +10,7 @@
       <a href="https://testpilot.firefox.com/experiments/send" class="link" data-l10n-id="uploadPageLearnMore"></a>
     </div>
     <div class="upload-window" >
-      <div id="upload-img"><img src="/resources/upload.svg" alt="Upload"/></div>
+      <div id="upload-img"><img data-l10n-id="uploadSvgAlt" src="/resources/upload.svg"/></div>
       <div id="upload-text" data-l10n-id="uploadPageDropMessage"></div>
 
       <form method="post" action="upload" enctype="multipart/form-data">
@@ -74,7 +74,7 @@
   <div id="upload-error">
     <div class="title" data-l10n-id="errorPageHeader"></div>
     <div class="expired-description" data-l10n-id="errorPageMessage"></div>
-    <img id="upload-error-img" src="/resources/illustration_error.svg" alt="Upload error" />
+    <img id="upload-error-img" data-l10n-id="errorAltText" src="/resources/illustration_error.svg"/>
     <div class="send-new" data-l10n-id="sendAnotherFileLink"></div>
   </div>