diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index 678e23c8e..8e0ca9879 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -36,8 +36,6 @@ outline.title=Show Document Outline
 outline_label=Document Outline
 thumbs.title=Show Thumbnails
 thumbs_label=Thumbnails
-find_panel.title=Find in Document
-find_panel_label=Find
 
 # Document outline messages
 no_outline=No Outline Available
@@ -55,8 +53,14 @@ page_rotate_cw.label=Rotate Clockwise
 page_rotate_ccw.label=Rotate Counter-Clockwise
 
 # Find panel button title and messages
-find=Find
-find_terms_not_found=(Not found)
+find.title=Find in Document
+find_label=Find
+find_previous.title=Find the previous occurrence of the phrase
+find_next.title=Find the next occurrence of the phrase
+find_highlight=Highlight all
+find_match_case_label=Match case
+find_wrapped_to_bottom=Reached end of page, continued from bottom
+find_wrapped_to_top=Reached end of page, continued from top
 
 # Error panel labels
 error_more_info=More Information
diff --git a/web/viewer.html b/web/viewer.html
index e59120471..7af1d919b 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -99,14 +99,14 @@ limitations under the License.
 
       <div id="mainContainer">
         <div class="findbar hidden doorHanger" id="findbar">
-          <label for="findInput">Find: </label>
+          <label for="findInput" data-l10n-id="find_label">Find</label>:
           <input id="findInput" type="search">
-          <button id="findPrevious">&lt;</button>
-          <button id="findNext">&gt;</button>
+          <button id="findPrevious" data-l10n-id="find_previous" title="">&lt;</button>
+          <button id="findNext" data-l10n-id="find_next">&gt;</button>
           <input type="checkbox" id="findHighlightAll">
-          <label for="findHighlightAll">Highlight all</label>
+          <label for="findHighlightAll" data-l10n-id="find_highlight">Highlight all</label>
           <input type="checkbox" id="findMatchCase">
-          <label for="findMatchCase">Match case</label>
+          <label for="findMatchCase" data-l10n-id="find_match_case_label">Match case</label>
           <span id="findMsg"></span>
         </div>
         <div class="toolbar">
@@ -118,8 +118,8 @@ limitations under the License.
                 </button>
                 <div class="toolbarButtonSpacer"></div>
 <!--#if !MOZCENTRAL-->
-                <button id="viewFind" class="toolbarButton group" title="Find in Document" tabindex="4" data-l10n-id="find_panel">
-                   <span data-l10n-id="find_panel_label">Find in Document</span>
+                <button id="viewFind" class="toolbarButton group" title="Find in Document" tabindex="4" data-l10n-id="find">
+                   <span data-l10n-id="find_label">Find</span>
                 </button>
 <!--#endif-->
                 <div class="splitToolbarButton">