diff --git a/novelwriter/assets/icons/typicons_dark/icons.conf b/novelwriter/assets/icons/typicons_dark/icons.conf
index 85fa06a7..2e62c460 100644
--- a/novelwriter/assets/icons/typicons_dark/icons.conf
+++ b/novelwriter/assets/icons/typicons_dark/icons.conf
@@ -41,7 +41,7 @@ cls_world       = typ_location.svg
 cross           = typ_times.svg
 down            = typ_chevron-down.svg
 edit            = typ_pencil.svg
-export          = typ_export-button.svg
+export          = typ_export.svg
 forward         = typ_chevron-right.svg
 maximise        = typ_arrow-maximise.svg
 menu            = typ_th-menu.svg
@@ -79,7 +79,7 @@ sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
 unchecked       = mixed_input-unchecked.svg
 up              = typ_chevron-up.svg
-view_build      = typ_export.svg
+view_build      = typ_export-grey.svg
 view_editor     = mixed_edit.svg
 view_novel      = typ_book-grey.svg
 view_outline    = typ_puzzle-outline.svg
diff --git a/novelwriter/assets/icons/typicons_dark/typ_export-button.svg b/novelwriter/assets/icons/typicons_dark/typ_export-button.svg
deleted file mode 100644
index 06452fcb..00000000
--- a/novelwriter/assets/icons/typicons_dark/typ_export-button.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.4444 16.444v0.55556c1.8789-2.8644 4-4.3922 6.6667-4.4444v3.3333c0 0.61222 0.56778 1.1111 1.27 1.1111 0.40444 0 0.75-0.17556 0.98111-0.43444 2.1478-2.2544 6.6378-6.7878 6.6378-6.7878s-4.49-4.5356-6.6389-6.8189c-0.23111-0.22778-0.57556-0.40333-0.98-0.40333-0.70222 0-1.27 0.49667-1.27 1.1111v3.3333c-5.1778 0-6.6667 5.4122-6.6667 9.4444zm-3.3333 5h15.556c0.61444 0 1.1111-0.49778 1.1111-1.1111v-6.7178c-0.73778 0.75111-1.5156 1.5478-2.2222 2.2744v3.3322h-13.333v-13.333h7.7778v-2.2222h-8.8889c-0.61444 0-1.1111 0.49778-1.1111 1.1111v15.556c0 0.61333 0.49667 1.1111 1.1111 1.1111z" fill="#69c" stroke-width="1.1111"/>
-</svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_export-grey.svg b/novelwriter/assets/icons/typicons_dark/typ_export-grey.svg
new file mode 100644
index 00000000..aa6de8d4
--- /dev/null
+++ b/novelwriter/assets/icons/typicons_dark/typ_export-grey.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.8889 16.889v0.61111c2.0668-3.1509 4.4-4.8314 7.3333-4.8889v3.6667c0 0.67344 0.62456 1.2222 1.397 1.2222 0.44489 0 0.825-0.19311 1.0792-0.47789 2.3626-2.4799 7.3016-7.4666 7.3016-7.4666s-4.939-4.9891-7.3028-7.5008c-0.25422-0.25056-0.63311-0.44367-1.078-0.44367-0.77244 0-1.397 0.54633-1.397 1.2222v3.6667c-5.6956 0-7.3333 5.9534-7.3333 10.389zm-3.6667 5.5h17.111c0.67589 0 1.2222-0.54756 1.2222-1.2222v-7.3896c-0.81156 0.82622-1.6671 1.7026-2.4444 2.5019v3.6654h-14.667v-14.667h8.5556v-2.4444h-9.7778c-0.67589 0-1.2222 0.54756-1.2222 1.2222v17.111c0 0.67467 0.54633 1.2222 1.2222 1.2222z" fill="#aeaeae" stroke-width="1.2222"/>
+</svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_export.svg b/novelwriter/assets/icons/typicons_dark/typ_export.svg
index aa6de8d4..06452fcb 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_export.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_export.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.8889 16.889v0.61111c2.0668-3.1509 4.4-4.8314 7.3333-4.8889v3.6667c0 0.67344 0.62456 1.2222 1.397 1.2222 0.44489 0 0.825-0.19311 1.0792-0.47789 2.3626-2.4799 7.3016-7.4666 7.3016-7.4666s-4.939-4.9891-7.3028-7.5008c-0.25422-0.25056-0.63311-0.44367-1.078-0.44367-0.77244 0-1.397 0.54633-1.397 1.2222v3.6667c-5.6956 0-7.3333 5.9534-7.3333 10.389zm-3.6667 5.5h17.111c0.67589 0 1.2222-0.54756 1.2222-1.2222v-7.3896c-0.81156 0.82622-1.6671 1.7026-2.4444 2.5019v3.6654h-14.667v-14.667h8.5556v-2.4444h-9.7778c-0.67589 0-1.2222 0.54756-1.2222 1.2222v17.111c0 0.67467 0.54633 1.2222 1.2222 1.2222z" fill="#aeaeae" stroke-width="1.2222"/>
+ <path d="m6.4444 16.444v0.55556c1.8789-2.8644 4-4.3922 6.6667-4.4444v3.3333c0 0.61222 0.56778 1.1111 1.27 1.1111 0.40444 0 0.75-0.17556 0.98111-0.43444 2.1478-2.2544 6.6378-6.7878 6.6378-6.7878s-4.49-4.5356-6.6389-6.8189c-0.23111-0.22778-0.57556-0.40333-0.98-0.40333-0.70222 0-1.27 0.49667-1.27 1.1111v3.3333c-5.1778 0-6.6667 5.4122-6.6667 9.4444zm-3.3333 5h15.556c0.61444 0 1.1111-0.49778 1.1111-1.1111v-6.7178c-0.73778 0.75111-1.5156 1.5478-2.2222 2.2744v3.3322h-13.333v-13.333h7.7778v-2.2222h-8.8889c-0.61444 0-1.1111 0.49778-1.1111 1.1111v15.556c0 0.61333 0.49667 1.1111 1.1111 1.1111z" fill="#69c" stroke-width="1.1111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_dark/typ_filter.svg b/novelwriter/assets/icons/typicons_dark/typ_filter.svg
index 01e9c667..fd3f3afc 100644
--- a/novelwriter/assets/icons/typicons_dark/typ_filter.svg
+++ b/novelwriter/assets/icons/typicons_dark/typ_filter.svg
@@ -1,16 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg1319"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1323" />
-  <path
-     d="M 20.693511,2.0000002 H 3.306489 c -1.3661232,0 -1.7387023,0.8571428 -0.7451581,2.0000001 l 5.2161068,6.0000007 c 0.993544,1.142857 1.738702,3.285714 1.738702,4.857143 V 22 L 14.48386,19.142857 v -4.999999 c 0,-1.142859 0.745158,-3 1.738702,-4.142857 L 21.438669,4.0000003 C 22.432213,2.857143 22.059634,2.0000002 20.693511,2.0000002 Z"
-     id="path1317"
-     style="fill:#f99157;fill-opacity:1;stroke-width:1.33199" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.694 2h-17.387c-1.3661 0-1.7387 0.85714-0.74516 2l5.2161 6c0.99354 1.1429 1.7387 3.2857 1.7387 4.8571v7.1429l4.9677-2.8571v-5c0-1.1429 0.74516-3 1.7387-4.1429l5.2161-6c0.99354-1.1429 0.62096-2-0.74516-2z" fill="#f99157" stroke-width="1.332"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/icons.conf b/novelwriter/assets/icons/typicons_light/icons.conf
index b2cacaf1..df1d40ee 100644
--- a/novelwriter/assets/icons/typicons_light/icons.conf
+++ b/novelwriter/assets/icons/typicons_light/icons.conf
@@ -41,7 +41,7 @@ cls_world       = typ_location.svg
 cross           = typ_times.svg
 down            = typ_chevron-down.svg
 edit            = typ_pencil.svg
