diff --git a/l10n/en-US/chrome.properties b/l10n/en-US/chrome.properties
index 467d5920b..1885e6036 100644
--- a/l10n/en-US/chrome.properties
+++ b/l10n/en-US/chrome.properties
@@ -1,2 +1,3 @@
+# Chrome notification bar messages and buttons
 unsupported_feature=This PDF document might not be displayed correctly.
 open_with_different_viewer=Open With Different Viewer
diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index 4ac776da2..007446075 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -1,10 +1,46 @@
-bookmark.title=Current view (copy or open in new window)
+# Main toolbar buttons (tooltips and alt text for images)
 previous.title=Previous Page
+previous_label=Previous
 next.title=Next Page
-print.title=Print
-download.title=Download
+next_label=Next
+page_label=Page:
+page_of=of {{pageCount}}
 zoom_out.title=Zoom Out
+zoom_out_label=Zoom Out
 zoom_in.title=Zoom In
+zoom_in_label=Zoom In
+zoom.title=Zoom
+print.title=Print
+print_label=Print
+open_file.title=Open File
+open_file_label=Open
+download.title=Download
+download_label=Download
+bookmark.title=Current view (copy or open in new window)
+bookmark_label=Current View
+
+# Side panel toolbar buttons (tooltips and alt text for images)
+toggle_slider.title=Toggle Slider
+toggle_slider_label=Toggle Slider
+outline.title=Show Document Outline
+outline_label=Document Outline
+thumbs.title=Show Thumbnails
+thumbs_label=Thumbnails
+search.title=Search Document
+search_label=Search
+
+# Document outline messages
+no_outline=No Outline Available
+
+# Thumbnails panel item (tooltip and alt text for images)
+thumb_page_title=Page {{page}}
+thumb_page_canvas=Thumbnail of Page {{page}}
+
+# Search panel button title and messages
+search=Find
+search_terms_not_found=(Not found)
+
+# Error panel labels
 error_more_info=More Information
 error_less_info=Less Information
 error_close=Close
@@ -13,38 +49,19 @@ error_message=Message: {{message}}
 error_stack=Stack: {{stack}}
 error_file=File: {{file}}
 error_line=Line: {{line}}
+rendering_error=An error occurred while rendering the page.
+
+# Predefined zoom values
 page_scale_width=Page Width
 page_scale_fit=Page Fit
 page_scale_auto=Automatic Zoom
 page_scale_actual=Actual Size
-toggle_slider.title=Toggle Slider
-thumbs.title=Show Thumbnails
-outline.title=Show Document Outline
+
+# Loading indicator messages
 loading=Loading... {{percent}}%
 loading_error_indicator=Error
 loading_error=An error occurred while loading the PDF.
-rendering_error=An error occurred while rendering the page.
-page_label=Page:
-page_of=of {{pageCount}}
-no_outline=No Outline Available
-open_file.title=Open File
-text_annotation_type=[{{type}} Annotation]
-toggle_slider_label=Toggle Slider
-thumbs_label=Thumbnails
-outline_label=Document Outline
-bookmark_label=Current View
-previous_label=Previous
-next_label=Next
-print_label=Print
-download_label=Download
-zoom_out_label=Zoom Out
-zoom_in_label=Zoom In
-zoom.title=Zoom
-thumb_page_title=Page {{page}}
-thumb_page_canvas=Thumbnail of Page {{page}}
-request_password=PDF is protected by a password:
-open_file_label=Open
-search.title=Search Document
-search_label=Search
-search_button=Find
 
+# Misc labels and messages
+text_annotation_type=[{{type}} Annotation]
+request_password=PDF is protected by a password:
diff --git a/web/viewer.html b/web/viewer.html
index 087fb7af3..8b189a1f0 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -63,7 +63,7 @@
           <div id="searchView" class="hidden">
             <div id="searchToolbar">
               <input id="searchTermsInput" onkeydown='if (event.keyCode == 13) PDFView.search()'>
-              <button id="searchButton" onclick='PDFView.search()' data-l10n-id="search_button">Find</button>
+              <button id="searchButton" onclick='PDFView.search()' data-l10n-id="search">Find</button>
             </div>
             <div id="searchResults"></div>
           </div>
diff --git a/web/viewer.js b/web/viewer.js
index e6d1b6766..21a50e96b 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -720,7 +720,8 @@ var PDFView = {
       pageFound = true;
     }
     if (!pageFound) {
-      searchResults.textContent = '(Not found)';
+      searchResults.textContent = mozL10n.get('search_terms_not_found', null,
+                                              '(Not found)');
     }
   },