diff --git a/web/viewer.css b/web/viewer.css
index dabae8b11..7855f5552 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -391,12 +391,14 @@ html[dir='ltr'] #toolbarViewerLeft > *,
 html[dir='ltr'] #toolbarViewerMiddle > *,
 html[dir='ltr'] #toolbarViewerRight > *,
 html[dir='ltr'] .findbar > * {
+  position: relative;
   float: left;
 }
 html[dir='rtl'] #toolbarViewerLeft > *,
 html[dir='rtl'] #toolbarViewerMiddle > *,
 html[dir='rtl'] #toolbarViewerRight > *,
 html[dir='rtl'] .findbar > * {
+  position: relative;
   float: right;
 }
 
@@ -747,6 +749,14 @@ html[dir='rtl'] #findPrevious {
 html[dir='rtl'] #findNext {
   margin-left: 3px;
 }
+.toolbarButton::before {
+  /* All matching images have a size of 16x16
+   * (except for the print button: 18x16)
+   * All relevant containers have a size of 32x25 */
+  position: absolute;
+  top: 4px;
+  left: 7px;
+}
 
 html[dir='ltr'] .toolbarButton.findPrevious::before {
   display: inline-block;
@@ -806,6 +816,7 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
 .toolbarButton.print::before {
   display: inline-block;
   content: url(images/toolbarButton-print.png);
+  left: 6px;
 }
 
 .toolbarButton.openFile::before {