-export          = typ_export-button.svg
+export          = typ_export.svg
 forward         = typ_chevron-right.svg
 maximise        = typ_arrow-maximise.svg
 menu            = typ_th-menu.svg
@@ -79,7 +79,7 @@ sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
 unchecked       = mixed_input-unchecked.svg
 up              = typ_chevron-up.svg
-view_build      = typ_export.svg
+view_build      = typ_export-grey.svg
 view_editor     = mixed_edit.svg
 view_novel      = typ_book-grey.svg
 view_outline    = typ_puzzle-outline.svg
diff --git a/novelwriter/assets/icons/typicons_light/typ_export-button.svg b/novelwriter/assets/icons/typicons_light/typ_export-button.svg
deleted file mode 100644
index 7d43e7a1..00000000
--- a/novelwriter/assets/icons/typicons_light/typ_export-button.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.4444 16.444v0.55556c1.8789-2.8644 4-4.3922 6.6667-4.4444v3.3333c0 0.61222 0.56778 1.1111 1.27 1.1111 0.40444 0 0.75-0.17556 0.98111-0.43444 2.1478-2.2544 6.6378-6.7878 6.6378-6.7878s-4.49-4.5356-6.6389-6.8189c-0.23111-0.22778-0.57556-0.40333-0.98-0.40333-0.70222 0-1.27 0.49667-1.27 1.1111v3.3333c-5.1778 0-6.6667 5.4122-6.6667 9.4444zm-3.3333 5h15.556c0.61444 0 1.1111-0.49778 1.1111-1.1111v-6.7178c-0.73778 0.75111-1.5156 1.5478-2.2222 2.2744v3.3322h-13.333v-13.333h7.7778v-2.2222h-8.8889c-0.61444 0-1.1111 0.49778-1.1111 1.1111v15.556c0 0.61333 0.49667 1.1111 1.1111 1.1111z" fill="#4271ae" stroke-width="1.1111"/>
-</svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_export-grey.svg b/novelwriter/assets/icons/typicons_light/typ_export-grey.svg
new file mode 100644
index 00000000..eed8ef4b
--- /dev/null
+++ b/novelwriter/assets/icons/typicons_light/typ_export-grey.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.8889 16.889v0.61111c2.0668-3.1509 4.4-4.8314 7.3333-4.8889v3.6667c0 0.67344 0.62456 1.2222 1.397 1.2222 0.44489 0 0.825-0.19311 1.0792-0.47789 2.3626-2.4799 7.3016-7.4666 7.3016-7.4666s-4.939-4.9891-7.3028-7.5008c-0.25422-0.25056-0.63311-0.44367-1.078-0.44367-0.77244 0-1.397 0.54633-1.397 1.2222v3.6667c-5.6956 0-7.3333 5.9534-7.3333 10.389zm-3.6667 5.5h17.111c0.67589 0 1.2222-0.54756 1.2222-1.2222v-7.3896c-0.81156 0.82622-1.6671 1.7026-2.4444 2.5019v3.6654h-14.667v-14.667h8.5556v-2.4444h-9.7778c-0.67589 0-1.2222 0.54756-1.2222 1.2222v17.111c0 0.67467 0.54633 1.2222 1.2222 1.2222z" fill-opacity=".72157" stroke-width="1.2222"/>
+</svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_export.svg b/novelwriter/assets/icons/typicons_light/typ_export.svg
index eed8ef4b..7d43e7a1 100644
--- a/novelwriter/assets/icons/typicons_light/typ_export.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_export.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.8889 16.889v0.61111c2.0668-3.1509 4.4-4.8314 7.3333-4.8889v3.6667c0 0.67344 0.62456 1.2222 1.397 1.2222 0.44489 0 0.825-0.19311 1.0792-0.47789 2.3626-2.4799 7.3016-7.4666 7.3016-7.4666s-4.939-4.9891-7.3028-7.5008c-0.25422-0.25056-0.63311-0.44367-1.078-0.44367-0.77244 0-1.397 0.54633-1.397 1.2222v3.6667c-5.6956 0-7.3333 5.9534-7.3333 10.389zm-3.6667 5.5h17.111c0.67589 0 1.2222-0.54756 1.2222-1.2222v-7.3896c-0.81156 0.82622-1.6671 1.7026-2.4444 2.5019v3.6654h-14.667v-14.667h8.5556v-2.4444h-9.7778c-0.67589 0-1.2222 0.54756-1.2222 1.2222v17.111c0 0.67467 0.54633 1.2222 1.2222 1.2222z" fill-opacity=".72157" stroke-width="1.2222"/>
+ <path d="m6.4444 16.444v0.55556c1.8789-2.8644 4-4.3922 6.6667-4.4444v3.3333c0 0.61222 0.56778 1.1111 1.27 1.1111 0.40444 0 0.75-0.17556 0.98111-0.43444 2.1478-2.2544 6.6378-6.7878 6.6378-6.7878s-4.49-4.5356-6.6389-6.8189c-0.23111-0.22778-0.57556-0.40333-0.98-0.40333-0.70222 0-1.27 0.49667-1.27 1.1111v3.3333c-5.1778 0-6.6667 5.4122-6.6667 9.4444zm-3.3333 5h15.556c0.61444 0 1.1111-0.49778 1.1111-1.1111v-6.7178c-0.73778 0.75111-1.5156 1.5478-2.2222 2.2744v3.3322h-13.333v-13.333h7.7778v-2.2222h-8.8889c-0.61444 0-1.1111 0.49778-1.1111 1.1111v15.556c0 0.61333 0.49667 1.1111 1.1111 1.1111z" fill="#4271ae" stroke-width="1.1111"/>
 </svg>
