diff --git a/theme/icons/go-down-symbolic.svg b/theme/icons/go-down-symbolic.svg
new file mode 100644
index 0000000..a8e40a4
--- /dev/null
+++ b/theme/icons/go-down-symbolic.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
+        <path d="M3.707 5.293L2.293 6.707 8 12.414l5.707-5.707-1.414-1.414L8 9.586z" font-family="sans-serif" font-weight="400" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none"/>
+        <path d="M13 6V5h1v1zM2 6V5h1v1z" overflow="visible"/>
+        <path d="M2 6c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1-1-.446-1-1zm10 0c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1-1-.446-1-1z" overflow="visible"/>
+    </g>
+</svg>
diff --git a/theme/icons/go-up-symbolic.svg b/theme/icons/go-up-symbolic.svg
new file mode 100644
index 0000000..3df4107
--- /dev/null
+++ b/theme/icons/go-up-symbolic.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
+        <path d="M8 3.586L2.293 9.293l1.414 1.414L8 6.414l4.293 4.293 1.414-1.414z" font-family="sans-serif" font-weight="400" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none"/>
+        <path d="M13 10v1h1v-1zM2 10v1h1v-1z" overflow="visible"/>
+        <path d="M2 10c0 .554.446 1 1 1s1-.446 1-1-.446-1-1-1-1 .446-1 1zm10 0c0 .554.446 1 1 1s1-.446 1-1-.446-1-1-1-1 .446-1 1z" overflow="visible"/>
+    </g>
+</svg>
diff --git a/theme/parts/findbar.css b/theme/parts/findbar.css
index 2334c02..8f7f318 100644
--- a/theme/parts/findbar.css
+++ b/theme/parts/findbar.css
@@ -3,6 +3,7 @@
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 findbar {
+	padding: 0 !important;
 	position: relative;
 }
 
@@ -17,6 +18,7 @@ findbar label, findbar description {
 	justify-content: flex-start;
 	position: relative;
 	flex-direction: row;
+	margin: 0 !important;
 	width: calc(100% - 42px);
 }
 
@@ -35,3 +37,7 @@ hbox[anonid="findbar-textbox-wrapper"] {
 .findbar-closebutton {
 	margin: 6px 6px 6px 0 !important;
 }
+
+.findbar-container toolbarbutton .toolbarbutton-text {
+	display: none !important;
+}
diff --git a/theme/parts/icons.css b/theme/parts/icons.css
index dfa4eed..0f7c7da 100644
--- a/theme/parts/icons.css
+++ b/theme/parts/icons.css
@@ -172,6 +172,14 @@ menu[disabled] > .menu-right {
 	width: 16px !important;
 }
 
+/* Findbar */
+.findbar-find-previous {
+    list-style-image: url("../icons/go-up-symbolic.svg") !important;
+}
+.findbar-find-next {
+    list-style-image: url("../icons/go-down-symbolic.svg") !important;
+}
+
 /* Tree views */
 treechildren::-moz-tree-twisty {
 	list-style-image: url("../icons/pan-down-symbolic.svg") !important;