diff --git a/novelwriter/assets/icons/typicons_light/typ_filter.svg b/novelwriter/assets/icons/typicons_light/typ_filter.svg
index e7f86fba..40000608 100644
--- a/novelwriter/assets/icons/typicons_light/typ_filter.svg
+++ b/novelwriter/assets/icons/typicons_light/typ_filter.svg
@@ -1,16 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg1319"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1323" />
-  <path
-     d="M 20.693511,2.0000002 H 3.306489 c -1.3661232,0 -1.7387023,0.8571428 -0.7451581,2.0000001 l 5.2161068,6.0000007 c 0.993544,1.142857 1.738702,3.285714 1.738702,4.857143 V 22 L 14.48386,19.142857 v -4.999999 c 0,-1.142859 0.745158,-3 1.738702,-4.142857 L 21.438669,4.0000003 C 22.432213,2.857143 22.059634,2.0000002 20.693511,2.0000002 Z"
-     id="path1317"
-     style="fill:#f5871f;fill-opacity:1;stroke-width:1.33199" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20.694 2h-17.387c-1.3661 0-1.7387 0.85714-0.74516 2l5.2161 6c0.99354 1.1429 1.7387 3.2857 1.7387 4.8571v7.1429l4.9677-2.8571v-5c0-1.1429 0.74516-3 1.7387-4.1429l5.2161-6c0.99354-1.1429 0.62096-2-0.74516-2z" fill="#f5871f" stroke-width="1.332"/>
 </svg>