diff --git a/android/res/drawable-hdpi/cr3_browser_back_hc.png b/android/res/drawable-hdpi/cr3_browser_back_hc.png
index bbf9037d52..aa3157e250 100644
Binary files a/android/res/drawable-hdpi/cr3_browser_back_hc.png and b/android/res/drawable-hdpi/cr3_browser_back_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_browser_folder_opds_add_hc.png b/android/res/drawable-hdpi/cr3_browser_folder_opds_add_hc.png
index fc9f791708..80b895ea9b 100644
Binary files a/android/res/drawable-hdpi/cr3_browser_folder_opds_add_hc.png and b/android/res/drawable-hdpi/cr3_browser_folder_opds_add_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_browser_folder_root_hc.png b/android/res/drawable-hdpi/cr3_browser_folder_root_hc.png
index 44674a6f2d..d8cd3549c1 100644
Binary files a/android/res/drawable-hdpi/cr3_browser_folder_root_hc.png and b/android/res/drawable-hdpi/cr3_browser_folder_root_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_browser_folder_zip_hc.png b/android/res/drawable-hdpi/cr3_browser_folder_zip_hc.png
new file mode 100644
index 0000000000..d0f231adee
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_browser_folder_zip_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_add_hc.png b/android/res/drawable-hdpi/cr3_button_add_hc.png
new file mode 100644
index 0000000000..2133c8c4ca
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_add_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_cancel_hc.png b/android/res/drawable-hdpi/cr3_button_cancel_hc.png
new file mode 100644
index 0000000000..bab0def218
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_cancel_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_next_hc.png b/android/res/drawable-hdpi/cr3_button_next_hc.png
index b1e16ec075..bd0f38bde9 100644
Binary files a/android/res/drawable-hdpi/cr3_button_next_hc.png and b/android/res/drawable-hdpi/cr3_button_next_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_ok_hc.png b/android/res/drawable-hdpi/cr3_button_ok_hc.png
new file mode 100644
index 0000000000..19dee6cf08
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_button_ok_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_button_prev_hc.png b/android/res/drawable-hdpi/cr3_button_prev_hc.png
index e503e7de22..1f271e43d1 100644
Binary files a/android/res/drawable-hdpi/cr3_button_prev_hc.png and b/android/res/drawable-hdpi/cr3_button_prev_hc.png differ
diff --git a/android/res/drawable-hdpi/cr3_option_night_hc.png b/android/res/drawable-hdpi/cr3_option_night_hc.png
index 525bcad5cd..6a36d850dd 100644
Binary files a/android/res/drawable-hdpi/cr3_option_night_hc.png and b/android/res/drawable-hdpi/cr3_option_night_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_browser_back_hc.png b/android/res/drawable-ldpi/cr3_browser_back_hc.png
index b3069ad85f..2dc9f0f478 100644
Binary files a/android/res/drawable-ldpi/cr3_browser_back_hc.png and b/android/res/drawable-ldpi/cr3_browser_back_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_browser_folder_opds_add_hc.png b/android/res/drawable-ldpi/cr3_browser_folder_opds_add_hc.png
index 8346ed2dfc..824e65c647 100644
Binary files a/android/res/drawable-ldpi/cr3_browser_folder_opds_add_hc.png and b/android/res/drawable-ldpi/cr3_browser_folder_opds_add_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_browser_folder_root_hc.png b/android/res/drawable-ldpi/cr3_browser_folder_root_hc.png
index 3b31f5091c..12d78a304a 100644
Binary files a/android/res/drawable-ldpi/cr3_browser_folder_root_hc.png and b/android/res/drawable-ldpi/cr3_browser_folder_root_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_browser_folder_zip_hc.png b/android/res/drawable-ldpi/cr3_browser_folder_zip_hc.png
new file mode 100644
index 0000000000..ae04bfa804
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_browser_folder_zip_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_add_hc.png b/android/res/drawable-ldpi/cr3_button_add_hc.png
new file mode 100644
index 0000000000..350586517d
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_add_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_cancel_hc.png b/android/res/drawable-ldpi/cr3_button_cancel_hc.png
new file mode 100644
index 0000000000..3b535f0ed2
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_cancel_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_next_hc.png b/android/res/drawable-ldpi/cr3_button_next_hc.png
index 038e9eb2af..66678a6948 100644
Binary files a/android/res/drawable-ldpi/cr3_button_next_hc.png and b/android/res/drawable-ldpi/cr3_button_next_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_ok_hc.png b/android/res/drawable-ldpi/cr3_button_ok_hc.png
new file mode 100644
index 0000000000..730961925e
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_button_ok_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_button_prev_hc.png b/android/res/drawable-ldpi/cr3_button_prev_hc.png
index a25ddbaaa0..be5d7537b4 100644
Binary files a/android/res/drawable-ldpi/cr3_button_prev_hc.png and b/android/res/drawable-ldpi/cr3_button_prev_hc.png differ
diff --git a/android/res/drawable-ldpi/cr3_option_night_hc.png b/android/res/drawable-ldpi/cr3_option_night_hc.png
index 23310c707e..50ada87292 100644
Binary files a/android/res/drawable-ldpi/cr3_option_night_hc.png and b/android/res/drawable-ldpi/cr3_option_night_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_browser_back_hc.png b/android/res/drawable-mdpi/cr3_browser_back_hc.png
index b35374c95d..3cf1cb7830 100644
Binary files a/android/res/drawable-mdpi/cr3_browser_back_hc.png and b/android/res/drawable-mdpi/cr3_browser_back_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_browser_folder_opds_add_hc.png b/android/res/drawable-mdpi/cr3_browser_folder_opds_add_hc.png
index 8a1aa83c35..88f079e448 100644
Binary files a/android/res/drawable-mdpi/cr3_browser_folder_opds_add_hc.png and b/android/res/drawable-mdpi/cr3_browser_folder_opds_add_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_browser_folder_root_hc.png b/android/res/drawable-mdpi/cr3_browser_folder_root_hc.png
index 2cf57c6bf3..118e3e3029 100644
Binary files a/android/res/drawable-mdpi/cr3_browser_folder_root_hc.png and b/android/res/drawable-mdpi/cr3_browser_folder_root_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_browser_folder_zip_hc.png b/android/res/drawable-mdpi/cr3_browser_folder_zip_hc.png
new file mode 100644
index 0000000000..99663499d9
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_browser_folder_zip_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_add_hc.png b/android/res/drawable-mdpi/cr3_button_add_hc.png
new file mode 100644
index 0000000000..a167e0aea6
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_add_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_cancel_hc.png b/android/res/drawable-mdpi/cr3_button_cancel_hc.png
new file mode 100644
index 0000000000..6631310a04
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_cancel_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_next_hc.png b/android/res/drawable-mdpi/cr3_button_next_hc.png
index 7b016f8b95..5293a5a579 100644
Binary files a/android/res/drawable-mdpi/cr3_button_next_hc.png and b/android/res/drawable-mdpi/cr3_button_next_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_ok_hc.png b/android/res/drawable-mdpi/cr3_button_ok_hc.png
new file mode 100644
index 0000000000..1ce4e6e592
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_button_ok_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_button_prev_hc.png b/android/res/drawable-mdpi/cr3_button_prev_hc.png
index 4a31782cba..90f0417673 100644
Binary files a/android/res/drawable-mdpi/cr3_button_prev_hc.png and b/android/res/drawable-mdpi/cr3_button_prev_hc.png differ
diff --git a/android/res/drawable-mdpi/cr3_option_night_hc.png b/android/res/drawable-mdpi/cr3_option_night_hc.png
index e5e96843bc..7a17d4a0d1 100644
Binary files a/android/res/drawable-mdpi/cr3_option_night_hc.png and b/android/res/drawable-mdpi/cr3_option_night_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_browser_back_hc.png b/android/res/drawable-xhdpi/cr3_browser_back_hc.png
index 79f367a68f..98bb0fe794 100644
Binary files a/android/res/drawable-xhdpi/cr3_browser_back_hc.png and b/android/res/drawable-xhdpi/cr3_browser_back_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_browser_folder_opds_add_hc.png b/android/res/drawable-xhdpi/cr3_browser_folder_opds_add_hc.png
index fbde7b9e1c..fe50914909 100644
Binary files a/android/res/drawable-xhdpi/cr3_browser_folder_opds_add_hc.png and b/android/res/drawable-xhdpi/cr3_browser_folder_opds_add_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_browser_folder_root_hc.png b/android/res/drawable-xhdpi/cr3_browser_folder_root_hc.png
index a55c7f95e8..8244c0eb88 100644
Binary files a/android/res/drawable-xhdpi/cr3_browser_folder_root_hc.png and b/android/res/drawable-xhdpi/cr3_browser_folder_root_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_browser_folder_zip_hc.png b/android/res/drawable-xhdpi/cr3_browser_folder_zip_hc.png
new file mode 100644
index 0000000000..5c6ffb5bff
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_browser_folder_zip_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_add_hc.png b/android/res/drawable-xhdpi/cr3_button_add_hc.png
new file mode 100644
index 0000000000..809877bbb1
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_add_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_cancel_hc.png b/android/res/drawable-xhdpi/cr3_button_cancel_hc.png
new file mode 100644
index 0000000000..a4525e6636
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_cancel_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_next_hc.png b/android/res/drawable-xhdpi/cr3_button_next_hc.png
index 8298153e2d..752c87795f 100644
Binary files a/android/res/drawable-xhdpi/cr3_button_next_hc.png and b/android/res/drawable-xhdpi/cr3_button_next_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_ok_hc.png b/android/res/drawable-xhdpi/cr3_button_ok_hc.png
new file mode 100644
index 0000000000..a8e7c0a604
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_button_ok_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_button_prev_hc.png b/android/res/drawable-xhdpi/cr3_button_prev_hc.png
index b4ee2f0db9..fd280a06bf 100644
Binary files a/android/res/drawable-xhdpi/cr3_button_prev_hc.png and b/android/res/drawable-xhdpi/cr3_button_prev_hc.png differ
diff --git a/android/res/drawable-xhdpi/cr3_option_night_hc.png b/android/res/drawable-xhdpi/cr3_option_night_hc.png
index 3f2e8c3e87..d6e3133ff6 100644
Binary files a/android/res/drawable-xhdpi/cr3_option_night_hc.png and b/android/res/drawable-xhdpi/cr3_option_night_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_browser_back_hc.png b/android/res/drawable-xxhdpi/cr3_browser_back_hc.png
index 529d897f95..ea84dfeccd 100644
Binary files a/android/res/drawable-xxhdpi/cr3_browser_back_hc.png and b/android/res/drawable-xxhdpi/cr3_browser_back_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_browser_folder_opds_add_hc.png b/android/res/drawable-xxhdpi/cr3_browser_folder_opds_add_hc.png
index 1994643d60..ae39697434 100644
Binary files a/android/res/drawable-xxhdpi/cr3_browser_folder_opds_add_hc.png and b/android/res/drawable-xxhdpi/cr3_browser_folder_opds_add_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_browser_folder_root_hc.png b/android/res/drawable-xxhdpi/cr3_browser_folder_root_hc.png
index f0ac7c44a6..9d1056921c 100644
Binary files a/android/res/drawable-xxhdpi/cr3_browser_folder_root_hc.png and b/android/res/drawable-xxhdpi/cr3_browser_folder_root_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_browser_folder_zip_hc.png b/android/res/drawable-xxhdpi/cr3_browser_folder_zip_hc.png
new file mode 100644
index 0000000000..7f66a850f8
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_browser_folder_zip_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_add_hc.png b/android/res/drawable-xxhdpi/cr3_button_add_hc.png
new file mode 100644
index 0000000000..e292845ea7
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_add_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_cancel_hc.png b/android/res/drawable-xxhdpi/cr3_button_cancel_hc.png
new file mode 100644
index 0000000000..9c805517d0
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_cancel_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_next_hc.png b/android/res/drawable-xxhdpi/cr3_button_next_hc.png
index 71c2898447..fff058b6d9 100644
Binary files a/android/res/drawable-xxhdpi/cr3_button_next_hc.png and b/android/res/drawable-xxhdpi/cr3_button_next_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_ok_hc.png b/android/res/drawable-xxhdpi/cr3_button_ok_hc.png
new file mode 100644
index 0000000000..5c8ceccde9
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_button_ok_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_button_prev_hc.png b/android/res/drawable-xxhdpi/cr3_button_prev_hc.png
index a981093544..5e050deda8 100644
Binary files a/android/res/drawable-xxhdpi/cr3_button_prev_hc.png and b/android/res/drawable-xxhdpi/cr3_button_prev_hc.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_option_night_hc.png b/android/res/drawable-xxhdpi/cr3_option_night_hc.png
index ddbf71fa6e..1afe022d32 100644
Binary files a/android/res/drawable-xxhdpi/cr3_option_night_hc.png and b/android/res/drawable-xxhdpi/cr3_option_night_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_browser_back_hc.png b/android/res/drawable-xxxhdpi/cr3_browser_back_hc.png
index a66e08b45b..b9cf83591b 100644
Binary files a/android/res/drawable-xxxhdpi/cr3_browser_back_hc.png and b/android/res/drawable-xxxhdpi/cr3_browser_back_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_browser_folder_opds_add_hc.png b/android/res/drawable-xxxhdpi/cr3_browser_folder_opds_add_hc.png
index ee8ecf5b0a..3189ad735c 100644
Binary files a/android/res/drawable-xxxhdpi/cr3_browser_folder_opds_add_hc.png and b/android/res/drawable-xxxhdpi/cr3_browser_folder_opds_add_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_browser_folder_root_hc.png b/android/res/drawable-xxxhdpi/cr3_browser_folder_root_hc.png
index 3677581b97..e509f05f15 100644
Binary files a/android/res/drawable-xxxhdpi/cr3_browser_folder_root_hc.png and b/android/res/drawable-xxxhdpi/cr3_browser_folder_root_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_browser_folder_zip_hc.png b/android/res/drawable-xxxhdpi/cr3_browser_folder_zip_hc.png
new file mode 100644
index 0000000000..069e6f5b6d
Binary files /dev/null and b/android/res/drawable-xxxhdpi/cr3_browser_folder_zip_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_button_add_hc.png b/android/res/drawable-xxxhdpi/cr3_button_add_hc.png
new file mode 100644
index 0000000000..97722eb62d
Binary files /dev/null and b/android/res/drawable-xxxhdpi/cr3_button_add_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_button_cancel_hc.png b/android/res/drawable-xxxhdpi/cr3_button_cancel_hc.png
new file mode 100644
index 0000000000..24080057ef
Binary files /dev/null and b/android/res/drawable-xxxhdpi/cr3_button_cancel_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_button_next_hc.png b/android/res/drawable-xxxhdpi/cr3_button_next_hc.png
index 2a25d8b8f9..67bd3e9f0d 100644
Binary files a/android/res/drawable-xxxhdpi/cr3_button_next_hc.png and b/android/res/drawable-xxxhdpi/cr3_button_next_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_button_ok_hc.png b/android/res/drawable-xxxhdpi/cr3_button_ok_hc.png
new file mode 100644
index 0000000000..a8db43aa11
Binary files /dev/null and b/android/res/drawable-xxxhdpi/cr3_button_ok_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_button_prev_hc.png b/android/res/drawable-xxxhdpi/cr3_button_prev_hc.png
index 73b8bf7eee..2ff4c49f88 100644
Binary files a/android/res/drawable-xxxhdpi/cr3_button_prev_hc.png and b/android/res/drawable-xxxhdpi/cr3_button_prev_hc.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_option_night_hc.png b/android/res/drawable-xxxhdpi/cr3_option_night_hc.png
index 560c30cbe0..830685bf2a 100644
Binary files a/android/res/drawable-xxxhdpi/cr3_option_night_hc.png and b/android/res/drawable-xxxhdpi/cr3_option_night_hc.png differ
diff --git a/android/res/layout/base_dialog.xml b/android/res/layout/base_dialog.xml
index c7490b61fb..83896ef1af 100644
--- a/android/res/layout/base_dialog.xml
+++ b/android/res/layout/base_dialog.xml
@@ -52,7 +52,7 @@
             android:layout_marginRight="5dip"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:src="@drawable/cr3_button_ok"
+            android:src="?attr/cr3_button_ok_drawable"
             android:focusable="false"
             android:focusableInTouchMode="false"
             android:background="@null"
@@ -65,7 +65,7 @@
             android:layout_marginLeft="5dip"
             android:layout_marginRight="5dip"
             android:layout_centerVertical="true"
-            android:src="@drawable/cr3_button_cancel"
+            android:src="?attr/cr3_button_cancel_drawable"
             android:focusable="false"
             android:focusableInTouchMode="false"
             android:background="@null"
diff --git a/android/res/values/attrs.xml b/android/res/values/attrs.xml
index fe14d663dd..694f12905d 100644
--- a/android/res/values/attrs.xml
+++ b/android/res/values/attrs.xml
@@ -68,6 +68,8 @@
     <attr name="cr3_browser_find_drawable" format="reference" />
     <attr name="cr3_browser_back_drawable" format="reference" />
     <attr name="cr3_button_add_drawable" format="reference" />
+    <attr name="cr3_button_ok_drawable" format="reference" />
+    <attr name="cr3_button_cancel_drawable" format="reference" />
 
     <attr name="folder_big_drawable" format="reference" />
     <attr name="folder_big_bookmark_drawable" format="reference" />
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index a3dfa9ec7d..f955b8735e 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -123,6 +123,8 @@
         <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find</item>
         <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back</item>
         <item name="cr3_button_add_drawable">@drawable/cr3_button_add</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel</item>
 
         <item name="folder_big_drawable">@drawable/folder_blue</item>
         <item name="folder_big_bookmark_drawable">@drawable/folder_bookmark</item>
@@ -196,6 +198,8 @@
         <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find</item>
         <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back</item>
         <item name="cr3_button_add_drawable">@drawable/cr3_button_add</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel</item>
 
         <item name="folder_big_drawable">@drawable/folder_blue</item>
         <item name="folder_big_bookmark_drawable">@drawable/folder_bookmark</item>
@@ -270,6 +274,8 @@
         <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find</item>
         <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back</item>
         <item name="cr3_button_add_drawable">@drawable/cr3_button_add</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel</item>
 
         <item name="folder_big_drawable">@drawable/folder_blue</item>
         <item name="folder_big_bookmark_drawable">@drawable/folder_bookmark</item>
@@ -344,6 +350,8 @@
         <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find</item>
         <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back</item>
         <item name="cr3_button_add_drawable">@drawable/cr3_button_add</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel</item>
 
         <item name="folder_big_drawable">@drawable/folder_blue</item>
         <item name="folder_big_bookmark_drawable">@drawable/folder_bookmark</item>
@@ -419,6 +427,8 @@
         <item name="cr3_browser_find_drawable">@drawable/cr3_browser_find_hc</item>
         <item name="cr3_browser_back_drawable">@drawable/cr3_browser_back_hc</item>
         <item name="cr3_button_add_drawable">@drawable/cr3_button_add_hc</item>
+        <item name="cr3_button_ok_drawable">@drawable/cr3_button_ok_hc</item>
+        <item name="cr3_button_cancel_drawable">@drawable/cr3_button_cancel_hc</item>
 
         <item name="folder_big_drawable">@drawable/folder_big_hc</item>
         <item name="folder_big_bookmark_drawable">@drawable/folder_big_bookmark_hc</item>
diff --git a/icons_src/convert_all.pl b/icons_src/convert_all.pl
index 4906faccac..437f37ca57 100755
--- a/icons_src/convert_all.pl
+++ b/icons_src/convert_all.pl
@@ -15,8 +15,8 @@
 	'cr3_viewer_find_hc-48x48-src.svg' => 'cr3_viewer_find_hc.png',
 	'cr3_viewer_settings_hc-256x256-src.svg' => 'cr3_viewer_settings_hc.png',
 	'cr3_button_bookmarks_hc-48x48-src.svg' => 'cr3_button_bookmarks_hc.png',
-	'cr3_browser_folder_root_hc-256x256-src.svg' => 'cr3_browser_folder_root_hc.png',
-	'cr3_option_night_hc-256x256-src.svg' => 'cr3_option_night_hc.png',
+	'cr3_browser_folder_root_hc-48x48-src.svg' => 'cr3_browser_folder_root_hc.png',
+	'cr3_option_night_hc-48x48-src.svg' => 'cr3_option_night_hc.png',
 	'cr3_option_touch_hc-256x256-src.svg' => 'cr3_option_touch_hc.png',
 	'cr3_button_go_page_hc-256x256-src.svg' => 'cr3_button_go_page_hc.png',
 	'cr3_button_go_percent_hc-256x256-src.svg' => 'cr3_button_go_percent_hc.png',
@@ -63,7 +63,9 @@
 	'cr3_browser_folder_zip_hc-48x48-src.svg' => 'cr3_browser_folder_zip_hc.png',
 	'cr3_browser_find_hc-48x48-src.svg' => 'cr3_browser_find_hc.png',
 	'cr3_browser_back_hc-48x48-src.svg' => 'cr3_browser_back_hc.png',
-	'cr3_button_add_hc-48x48-src.svg' => 'cr3_button_add_hc.png'
+	'cr3_button_add_hc-48x48-src.svg' => 'cr3_button_add_hc.png',
+	'cr3_button_ok_hc-48x48-src.svg' => 'cr3_button_ok_hc.png',
+	'cr3_button_cancel_hc-48x48-src.svg' => 'cr3_button_cancel_hc.png'
 );
 
 my %ic_menu_list=(
diff --git a/icons_src/cr3_browser_folder_root-48x48-src.svg b/icons_src/cr3_browser_folder_root-48x48-src.svg
new file mode 100644
index 0000000000..a5395def80
--- /dev/null
+++ b/icons_src/cr3_browser_folder_root-48x48-src.svg
@@ -0,0 +1,486 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_browser_folder_root-48x48-src.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1089">
+      <stop
+         style="stop-color:#0056a8;stop-opacity:1"
+         offset="0"
+         id="stop1085" />
+      <stop
+         style="stop-color:#3b9fff;stop-opacity:1"
+         offset="1"
+         id="stop1087" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1079">
+      <stop
+         style="stop-color:#939393;stop-opacity:1"
+         offset="0"
+         id="stop1075" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1077" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2368"
+       id="radialGradient2374"
+       cx="29.913452"
+       cy="30.442923"
+       fx="29.913452"
+       fy="30.442923"
+       r="4.001883"
+       gradientTransform="matrix(3.751495,0,0,3.147818,-150.34014,217.6351)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2368">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2370" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2372" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2341"
+       id="radialGradient2339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.100086,0,0,-4.201322,-73.529188,388.69564)"
+       cx="11.68129"
+       cy="19.554111"
+       fx="11.68129"
+       fy="19.554111"
+       r="8.2452126" />
+    <linearGradient
+       id="linearGradient2341">
+      <stop
+         id="stop2343"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop2345"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2368"
+       id="radialGradient2305"
+       cx="7.5326638"
+       cy="24.202574"
+       fx="7.5326638"
+       fy="24.202574"
+       r="8.2452126"
+       gradientTransform="matrix(4.100086,0,0,4.201322,-93.746138,204.80247)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="XMLID_39_"
+       gradientUnits="userSpaceOnUse"
+       x1="64.387703"
+       y1="65.124001"
+       x2="64.387703"
+       y2="35.569"
+       gradientTransform="matrix(0.354101,0,0,0.354101,-66.6924,283.2585)">
+      <stop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="stop336" />
+      <stop
+         offset="0.8539"
+         style="stop-color:#FF6200"
+         id="stop338" />
+      <stop
+         offset="1"
+         style="stop-color:#F25D00"
+         id="stop340" />
+      <midPointStop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="midPointStop335" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF"
+         id="midPointStop337" />
+      <midPointStop
+         offset="0.8539"
+         style="stop-color:#FF6200"
+         id="midPointStop339" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#FF6200"
+         id="midPointStop341" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#F25D00"
+         id="midPointStop343" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2307"
+       id="radialGradient2313"
+       cx="19.985598"
+       cy="36.77816"
+       fx="19.985598"
+       fy="36.77816"
+       r="1.0821035"
+       gradientTransform="matrix(1.125263,0,0,0.982744,-71.759757,283.90793)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2307">
+      <stop
+         style="stop-color:#edd400;stop-opacity:1;"
+         offset="0"
+         id="stop2309" />
+      <stop
+         style="stop-color:#998800;stop-opacity:1;"
+         offset="1"
+         id="stop2311" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2341"
+       id="radialGradient2325-3"
+       cx="20.443665"
+       cy="37.425831"
+       fx="20.443665"
+       fy="37.425831"
+       r="1.0821035"
+       gradientTransform="matrix(1.125263,0,0,0.982744,-71.759757,284.07325)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2406"
+       id="linearGradient2412"
+       x1="17.850183"
+       y1="28.939463"
+       x2="19.040216"
+       y2="41.03223"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.888785,0,0,1.08932,-65.920089,281.81781)" />
+    <linearGradient
+       id="linearGradient2406">
+      <stop
+         style="stop-color:#7c7e79;stop-opacity:1;"
+         offset="0"
+         id="stop2408" />
+      <stop
+         id="stop2414"
+         offset="0.1724138"
+         style="stop-color:#848681;stop-opacity:1;" />
+      <stop
+         style="stop-color:#898c86;stop-opacity:1;"
+         offset="1"
+         id="stop2410" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2378"
+       id="radialGradient2384"
+       cx="24.195112"
+       cy="10.577631"
+       fx="24.195112"
+       fy="10.577631"
+       r="15.242914"
+       gradientTransform="matrix(1.125263,-3.585417e-8,4.269819e-8,1.340059,-71.337783,284.69754)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2378">
+      <stop
+         style="stop-color:#575757;stop-opacity:1;"
+         offset="0"
+         id="stop2380" />
+      <stop
+         style="stop-color:#575757;stop-opacity:0;"
+         offset="1"
+         id="stop2382" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2329"
+       id="linearGradient2335"
+       x1="17.602522"
+       y1="26.057423"
+       x2="17.682528"
+       y2="32.654099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.898789,0,0,1.071914,-67.853054,281.26131)" />
+    <linearGradient
+       id="linearGradient2329">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.18556701;"
+         offset="0"
+         id="stop2331" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2333" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_2_"
+       id="linearGradient1514"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.336922,0,0,0.166888,-50.348198,298.80365)"
+       x1="52.006104"
+       y1="166.1331"
+       x2="14.049017"
+       y2="-42.218513" />
+    <linearGradient
+       id="XMLID_2_"
+       gradientUnits="userSpaceOnUse"
+       x1="80.223602"
+       y1="117.5205"
+       x2="48.046001"
+       y2="59.7995"
+       gradientTransform="matrix(0.314683,0,0,0.314683,4.128264,3.742874)">
+      <stop
+         offset="0"
+         style="stop-color:#CCCCCC"
+         id="stop17" />
+      <stop
+         offset="0.9831"
+         style="stop-color:#FFFFFF"
+         id="stop19" />
+      <midPointStop
+         offset="0"
+         style="stop-color:#CCCCCC"
+         id="midPointStop48" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#CCCCCC"
+         id="midPointStop50" />
+      <midPointStop
+         offset="0.9831"
+         style="stop-color:#FFFFFF"
+         id="midPointStop52" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1079"
+       id="linearGradient1081"
+       x1="24.632111"
+       y1="289.0332"
+       x2="24.365213"
+       y2="313.96078"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1089"
+       id="linearGradient1091"
+       x1="24.001362"
+       y1="290.08099"
+       x2="24.001362"
+       y2="295.29794"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.00973313)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="21.304587"
+     inkscape:cy="24.52675"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1391"
+     inkscape:window-height="964"
+     inkscape:window-x="521"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true"
+     objecttolerance="2"
+     guidetolerance="2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29997)">
+    <path
+       style="fill:url(#linearGradient1081);fill-rule:evenodd;stroke:#0056a8;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
+       d="m 5,289.29997 h 38 v 38 H 5 Z"
+       id="path1062"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g1060"
+       transform="matrix(0.63324251,0,0,0.63324251,51.987044,116.6648)">
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect1512-6"
+         d="m -46.711502,291.52552 h 5.957459 c 0.839732,0 13.886475,15.43532 13.886475,16.34066 l -0.443521,18.49674 c 0,0.90533 -0.67603,1.63418 -1.515762,1.63418 h -31.457278 c -0.839733,0 -1.515763,-0.72885 -1.515763,-1.63418 l 0.05648,-18.49674 c 0,-0.90534 14.19218,-16.34066 15.031912,-16.34066 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1514);fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:1.0000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -21.367503,329.07772 h -45.324899 v -45.3249 h 45.324899 z"
+         id="path5-7"
+         style="fill:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         d="m -45.331078,312.34214 -0.04574,15.09095 h -11.842796 l -0.111465,-15.09095 z"
+         id="path2327-5"
+         style="clip-rule:evenodd;fill:url(#linearGradient2335);fill-opacity:1;fill-rule:evenodd"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3125;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m -46.550619,292.74773 h 5.559097 c 0.783582,0 13.000869,14.39959 13.000869,15.24417 l -0.347158,18.21231 c 0,0.45926 -0.143737,0.65347 -0.512375,0.65347 l -31.387203,0.0143 c -0.368638,0 -0.583964,-0.0799 -0.583964,-0.45355 l 0.215342,-18.42651 c 0,-0.84458 13.271813,-15.24417 14.055392,-15.24417 z"
+         id="path2357"
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         style="clip-rule:evenodd;opacity:0.2;fill:url(#radialGradient2384);fill-opacity:1;fill-rule:evenodd"
+         id="path23"
+         d="m -61.123549,311.2852 -0.05426,2.59519 18.368164,-13.17925 15.286395,11.15442 0.07131,-0.31171 -16.370456,-15.90413 z"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         style="clip-rule:evenodd;fill:url(#linearGradient2412);fill-opacity:1;fill-rule:evenodd"
+         id="path188"
+         d="m -46.331078,313.34214 v 14.09095 h -9.811029 l -0.188971,-14.09095 z"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -48.754222,319.78981 c 0.67279,0 1.216616,0.47461 1.216616,1.05851 0,0.58981 -0.543826,1.06836 -1.216616,1.06836 -0.672272,0 -1.218686,-0.47855 -1.218686,-1.06836 5.15e-4,-0.5839 0.546414,-1.05851 1.218686,-1.05851 z"
+         id="path2315-3"
+         style="clip-rule:evenodd;opacity:0.40909089;fill:url(#radialGradient2325-3);fill-opacity:1;fill-rule:evenodd"
+         inkscape:connector-curvature="0" />
+      <path
+         style="clip-rule:evenodd;fill:url(#radialGradient2313);fill-opacity:1;fill-rule:evenodd"
+         id="path217-5"
+         d="m -48.868764,319.27437 c 0.672789,0 1.216615,0.47461 1.216615,1.05851 0,0.58981 -0.543826,1.06835 -1.216615,1.06835 -0.672273,0 -1.218687,-0.47854 -1.218687,-1.06835 5.15e-4,-0.5839 0.546414,-1.05851 1.218687,-1.05851 z"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         style="fill:url(#XMLID_39_)"
+         id="path342"
+         d="m -43.88333,294.90148 18.92706,17.16987 0.494679,0.39199 0.403676,-0.17139 -0.37287,-0.76167 -0.277614,-0.22343 -19.174931,-15.57231 -19.389516,15.74333 -0.237602,0.14412 -0.21671,0.70679 0.43342,0.12925 0.384554,-0.30842 z"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         d="m -44.00091,285.61348 -21.881739,18.10134 -0.624729,7.16593 1.999936,2.06432 c 0,0 20.407382,-17.15729 20.624094,-17.32796 l 19.63254,17.54326 1.898424,-2.324 -1.615791,-7.11137 -19.915173,-18.21598 z"
+         id="path362-6"
+         style="fill:#ef2929;stroke:#a40000"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path1536"
+         d="m -65.489734,303.95527 -0.291555,6.62337 21.81943,-18.25642 -0.07033,-5.89333 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40909089;fill:url(#radialGradient2305);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.13636367;fill:url(#radialGradient2339);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m -43.847315,292.09313 0.09946,-5.8411 19.328963,17.65195 1.491812,6.50082 z"
+         id="path2337"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect2361-2"
+         d="m -41.22885,311.06197 h 9.039995 c 0.770595,0 1.390967,0.62037 1.390967,1.39096 l -0.008,9.07923 c 0,0.77059 -0.596322,1.26596 -1.366918,1.26596 h -9.056083 c -0.770597,0 -1.390967,-0.62037 -1.390967,-1.39096 v -8.95423 c 0,-0.77059 0.62037,-1.39096 1.390967,-1.39096 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.31818183;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+      <rect
+         ry="0.38128215"
+         rx="0.38128215"
+         y="311.85641"
+         x="-41.823311"
+         height="9.9624557"
+         width="10.001333"
+         id="rect3263-9"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="rect2363"
+         d="m -41.22396,317.7504 c 3.617983,0.33118 5.527724,-1.4457 8.868152,-1.55274 l 0.02473,-3.84949 -8.911612,-0.006 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.39772728;fill:url(#radialGradient2374);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <rect
+       style="opacity:1;fill:url(#linearGradient1091);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3;stroke-opacity:1"
+       id="rect1083"
+       width="35.997959"
+       height="4.9239502"
+       x="6.0013628"
+       y="290.28702"
+       rx="0"
+       ry="0" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3;stroke-opacity:0.6751055"
+       id="rect1093"
+       width="34.504757"
+       height="31.088867"
+       x="6.75"
+       y="294.45621"
+       rx="0"
+       ry="0" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3;stroke-opacity:0.5443038"
+       id="rect1093-1"
+       width="34.504757"
+       height="3.4506836"
+       x="6.75"
+       y="291.00552"
+       rx="0"
+       ry="0" />
+  </g>
+</svg>
diff --git a/icons_src/cr3_browser_folder_root_hc-256x256-src.svg b/icons_src/cr3_browser_folder_root_hc-256x256-src.svg
deleted file mode 100644
index c3ef8f5443..0000000000
--- a/icons_src/cr3_browser_folder_root_hc-256x256-src.svg
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   viewBox="0 0 67.733332 67.733335"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="cr3_browser_folder_root_hc-256x256-src.svg">
-  <defs
-     id="defs2">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2341"
-       id="radialGradient2325"
-       cx="20.443665"
-       cy="37.425831"
-       fx="20.443665"
-       fy="37.425831"
-       r="1.0821035"
-       gradientTransform="matrix(0.29772583,0,0,0.26001768,17.028724,264.89961)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="142.90664"
-     inkscape:cy="110.20504"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1391"
-     inkscape:window-height="964"
-     inkscape:window-x="25"
-     inkscape:window-y="12"
-     inkscape:window-maximized="0"
-     inkscape:pagecheckerboard="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-229.26664)">
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.61184096;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1017"
-       width="63.5"
-       height="63.5"
-       x="2.1166668"
-       y="231.3833" />
-    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.17206144;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 5.5566406,234.82227 v 56.62109 H 62.177734 v -56.62109 z m 4.171875,9.26104 H 58.005859 l 0,43.18817 H 9.7285156 Z"
-       id="rect1013"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc" />
-    <g
-       id="g993"
-       transform="matrix(3.3055187,0,0,3.3055187,-46.343453,-630.17985)">
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="rect1512"
-         d="m 23.656075,266.87136 h 1.576244 c 0.222179,0 3.67413,4.08393 3.67413,4.32346 l -0.117348,4.89393 c 0,0.23954 -0.178866,0.43238 -0.401046,0.43238 h -8.323071 c -0.222179,0 -0.401046,-0.19284 -0.401046,-0.43238 l 0.01494,-4.89393 c 0,-0.23953 3.755014,-4.32346 3.977194,-4.32346 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.48025745;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 30.361675,276.80704 H 18.369462 v -11.99221 h 11.992213 z"
-         id="path5"
-         style="fill:none;stroke-width:0.26458332"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         d="m 24.021312,272.37909 -0.0121,3.99281 h -3.133406 l -0.02949,-3.99281 z"
-         id="path2327"
-         style="clip-rule:evenodd;fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.48025745;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 23.115605,274.34962 c 0.178009,0 0.321896,0.12557 0.321896,0.28006 0,0.15606 -0.143887,0.28267 -0.321896,0.28267 -0.177872,0 -0.322444,-0.12661 -0.322444,-0.28267 1.36e-4,-0.15449 0.144572,-0.28006 0.322444,-0.28006 z"
-         id="path2315"
-         style="clip-rule:evenodd;opacity:0.40909089;fill:url(#radialGradient2325);fill-opacity:1;fill-rule:evenodd;stroke-width:0.26458332"
-         inkscape:connector-curvature="0" />
-      <path
-         style="clip-rule:evenodd;fill:#e1e1e1;fill-opacity:1;fill-rule:evenodd;stroke-width:0.26458332"
-         id="path217"
-         d="m 23.085299,274.21324 c 0.178009,0 0.321896,0.12557 0.321896,0.28006 0,0.15606 -0.143887,0.28267 -0.321896,0.28267 -0.177872,0 -0.322444,-0.12661 -0.322444,-0.28267 1.36e-4,-0.15449 0.144572,-0.28006 0.322444,-0.28006 z"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         d="m 24.373252,265.30713 -5.789543,4.78931 -0.165293,1.89599 0.52915,0.54618 c 0,0 5.399453,-4.53953 5.456791,-4.58469 l 5.194443,4.64166 0.502291,-0.61489 -0.427511,-1.88156 -5.269223,-4.81964 z"
-         id="path362"
-         style="fill:#404040;fill-opacity:1;stroke:#000000;stroke-width:0.48025745;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="rect2361"
-         d="m 25.106693,272.04038 h 2.391832 c 0.203887,0 0.368027,0.16413 0.368027,0.36802 l -0.0021,2.40221 c 0,0.20389 -0.157777,0.33496 -0.361664,0.33496 h -2.396085 c -0.203887,0 -0.368027,-0.16414 -0.368027,-0.36803 v -2.36914 c 0,-0.20389 0.16414,-0.36802 0.368027,-0.36802 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.31818183;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.26458317;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         inkscape:connector-curvature="0" />
-      <rect
-         ry="0.10088091"
-         rx="0.10088091"
-         y="272.25055"
-         x="24.949409"
-         height="2.6358998"
-         width="2.6461861"
-         id="rect3263"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.48025745;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
-    </g>
-  </g>
-</svg>
diff --git a/icons_src/cr3_browser_folder_root_hc-48x48-src.svg b/icons_src/cr3_browser_folder_root_hc-48x48-src.svg
new file mode 100644
index 0000000000..329349ec82
--- /dev/null
+++ b/icons_src/cr3_browser_folder_root_hc-48x48-src.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_browser_folder_root_hc-48x48-src.svg">
+  <defs
+     id="defs2">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2341"
+       id="radialGradient2325"
+       cx="20.443665"
+       cy="37.425831"
+       fx="20.443665"
+       fy="37.425831"
+       r="1.0821035"
+       gradientTransform="matrix(0.29772583,0,0,0.26001768,17.028724,264.89961)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.5916667"
+     inkscape:cx="16.337619"
+     inkscape:cy="20.329279"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1391"
+     inkscape:window-height="964"
+     inkscape:window-x="525"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29997)">
+    <g
+       id="g835"
+       transform="matrix(0.70867,0,0,0.70867,-2.9075678e-4,121.82529)">
+      <rect
+         y="231.3833"
+         x="2.1166668"
+         height="63.5"
+         width="63.5"
+         id="rect1017"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.61184096;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="rect1013"
+         d="m 5.5566406,234.82227 v 56.62109 H 62.177734 v -56.62109 z m 4.171875,9.26104 H 58.005859 v 43.18817 H 9.7285156 Z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.17206144;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <g
+         transform="matrix(3.3055187,0,0,3.3055187,-46.343453,-630.17985)"
+         id="g993">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.48025745;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m 23.656075,266.87136 h 1.576244 c 0.222179,0 3.67413,4.08393 3.67413,4.32346 l -0.117348,4.89393 c 0,0.23954 -0.178866,0.43238 -0.401046,0.43238 h -8.323071 c -0.222179,0 -0.401046,-0.19284 -0.401046,-0.43238 l 0.01494,-4.89393 c 0,-0.23953 3.755014,-4.32346 3.977194,-4.32346 z"
+           id="rect1512"
+           sodipodi:nodetypes="ccccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke-width:0.26458332"
+           id="path5"
+           d="M 30.361675,276.80704 H 18.369462 v -11.99221 h 11.992213 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="clip-rule:evenodd;fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.48025745;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path2327"
+           d="m 24.021312,272.37909 -0.0121,3.99281 h -3.133406 l -0.02949,-3.99281 z"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="clip-rule:evenodd;opacity:0.40909089;fill:url(#radialGradient2325);fill-opacity:1;fill-rule:evenodd;stroke-width:0.26458332"
+           id="path2315"
+           d="m 23.115605,274.34962 c 0.178009,0 0.321896,0.12557 0.321896,0.28006 0,0.15606 -0.143887,0.28267 -0.321896,0.28267 -0.177872,0 -0.322444,-0.12661 -0.322444,-0.28267 1.36e-4,-0.15449 0.144572,-0.28006 0.322444,-0.28006 z" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 23.085299,274.21324 c 0.178009,0 0.321896,0.12557 0.321896,0.28006 0,0.15606 -0.143887,0.28267 -0.321896,0.28267 -0.177872,0 -0.322444,-0.12661 -0.322444,-0.28267 1.36e-4,-0.15449 0.144572,-0.28006 0.322444,-0.28006 z"
+           id="path217"
+           style="clip-rule:evenodd;fill:#e1e1e1;fill-opacity:1;fill-rule:evenodd;stroke-width:0.26458332" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#404040;fill-opacity:1;stroke:#000000;stroke-width:0.48025745;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path362"
+           d="m 24.373252,265.30713 -5.789543,4.78931 -0.165293,1.89599 0.52915,0.54618 c 0,0 5.399453,-4.53953 5.456791,-4.58469 l 5.194443,4.64166 0.502291,-0.61489 -0.427511,-1.88156 -5.269223,-4.81964 z"
+           sodipodi:nodetypes="cccccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.31818183;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.26458317;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m 25.106693,272.04038 h 2.391832 c 0.203887,0 0.368027,0.16413 0.368027,0.36802 l -0.0021,2.40221 c 0,0.20389 -0.157777,0.33496 -0.361664,0.33496 h -2.396085 c -0.203887,0 -0.368027,-0.16414 -0.368027,-0.36803 v -2.36914 c 0,-0.20389 0.16414,-0.36802 0.368027,-0.36802 z"
+           id="rect2361"
+           sodipodi:nodetypes="ccccccccc" />
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.48025745;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="rect3263"
+           width="2.6461861"
+           height="2.6358998"
+           x="24.949409"
+           y="272.25055"
+           rx="0.10088091"
+           ry="0.10088091" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons_src/cr3_btn_books_swap-48x48-src.svg b/icons_src/cr3_btn_books_swap-48x48-src.svg
index fc591d4e9c..5502aa3f13 100644
--- a/icons_src/cr3_btn_books_swap-48x48-src.svg
+++ b/icons_src/cr3_btn_books_swap-48x48-src.svg
@@ -279,16 +279,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="7.919596"
-     inkscape:cx="10.768021"
-     inkscape:cy="6.9925734"
+     inkscape:cx="22.44791"
+     inkscape:cy="9.8967619"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:pagecheckerboard="true"
      units="px"
      inkscape:window-width="1573"
-     inkscape:window-height="1016"
-     inkscape:window-x="1280"
+     inkscape:window-height="998"
+     inkscape:window-x="339"
      inkscape:window-y="0"
      inkscape:window-maximized="0"
      objecttolerance="2"
@@ -301,7 +301,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -386,7 +386,7 @@
        sodipodi:nodetypes="cccccc" />
     <g
        id="g984"
-       transform="matrix(0.62554256,0,0,0.62554256,53.811075,122.93581)">
+       transform="matrix(0.62554256,0,0,0.62554256,55.200035,125.58746)">
       <path
          sodipodi:nodetypes="cccc"
          inkscape:r_cy="true"
diff --git a/icons_src/cr3_button_add-48x48-src.svg b/icons_src/cr3_button_add-48x48-src.svg
index 0f0bae9507..3794a571ce 100644
--- a/icons_src/cr3_button_add-48x48-src.svg
+++ b/icons_src/cr3_button_add-48x48-src.svg
@@ -19,6 +19,30 @@
    sodipodi:docname="cr3_button_add-48x48-src.svg">
   <defs
      id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient863">
+      <stop
+         style="stop-color:#99c800;stop-opacity:1"
+         offset="0"
+         id="stop859" />
+      <stop
+         style="stop-color:#99d200;stop-opacity:1"
+         offset="1"
+         id="stop861" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient855">
+      <stop
+         style="stop-color:#418500;stop-opacity:1"
+         offset="0"
+         id="stop851" />
+      <stop
+         style="stop-color:#488700;stop-opacity:1"
+         offset="1"
+         id="stop853" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient891">
@@ -51,7 +75,25 @@
        x2="40.409538"
        y2="325.75211"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98830343,0,0,0.98830343,0.28071838,3.603798)" />
+       gradientTransform="matrix(0.83037889,0,0,0.83037889,4.0709074,52.292294)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient855"
+       id="linearGradient857"
+       x1="2.8750005"
+       y1="287.54999"
+       x2="45.5"
+       y2="329.54999"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient863"
+       id="linearGradient865"
+       x1="12.660518"
+       y1="296.67181"
+       x2="35.589481"
+       y2="319.79681"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -60,17 +102,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="-93.267992"
-     inkscape:cy="-65.587169"
+     inkscape:zoom="2.8284272"
+     inkscape:cx="55.542778"
+     inkscape:cy="27.15398"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      inkscape:window-width="1267"
-     inkscape:window-height="1007"
-     inkscape:window-x="1879"
-     inkscape:window-y="59"
+     inkscape:window-height="998"
+     inkscape:window-x="645"
+     inkscape:window-y="0"
      inkscape:window-maximized="0"
      inkscape:pagecheckerboard="true"
      objecttolerance="2"
@@ -98,33 +140,29 @@
        cx="24"
        cy="308.29999"
        r="22.514143" />
-    <g
-       id="g852"
-       transform="matrix(0.84020642,0,0,0.84020642,3.835046,49.26436)">
-      <circle
-         r="19.947975"
-         cy="308.29581"
-         cx="24"
-         id="path870-3"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient893);stroke-width:2.63299823;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
-      <circle
-         r="18.851894"
-         cy="308.2962"
-         cx="24"
-         id="path870-3-3"
-         style="opacity:1;fill:#99c900;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.48832297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
-      <path
-         sodipodi:nodetypes="ccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path919"
-         d="m 12,305.29999 h 9 v -9 h 6 v 9 h 9 v 6 h -9 v 9 h -6 v -9 h -9 z"
-         style="fill:#ffffff;fill-opacity:0.99610895;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <circle
-         r="22.533897"
-         cy="308.29999"
-         cx="24"
-         id="path870-3-5"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.53955412;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
-    </g>
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient893);stroke-width:2.21226192;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-3"
+       cx="24"
+       cy="308.29648"
+       r="16.760416" />
+    <circle
+       style="opacity:1;fill:url(#linearGradient865);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.09070492;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-3-3"
+       cx="24"
+       cy="308.29681"
+       r="15.839482" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.99610895;fill-rule:evenodd;stroke:none;stroke-width:0.84020644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.917523,305.77937 h 7.561858 v -7.56186 h 5.041238 v 7.56186 h 7.561858 v 5.04124 h -7.561858 v 7.56186 h -5.041238 v -7.56186 h -7.561858 z"
+       id="path919"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient857);stroke-width:2.13374972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870-3-5"
+       cx="24"
+       cy="308.29999"
+       r="18.933125" />
   </g>
 </svg>
diff --git a/icons_src/cr3_button_cancel-48x48-src.svg b/icons_src/cr3_button_cancel-48x48-src.svg
new file mode 100644
index 0000000000..ab6d341a5b
--- /dev/null
+++ b/icons_src/cr3_button_cancel-48x48-src.svg
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_button_cancel-48x48-src.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient2256">
+      <stop
+         id="stop2258"
+         offset="0"
+         style="stop-color:#ff0202;stop-opacity:1;" />
+      <stop
+         id="stop2260"
+         offset="1"
+         style="stop-color:#ff9b9b;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2248"
+       inkscape:collect="always">
+      <stop
+         id="stop2250"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2252"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9647">
+      <stop
+         id="stop9649"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop9651"
+         offset="1"
+         style="stop-color:#dbdbdb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21644"
+       inkscape:collect="always">
+      <stop
+         id="stop21646"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop21648"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.173803,0,0,0.3571428,-5.2614049,313.17903)"
+       r="15.75"
+       fy="36.75"
+       fx="25.125"
+       cy="36.75"
+       cx="25.125"
+       id="radialGradient21650"
+       xlink:href="#linearGradient21644"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4981">
+      <stop
+         id="stop4983"
+         offset="0"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+      <stop
+         id="stop4985"
+         offset="1.0000000"
+         style="stop-color:#b30000;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11780">
+      <stop
+         id="stop11782"
+         offset="0.0000000"
+         style="stop-color:#ff8b8b;stop-opacity:1.0000000;" />
+      <stop
+         id="stop11784"
+         offset="1.0000000"
+         style="stop-color:#ec1b1b;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0.00401465,282.67903)"
+       gradientUnits="userSpaceOnUse"
+       y2="47.374317"
+       x2="53.570126"
+       y1="12.503600"
+       x1="15.737001"
+       id="linearGradient2057"
+       xlink:href="#linearGradient11780"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(0.00401465,282.67903)"
+       gradientUnits="userSpaceOnUse"
+       y2="37.959785"
+       x2="41.047836"
+       y1="20.105337"
+       x1="23.995985"
+       id="linearGradient4987"
+       xlink:href="#linearGradient4981"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(1.693981,0,0,1.693981,-16.861275,259.56792)"
+       gradientUnits="userSpaceOnUse"
+       r="12.30225"
+       fy="33.30225"
+       fx="24.30225"
+       cy="33.30225"
+       cx="24.30225"
+       id="radialGradient2239"
+       xlink:href="#linearGradient9647"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.154957,0,0,3.198723,-52.841515,261.16982)"
+       r="21.25"
+       fy="10.666344"
+       fx="16.75"
+       cy="10.666344"
+       cx="16.75"
+       id="radialGradient2254"
+       xlink:href="#linearGradient2248"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(0.00401465,282.67903)"
+       gradientUnits="userSpaceOnUse"
+       y2="35.05225"
+       x2="24.30225"
+       y1="15.80225"
+       x1="21.75"
+       id="linearGradient2262"
+       xlink:href="#linearGradient2256"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.0000002"
+     inkscape:cx="26.443996"
+     inkscape:cy="17.582447"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1267"
+     inkscape:window-height="998"
+     inkscape:window-x="645"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true"
+     objecttolerance="2"
+     guidetolerance="2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29999)">
+    <ellipse
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870"
+       cx="24"
+       cy="308.29999"
+       r="22.514143" />
+    <ellipse
+       ry="5.625"
+       rx="18.487398"
+       cy="326.30402"
+       cx="24.230398"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.63068183;fill:url(#radialGradient21650);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.83921498;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       id="path21642" />
+    <g
+       id="g953"
+       transform="matrix(0.90902524,0,0,0.90898697,2.1833941,29.537814)">
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="path9480"
+         d="M 15.595021,285.17095 H 32.680326 L 45.5016,298.26542 v 17.89364 l -12.648599,12.0169 H 15.422664 L 2.4984003,315.33729 v -17.19418 z"
+         style="fill:url(#linearGradient4987);fill-opacity:1;fill-rule:evenodd;stroke:#860000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="path9482"
+         d="m 16.02467,286.17937 h 16.227908 l 12.247893,12.42238 v 17.11428 L 32.642487,327.16686 H 15.874268 L 3.5130938,314.88775 v -16.36311 z"
+         style="opacity:0.81318683;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2057);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="path2241"
+         d="m 15.691515,285.42903 -12.9375004,12.8125 v 17 l 2.9375,2.90625 c 16.7625414,0.0575 16.4771654,-13.01868 39.5625004,-11.875 v -7.90625 l -12.6875,-12.9375 z"
+         style="opacity:0.28977272;fill:url(#radialGradient2254);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2787"
+         d="m 16.77119,295.17903 -4.267175,4.26718 7.535075,7.53507 -7.535075,7.53508 4.267175,4.26717 7.535075,-7.53507 7.535075,7.53507 4.267176,-4.26717 -7.535076,-7.53508 7.535076,-7.53507 -4.267176,-4.26718 -7.535075,7.53508 z"
+         style="fill:url(#radialGradient2239);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2262);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/icons_src/cr3_button_cancel_hc-48x48-src.svg b/icons_src/cr3_button_cancel_hc-48x48-src.svg
new file mode 100644
index 0000000000..28e1392bec
--- /dev/null
+++ b/icons_src/cr3_button_cancel_hc-48x48-src.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_button_cancel_hc-48x48-src.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient2256">
+      <stop
+         id="stop2258"
+         offset="0"
+         style="stop-color:#ff0202;stop-opacity:1;" />
+      <stop
+         id="stop2260"
+         offset="1"
+         style="stop-color:#ff9b9b;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9647">
+      <stop
+         id="stop9649"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop9651"
+         offset="1"
+         style="stop-color:#dbdbdb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4981">
+      <stop
+         id="stop4983"
+         offset="0"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+      <stop
+         id="stop4985"
+         offset="1.0000000"
+         style="stop-color:#b30000;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11780">
+      <stop
+         id="stop11782"
+         offset="0.0000000"
+         style="stop-color:#ff8b8b;stop-opacity:1.0000000;" />
+      <stop
+         id="stop11784"
+         offset="1.0000000"
+         style="stop-color:#ec1b1b;stop-opacity:1.0000000;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.0000002"
+     inkscape:cx="28.505543"
+     inkscape:cy="19.65291"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1267"
+     inkscape:window-height="998"
+     inkscape:window-x="645"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true"
+     objecttolerance="2"
+     guidetolerance="2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29999)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#fbfbfb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.06966543;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.009296,285.29999 H 33.285239 L 47,299.30639 V 318.4462 L 33.469948,331.29999 H 14.824927 L 1,317.56719 v -18.39162 z"
+       id="path9480-3"
+       sodipodi:nodetypes="ccccccccc" />
+    <ellipse
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870"
+       cx="24"
+       cy="308.29999"
+       r="22.514143" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93014377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.181997,288.29999 H 32.074121 L 44,300.47947 v 16.64331 L 32.234737,328.29999 H 16.021676 L 4,316.35843 v -15.99272 z"
+       id="path9480"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97439003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 16.657894,296.79999 -4.157894,4.1579 7.342111,7.3421 -7.342111,7.34211 4.157894,4.15789 7.342111,-7.3421 7.342101,7.3421 4.157894,-4.15789 -7.3421,-7.34211 7.3421,-7.3421 -4.157894,-4.1579 -7.342101,7.34211 z"
+       id="path2787" />
+  </g>
+</svg>
diff --git a/icons_src/cr3_button_ok-48x48-src.svg b/icons_src/cr3_button_ok-48x48-src.svg
new file mode 100644
index 0000000000..425120177c
--- /dev/null
+++ b/icons_src/cr3_button_ok-48x48-src.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_button_ok-48x48-src.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient863">
+      <stop
+         style="stop-color:#99c800;stop-opacity:1"
+         offset="0"
+         id="stop859" />
+      <stop
+         style="stop-color:#99d200;stop-opacity:1"
+         offset="1"
+         id="stop861" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient855">
+      <stop
+         style="stop-color:#418500;stop-opacity:1"
+         offset="0"
+         id="stop851" />
+      <stop
+         style="stop-color:#488700;stop-opacity:1"
+         offset="1"
+         id="stop853" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient891">
+      <stop
+         style="stop-color:#f2f9d8;stop-opacity:1"
+         offset="0"
+         id="stop887" />
+      <stop
+         style="stop-color:#b5e816;stop-opacity:1"
+         offset="1"
+         id="stop889" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient891"
+       id="linearGradient893"
+       x1="6.926249"
+       y1="291.28333"
+       x2="40.409538"
+       y2="325.75211"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.83037889,0,0,0.83037889,4.0709074,52.292294)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient855"
+       id="linearGradient857"
+       x1="2.8750005"
+       y1="287.54999"
+       x2="45.5"
+       y2="329.54999"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient863"
+       id="linearGradient865"
+       x1="12.660518"
+       y1="296.67181"
+       x2="35.589481"
+       y2="319.79681"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284272"
+     inkscape:cx="-34.393899"
+     inkscape:cy="32.984025"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1267"
+     inkscape:window-height="998"
+     inkscape:window-x="645"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true"
+     objecttolerance="2"
+     guidetolerance="2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29999)">
+    <ellipse
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870"
+       cx="24"
+       cy="308.29999"
+       r="22.514143" />
+    <g
+       id="g903">
+      <circle
+         r="16.760416"
+         cy="308.29648"
+         cx="24"
+         id="path870-3"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient893);stroke-width:2.21226192;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+      <circle
+         r="15.839482"
+         cy="308.29681"
+         cx="24"
+         id="path870-3-3"
+         style="opacity:1;fill:url(#linearGradient865);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.09070492;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+      <circle
+         r="18.933125"
+         cy="308.29999"
+         cx="24"
+         id="path870-3-5"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient857);stroke-width:2.13374972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path897"
+         d="m 13.257771,310.17522 7.722541,7.87722 14.374999,-14.375 -3.281249,-3.28125 -11.1875,11.1875 -4.59375,-4.59375 z"
+         style="fill:#ffffff;fill-opacity:0.99610895;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/icons_src/cr3_button_ok_hc-48x48-src.svg b/icons_src/cr3_button_ok_hc-48x48-src.svg
new file mode 100644
index 0000000000..08f733d5b0
--- /dev/null
+++ b/icons_src/cr3_button_ok_hc-48x48-src.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_button_ok_hc-48x48-src.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0000001"
+     inkscape:cx="-24.569405"
+     inkscape:cy="15.657905"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1267"
+     inkscape:window-height="998"
+     inkscape:window-x="645"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true"
+     objecttolerance="2"
+     guidetolerance="2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29999)">
+    <g
+       id="layer1-6"
+       inkscape:label="Layer 1"
+       transform="translate(0,2.2070312e-6)">
+      <circle
+         r="23"
+         cy="308.29999"
+         cx="24"
+         id="path870-3-3-2"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.03584504;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+      <circle
+         r="0"
+         cy="308.29999"
+         cx="24"
+         id="path870-9"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+      <circle
+         r="18.500013"
+         cy="308.29999"
+         cx="24"
+         id="path870-3-5-1"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.99997306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke" />
+    </g>
+    <ellipse
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4a8b00;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path870"
+       cx="24"
+       cy="308.29999"
+       r="22.514143" />
+    <path
+       style="fill:#000000;fill-opacity:0.99610895;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.257771,310.17522 7.722541,7.87722 14.374999,-14.375 -3.281249,-3.28125 -11.1875,11.1875 -4.59375,-4.59375 z"
+       id="path897"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/icons_src/cr3_button_tts-48x48-src.svg b/icons_src/cr3_button_tts-48x48-src.svg
new file mode 100644
index 0000000000..403f400c48
--- /dev/null
+++ b/icons_src/cr3_button_tts-48x48-src.svg
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_button_tts-48x48-src.svg">
+  <defs
+     id="defs2">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3498"
+       id="radialGradient3508"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.54507,-1.0896288e-6,1.8075606e-6,5.8808355,-120.81526,147.10803)"
+       cx="36.82843"
+       cy="24.427677"
+       fx="36.82843"
+       fy="24.427671"
+       r="1.2404948" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3498">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3500" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop3502" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3498"
+       id="radialGradient3504"
+       cx="36.82843"
+       cy="24.427677"
+       fx="36.82843"
+       fy="24.427671"
+       r="1.2404948"
+       gradientTransform="matrix(3.54507,-1.0896288e-6,1.8075606e-6,5.8808355,-120.81526,147.10803)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3676"
+       id="radialGradient3702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.127582,1.416065,-1.630141,-0.146854,17.48751,15.56121)"
+       cx="-1.0016617"
+       cy="0.99004257"
+       fx="-1.0016617"
+       fy="0.99004257"
+       r="9.9205227" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3676">
+      <stop
+         style="stop-color:#eeeeec"
+         offset="0"
+         id="stop4022" />
+      <stop
+         style="stop-color:#555753"
+         offset="1"
+         id="stop3680" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1557"
+       id="linearGradient1549"
+       x1="17.0625"
+       y1="34.950001"
+       x2="20.3125"
+       y2="5.375"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient1557"
+       inkscape:collect="always">
+      <stop
+         id="stop1559"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop1561"
+         offset="1"
+         style="stop-color:#888a85" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3730"
+       id="radialGradient3728"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.310032,2.110862,-2.082775,-0.305867,17.75288,16.41459)"
+       cx="-1.0016617"
+       cy="0.99004257"
+       fx="-1.0016617"
+       fy="0.99004257"
+       r="9.9205227" />
+    <linearGradient
+       id="linearGradient3730"
+       inkscape:collect="always">
+      <stop
+         id="stop3732"
+         offset="0"
+         style="stop-color:#eeeeec" />
+      <stop
+         id="stop3734"
+         offset="1"
+         style="stop-color:#888a85" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3628"
+       id="radialGradient3644"
+       cx="12.704856"
+       cy="13.847466"
+       fx="12.704856"
+       fy="13.847466"
+       r="9.375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06370852,-1.424475,1.547293,0.0692112,-9.530629,30.98681)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3628">
+      <stop
+         style="stop-color:#d3d7cf"
+         offset="0"
+         id="stop3630" />
+      <stop
+         style="stop-color:#555753"
+         offset="1"
+         id="stop3632" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3692"
+       id="linearGradient3698"
+       x1="-0.51990569"
+       y1="-0.51990569"
+       x2="-0.51990569"
+       y2="19.269905"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3692">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3694" />
+      <stop
+         style="stop-color:#babdb6"
+         offset="1"
+         id="stop3696" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3628"
+       id="radialGradient3634"
+       cx="6.8797626"
+       cy="7.1986876"
+       fx="6.8797626"
+       fy="7.1986876"
+       r="9.375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.240749,0,0,1.157631,-1.713645,-1.134736)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3674"
+       id="radialGradient3680"
+       cx="5.0822492"
+       cy="12.516305"
+       fx="5.0822492"
+       fy="12.516305"
+       r="2.9831069"
+       gradientTransform="matrix(0.40369886,0,0,0.46803839,-0.02159792,285.90502)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3674">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop3676" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3678" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0,284.29999)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3510"
+       id="linearGradient3516"
+       x1="9.485774"
+       y1="22.107626"
+       x2="7.378232"
+       y2="22.637957"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3510">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3512" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3514" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4608"
+       id="linearGradient4585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.46828948,0,0,0.46828948,-23.37445,287.12371)"
+       x1="56.302975"
+       y1="4.9369388"
+       x2="56.609135"
+       y2="8.6796741" />
+    <linearGradient
+       id="linearGradient4608">
+      <stop
+         style="stop-color:#eeeeec"
+         offset="0"
+         id="stop4610" />
+      <stop
+         style="stop-color:#8a8c87;stop-opacity:1;"
+         offset="1"
+         id="stop4612" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4099"
+       id="linearGradient4105"
+       x1="11.125889"
+       y1="25.559732"
+       x2="9.346509"
+       y2="25.736509"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.34294789,0,0,0.34294789,-1.3171606,282.36203)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4099">
+      <stop
+         style="stop-color:#6f726f;stop-opacity:1;"
+         offset="0"
+         id="stop4101" />
+      <stop
+         style="stop-color:#6f726f;stop-opacity:0;"
+         offset="1"
+         id="stop4103" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4068"
+       id="linearGradient4095"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5763841"
+       y1="20.301662"
+       x2="7.3215322"
+       y2="27.345011" />
+    <linearGradient
+       id="linearGradient4068">
+      <stop
+         style="stop-color:#eaeae9;stop-opacity:1;"
+         offset="0"
+         id="stop4070" />
+      <stop
+         style="stop-color:#a5a7a2;stop-opacity:1;"
+         offset="1"
+         id="stop4072" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3510"
+       id="linearGradient3287"
+       x1="4.6831217"
+       y1="24.665476"
+       x2="8.3712559"
+       y2="24.317278"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="radialGradient3615"
+       cx="6.4081554"
+       cy="17.403807"
+       fx="6.4081554"
+       fy="17.403807"
+       r="5.524272"
+       gradientTransform="matrix(0.76779622,0,0,0.41879795,-1.2838906,285.98306)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4068"
+       id="linearGradient1022"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5763841"
+       y1="20.301662"
+       x2="7.3215322"
+       y2="27.345011" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="30.695302"
+     inkscape:cy="8.4194459"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-width="1388"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29998)">
+    <g
+       id="g1044"
+       transform="translate(0.92274821,-0.33720177)">
+      <ellipse
+         id="path3607"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.42857145;fill:url(#radialGradient3615);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.87918156;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         cx="3.6362669"
+         cy="293.27176"
+         rx="4.2415152"
+         ry="2.3135536" />
+      <g
+         transform="matrix(0.34294815,0,0,0.34294815,-1.1049733,282.36203)"
+         id="g4090-3">
+        <ellipse
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient1022);fill-opacity:1;fill-rule:nonzero;stroke:#5d615f;stroke-width:0.57792485;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="path4076-6"
+           transform="matrix(1.415965,0,0,1.258558,-2.667614,-6.200669)"
+           cx="8.7504463"
+           cy="24.665476"
+           rx="3.6239223"
+           ry="6.3639612" />
+        <ellipse
+           transform="matrix(1.154526,0,0,1.154526,-0.379902,-3.63468)"
+           id="path4060"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient4095);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           cx="8.7504463"
+           cy="24.665476"
+           rx="3.6239223"
+           ry="6.3639612" />
+        <ellipse
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#93958f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86615634;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="path4058-7"
+           transform="matrix(1.081355,0,0,1.081355,1.232653,-1.829889)"
+           cx="8.7504463"
+           cy="24.665476"
+           rx="3.6239223"
+           ry="6.3639612" />
+        <ellipse
+           transform="matrix(1.1807,0,0,1.076971,-0.608944,-1.721744)"
+           id="path3279"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.39560439;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3287);stroke-width:0.68416733;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           cx="8.7504463"
+           cy="24.665476"
+           rx="3.6239223"
+           ry="6.3639612" />
+      </g>
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path4542-5"
+         d="m 2.5084299,289.12668 1.875813,-1.62037 -0.060625,6.6365 -1.9061256,-1.46183 c -0.6668775,-0.54563 -0.788128,-2.97836 0.090938,-3.5543 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4585);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4105);stroke-width:0.26458341;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path4544"
+         d="m 1.9945219,290.1175 1.0728762,-0.80408 -0.066573,0.93559 -1.048668,0.17489 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3516);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3672"
+         d="m 2.1705135,292.33569 1.174963,0.94413 -0.1473266,-0.64238 -1.184382,-0.66219 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7692308;fill:url(#radialGradient3680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(0.29021987,0,0,0.39932795,-1.1157349,281.09373)"
+         id="g4006-3"
+         style="display:inline">
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3702);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1549);stroke-width:1.47668338;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="M 23.75,14 C 21.81001,14.04917 20.013366,14.683436 18.5,15.6875 18.13319,15.264088 17.60375,15 17,15 c -0.0345,0 -0.08734,8.54e-4 -0.125,0 -0.02799,-2e-4 -0.06855,-0.0026 -0.09375,0 C 15.773145,15.102481 15,15.965001 15,17 c 0,0.60375 0.264088,1.13319 0.6875,1.5 C 14.639107,20.080181 14,21.962011 14,24 c 0,2.033681 0.611921,3.921829 1.65625,5.5 C 15.243427,29.869532 15,30.401641 15,31 c 0,1.104 0.896,2.000001 2,2 0.60375,0 1.13319,-0.264089 1.5,-0.6875 C 20.080181,33.360893 21.962011,34 24,34 c 2.03799,0 3.919819,-0.639107 5.5,-1.6875 0.36681,0.423412 0.896251,0.687501 1.5,0.6875 1.103999,0 2,-0.895999 2,-2 0,-0.60375 -0.264088,-1.13319 -0.6875,-1.5 C 33.360893,27.919819 34,26.03799 34,24 34,21.962011 33.360893,20.080181 32.3125,18.5 32.735912,18.13319 33,17.60375 33,17 c 0,-1.104 -0.896001,-2 -2,-2 -0.0345,0 -0.08734,8.54e-4 -0.125,0 -0.02799,-2e-4 -0.06855,-0.0026 -0.09375,0 -0.504052,0.05124 -0.961951,0.298435 -1.28125,0.65625 -0.0067,-0.0044 -0.02455,0.0044 -0.03125,0 C 27.894622,14.620029 26.025064,14 24,14 c -0.08617,0 -0.164349,-0.0022 -0.25,0 z"
+           id="path3726-5"
+           sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3728);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09104455;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="M 23.75,14 C 21.81001,14.04917 20.013366,14.683436 18.5,15.6875 18.13319,15.264088 17.60375,15 17,15 c -0.0345,0 -0.08734,8.54e-4 -0.125,0 -0.02799,-2e-4 -0.06855,-0.0026 -0.09375,0 C 15.773145,15.102481 15,15.965001 15,17 c 0,0.60375 0.264088,1.13319 0.6875,1.5 C 14.639107,20.080181 14,21.962011 14,24 c 0,2.033681 0.611921,3.921829 1.65625,5.5 C 15.243427,29.869532 15,30.401641 15,31 c 0,1.104 0.896,2.000001 2,2 0.60375,0 1.13319,-0.264089 1.5,-0.6875 C 20.080181,33.360893 21.962011,34 24,34 c 2.03799,0 3.919819,-0.639107 5.5,-1.6875 0.36681,0.423412 0.896251,0.687501 1.5,0.6875 1.103999,0 2,-0.895999 2,-2 0,-0.60375 -0.264088,-1.13319 -0.6875,-1.5 C 33.360893,27.919819 34,26.03799 34,24 34,21.962011 33.360893,20.080181 32.3125,18.5 32.735912,18.13319 33,17.60375 33,17 c 0,-1.104 -0.896001,-2 -2,-2 -0.0345,0 -0.08734,8.54e-4 -0.125,0 -0.02799,-2e-4 -0.06855,-0.0026 -0.09375,0 -0.504052,0.05124 -0.961951,0.298435 -1.28125,0.65625 -0.0067,-0.0044 -0.02455,0.0044 -0.03125,0 C 27.894622,14.620029 26.025064,14 24,14 c -0.08617,0 -0.164349,-0.0022 -0.25,0 z"
+           id="path3507"
+           sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
+           inkscape:connector-curvature="0" />
+        <circle
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3644);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3698);stroke-width:0.8383193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="path3636-6"
+           transform="matrix(0.846982,0,0,0.911415,16.71027,15.44956)"
+           cx="9.375"
+           cy="9.375"
+           r="9.375" />
+        <circle
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3634);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.57905483;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="path3519-2"
+           transform="matrix(0.367272,0,0,0.32,18.56254,21.125)"
+           cx="9.375"
+           cy="9.375"
+           r="9.375" />
+        <circle
+           transform="matrix(1.3125,0,0,1.3125,-4.657679,-5.09375)"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="path3718-9"
+           cx="16.5"
+           cy="16.5"
+           r="0.5" />
+        <circle
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="path3720"
+           transform="translate(15.22159,0.25)"
+           cx="16.5"
+           cy="16.5"
+           r="0.5" />
+        <circle
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="path3722"
+           transform="translate(15.22159,14.96875)"
+           cx="16.5"
+           cy="16.5"
+           r="0.5" />
+        <circle
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           id="path3724-1"
+           transform="matrix(1.375,0,0,1.375,-5.688929,8.8125)"
+           cx="16.5"
+           cy="16.5"
+           r="0.5" />
+      </g>
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3504);stroke-width:0.26458329;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 9.5482658,292.99569 c 0.242693,-0.57276 0.391846,-1.36474 0.391846,-2.23255 0,-0.86781 -0.149153,-1.65979 -0.391846,-2.23255"
+         id="path3488-2"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="csc"
+         id="path3494"
+         d="m 10.540723,293.74634 c 0.324292,-0.76534 0.523594,-1.82361 0.523594,-2.9832 0,-1.15959 -0.199302,-2.21786 -0.523594,-2.9832"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3508);stroke-width:0.26458329;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/icons_src/cr3_option_font_face_draft_hc-48x48-src.svg b/icons_src/cr3_option_font_face_hc_draft-48x48-src.svg
similarity index 100%
rename from icons_src/cr3_option_font_face_draft_hc-48x48-src.svg
rename to icons_src/cr3_option_font_face_hc_draft-48x48-src.svg
diff --git a/icons_src/cr3_option_night-48x48-src.svg b/icons_src/cr3_option_night-48x48-src.svg
new file mode 100644
index 0000000000..f150d7e2da
--- /dev/null
+++ b/icons_src/cr3_option_night-48x48-src.svg
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_option_night-48x48-src.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient2329">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2331" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop2333" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2321">
+      <stop
+         style="stop-color:#7b7f7a;stop-opacity:1;"
+         offset="0"
+         id="stop2323" />
+      <stop
+         style="stop-color:#7b7f7a;stop-opacity:0;"
+         offset="1"
+         id="stop2325" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2711">
+      <stop
+         style="stop-color:#909090;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2713" />
+      <stop
+         style="stop-color:#bebebe;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop2715" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2701">
+      <stop
+         style="stop-color:#585956;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2703" />
+      <stop
+         style="stop-color:#bbbeb8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2705" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2683">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2685" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2687" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2667">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2669" />
+      <stop
+         style="stop-color:#fcfcff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop2671" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2245">
+      <stop
+         id="stop2247"
+         offset="0.0000000"
+         style="stop-color:#dde1d9;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2249"
+         offset="1.0000000"
+         style="stop-color:#cacdc6;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2683"
+       id="radialGradient2460"
+       gradientTransform="matrix(2.0225818,0,0,0.96992326,-1.4354055,257.58039)"
+       cx="12.57571"
+       cy="67.501709"
+       fx="12.57571"
+       fy="67.501709"
+       r="8.7662792"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.205938"
+       x2="-35.658386"
+       y1="33.416473"
+       x1="-35.658386"
+       id="linearGradient2327-3"
+       xlink:href="#linearGradient2321"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.902373,0,0,0.82765,56.55215,297.16789)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="30.962345"
+       x2="-35.074745"
+       y1="34.242237"
+       x1="-35.122688"
+       id="linearGradient2337-5"
+       xlink:href="#linearGradient2329"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.837548,0,0,0.852655,54.17811,295.30612)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="64.892525"
+       x2="12.127711"
+       y1="53.535141"
+       x1="12.206709"
+       gradientTransform="matrix(1.816345,0,0,1.278927,2.5,244.05489)"
+       id="linearGradient2707-6"
+       xlink:href="#linearGradient2701"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2245"
+       id="linearGradient2251-1"
+       gradientTransform="matrix(1.129863,0,0,0.885063,2.875,285.8706)"
+       x1="8.6116238"
+       y1="7.2293582"
+       x2="34.784473"
+       y2="33.339787"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="31.246054"
+       x2="32.536823"
+       y1="5.3817744"
+       x1="10.390738"
+       gradientTransform="matrix(1.104397,0,0,0.905471,4.5,287.17497)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1561"
+       xlink:href="#linearGradient2253"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2253">
+      <stop
+         style="stop-color:#8f8f8f;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2255" />
+      <stop
+         style="stop-color:#494949;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2257" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="8.8666229"
+       x2="16.315819"
+       y1="32.622238"
+       x1="19.150396"
+       gradientTransform="matrix(1.174139,0,0,0.945431,5.221825,285.84345)"
+       id="linearGradient2681"
+       xlink:href="#linearGradient2675"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2675">
+      <stop
+         id="stop2677"
+         offset="0.0000000"
+         style="stop-color:#5b5b97;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2679"
+         offset="1.0000000"
+         style="stop-color:#1b1b43;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="162.45061"
+       x2="3.7069974"
+       y1="171.29134"
+       x1="3.7069976"
+       gradientTransform="matrix(5.705159,0,0,0.17528,5.5,286.4956)"
+       id="linearGradient2689-0"
+       xlink:href="#linearGradient2683"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2329"
+       id="linearGradient2421-6"
+       gradientTransform="matrix(1.108069,0,0,0.902471,5.5,288.17497)"
+       x1="17.698339"
+       y1="13.004725"
+       x2="34.974548"
+       y2="55.200756"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="26.729263"
+       x2="17.199417"
+       y1="1.6537577"
+       x1="11.492236"
+       gradientTransform="matrix(1.238977,0,0,0.895955,5.090553,285.84345)"
+       id="linearGradient2673-0"
+       xlink:href="#linearGradient2667"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="3.8451097"
+       x2="35.520542"
+       y1="3.9384086"
+       x1="34.300991"
+       id="linearGradient2717-6"
+       xlink:href="#linearGradient2711"
+       inkscape:collect="always"
+       gradientTransform="matrix(1.331237,0,0,0.658449,-5.46493,298.13462)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient1046"
+       gradientUnits="userSpaceOnUse"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientTransform="matrix(1.331237,0,0,0.658449,-5.91933,290.02884)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient1048"
+       gradientUnits="userSpaceOnUse"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientTransform="matrix(1.331237,0,0,0.658449,-5.80573,292.13462)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient1050"
+       gradientUnits="userSpaceOnUse"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientTransform="matrix(1.331237,0,0,0.658449,-5.69213,294.13462)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient1052"
+       gradientUnits="userSpaceOnUse"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientTransform="matrix(1.331237,0,0,0.658449,-5.57853,296.13462)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.4033506"
+     inkscape:cx="-10.046646"
+     inkscape:cy="-3.0850895"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1523"
+     inkscape:window-height="964"
+     inkscape:window-x="371"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29997)">
+    <ellipse
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.50857143;fill:url(#radialGradient2460);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.40062535;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.70063692;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       id="path2452"
+       cx="24"
+       cy="323.05194"
+       rx="17.73052"
+       ry="8.5026264" />
+    <g
+       id="g1084"
+       transform="matrix(0.9854433,0,0,0.9854433,-0.02018039,5.9230525)">
+      <ellipse
+         ry="3.939595"
+         rx="9.3944187"
+         cy="322.09464"
+         cx="24.375004"
+         id="path2407-7"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#adb0aa;fill-opacity:1;fill-rule:evenodd;stroke:#4b4d4a;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <ellipse
+         ry="3.2606058"
+         rx="8.4772701"
+         cy="321.76254"
+         cx="24.374985"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2327-3);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path1825-9" />
+      <ellipse
+         ry="3.3591154"
+         rx="7.8682766"
+         cy="320.64383"
+         cx="24.3125"
+         id="path2983-2"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2337-5);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2707-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60872948;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="rect2699-0"
+         width="9.0396729"
+         height="6.3650389"
+         x="19.972397"
+         y="315.37857" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssssssss"
+         id="rect2404-2"
+         d="M 7.5809024,288.87059 H 41.169097 c 0.911342,0 1.624147,0.58348 1.666752,1.40159 l 1.332044,25.57811 c 0.05821,1.11774 -0.901056,2.02031 -2.020305,2.02031 H 6.602412 c -1.1192491,0 -2.078514,-0.90257 -2.0203052,-2.02031 l 1.3320438,-25.57811 c 0.040284,-0.77354 0.5475027,-1.40159 1.6667518,-1.40159 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2251-1);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1561);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient2681);fill-opacity:1;fill-rule:evenodd;stroke:#000079;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 8.910535,291.4808 7.6683398,313.52611 H 39.318729 l -1.335017,-21.95188 z"
+         id="path2377-3"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2393-7"
+         d="M 6.6774331,315.91076 H 42.10591"
+         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient2689-0);stroke-width:0.99618119;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.24840764"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2421-6);stroke-width:0.99999964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.70063692;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 7.4145985,289.88131 33.8455025,-0.0378 c 0.283697,-3.2e-4 0.559302,0.23725 0.582105,0.65254 l 1.361892,24.80325 c 0.05804,1.05703 -0.539749,1.78587 -1.598371,1.78587 H 7.0817583 c -1.0586228,0 -1.5930144,-0.72879 -1.5358714,-1.78587 l 1.3240904,-24.49417 c 0.038696,-0.71583 0.1663853,-0.9234 0.5446212,-0.92382 z"
+         id="path2397-5"
+         sodipodi:nodetypes="cssssssss" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2443-9"
+         d="m 9.211536,291.92133 -0.802529,17.87033 c 11.044638,-2.40063 15.421463,-10.4922 29.154032,-13.14675 l -0.161472,-4.65751 z"
+         style="opacity:0.53142856;fill:url(#linearGradient2673-0);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25000001pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccccc" />
+      <ellipse
+         ry="0.55289257"
+         rx="1.1178255"
+         cy="292.62207"
+         cx="40.382179"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1046);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.46812168;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path2709-2" />
+      <ellipse
+         ry="0.55289257"
+         rx="1.1178255"
+         cy="294.72787"
+         cx="40.495777"
+         id="path2719-2"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1048);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.46812168;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <ellipse
+         ry="0.55289257"
+         rx="1.1178255"
+         cy="296.72787"
+         cx="40.609379"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1050);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.46812168;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path2723-8" />
+      <ellipse
+         ry="0.55289257"
+         rx="1.1178255"
+         cy="298.72787"
+         cx="40.722977"
+         id="path2727-9"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1052);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.46812168;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
+      <ellipse
+         ry="0.55289257"
+         rx="1.1178255"
+         cy="300.72787"
+         cx="40.836578"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2717-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.46812168;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path2731-7" />
+    </g>
+    <path
+       style="opacity:1;fill:#e8e87b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97019154;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 30.324574,294.59138 a 11.617691,11.617691 0 0 1 1.142627,4.99839 11.617691,11.617691 0 0 1 -11.617664,11.61766 11.617691,11.617691 0 0 1 -2.932176,-0.39073 10.532993,10.532993 0 0 0 6.557509,2.30345 10.532993,10.532993 0 0 0 10.532643,-10.53302 10.532993,10.532993 0 0 0 -3.682939,-7.99575 z"
+       id="path987"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/icons_src/cr3_option_night_hc-256x256-src.svg b/icons_src/cr3_option_night_hc-256x256-src.svg
deleted file mode 100644
index 0ba5c2a3b4..0000000000
--- a/icons_src/cr3_option_night_hc-256x256-src.svg
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   viewBox="0 0 67.733332 67.733335"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="cr3_option_night_hc-256x256-src.svg">
-  <defs
-     id="defs2">
-    <linearGradient
-       id="linearGradient2329">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2331" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop2333" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2321">
-      <stop
-         style="stop-color:#7b7f7a;stop-opacity:1;"
-         offset="0"
-         id="stop2323" />
-      <stop
-         style="stop-color:#7b7f7a;stop-opacity:0;"
-         offset="1"
-         id="stop2325" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2711">
-      <stop
-         style="stop-color:#909090;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2713" />
-      <stop
-         style="stop-color:#bebebe;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop2715" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2701">
-      <stop
-         style="stop-color:#585956;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2703" />
-      <stop
-         style="stop-color:#bbbeb8;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2705" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2683">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2685" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2687" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2667">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2669" />
-      <stop
-         style="stop-color:#fcfcff;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop2671" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2245">
-      <stop
-         id="stop2247"
-         offset="0.0000000"
-         style="stop-color:#dde1d9;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2249"
-         offset="1.0000000"
-         style="stop-color:#cacdc6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="33.339787"
-       x2="34.784473"
-       y1="7.2293582"
-       x1="8.6116238"
-       gradientTransform="matrix(1.5760634,0,0,1.2345881,3.8759827,233.0285)"
-       id="linearGradient2251"
-       xlink:href="#linearGradient2245"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="55.200756"
-       x2="34.974548"
-       y1="13.004725"
-       x1="17.698339"
-       gradientTransform="matrix(1.5456627,0,0,1.2588708,7.5376346,236.24291)"
-       id="linearGradient2421"
-       xlink:href="#linearGradient2329"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2667"
-       id="linearGradient2673"
-       gradientTransform="matrix(1.7282682,0,0,1.2497815,6.9664899,232.99064)"
-       x1="11.492236"
-       y1="1.6537577"
-       x2="17.199417"
-       y2="26.729263"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2683"
-       id="linearGradient2689"
-       gradientTransform="matrix(7.958215,0,0,0.24450081,7.5376346,233.90035)"
-       x1="3.7069976"
-       y1="171.29134"
-       x2="3.7069974"
-       y2="162.45061"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2701"
-       id="linearGradient2707"
-       gradientTransform="matrix(2.5336478,0,0,1.7839951,3.352888,174.69911)"
-       x1="12.206709"
-       y1="53.535141"
-       x2="12.127711"
-       y2="64.892525"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2711"
-       id="linearGradient2717"
-       x1="34.300991"
-       y1="3.9384086"
-       x2="35.520542"
-       y2="3.8451097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8569632,0,0,0.91848073,-7.7575127,250.13579)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2321"
-       id="linearGradient2327"
-       x1="-35.658386"
-       y1="33.416473"
-       x2="-35.658386"
-       y2="28.205938"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2587341,0,0,1.1545018,78.751073,248.78729)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2329"
-       id="linearGradient2337"
-       x1="-35.122688"
-       y1="34.242237"
-       x2="-35.074745"
-       y2="30.962345"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1683087,0,0,1.1893817,75.43949,246.19024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2711"
-       id="linearGradient154"
-       gradientUnits="userSpaceOnUse"
-       x1="34.300991"
-       y1="3.9384086"
-       x2="35.520542"
-       y2="3.8451097"
-       gradientTransform="matrix(1.8569632,0,0,0.91848073,-8.3913641,238.82888)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2711"
-       id="linearGradient156"
-       gradientUnits="userSpaceOnUse"
-       x1="34.300991"
-       y1="3.9384086"
-       x2="35.520542"
-       y2="3.8451097"
-       gradientTransform="matrix(1.8569632,0,0,0.91848073,-8.2328999,241.7663)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2711"
-       id="linearGradient158"
-       gradientUnits="userSpaceOnUse"
-       x1="34.300991"
-       y1="3.9384086"
-       x2="35.520542"
-       y2="3.8451097"
-       gradientTransform="matrix(1.8569632,0,0,0.91848073,-8.074441,244.55609)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2711"
-       id="linearGradient160"
-       gradientUnits="userSpaceOnUse"
-       x1="34.300991"
-       y1="3.9384086"
-       x2="35.520542"
-       y2="3.8451097"
-       gradientTransform="matrix(1.8569632,0,0,0.91848073,-7.9159769,247.34594)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.2016753"
-     inkscape:cx="-14.686967"
-     inkscape:cy="41.581971"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1523"
-     inkscape:window-height="1050"
-     inkscape:window-x="1368"
-     inkscape:window-y="15"
-     inkscape:window-maximized="0"
-     inkscape:pagecheckerboard="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-229.26664)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path1394"
-       d="m 10.169629,231.61301 c -6.4144537,-0.23654 -8.0365649,6.97369 -8.0997822,12.34675 -0.6664508,11.29154 -1.0464507,22.72048 -1.21662298,33.61419 1.66471848,6.19143 9.30614918,6.34402 14.10937218,6.07812 0.65869,8.99371 11.59147,11.25717 18.917974,11.19141 7.3089,0.0478 18.27993,-2.35296 18.69141,-11.38672 5.99318,1.37006 14.76378,-1.04712 14.50586,-8.52344 -1.06463,-12.81683 -0.56881,-25.92173 -2.48243,-38.58984 -3.6976,-7.68758 -13.85405,-3.82896 -20.39648,-4.73438 -11.34307,0.003 -22.686374,-0.005 -34.029301,0.004 z m 43.843751,11.39258 c 0.50391,9.68555 1.00782,19.37109 1.51172,29.05664 H 12.019239 l 1.513672,-29.05664 z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       sodipodi:nodetypes="cccccccccccccccc" />
-    <ellipse
-       ry="5.4954019"
-       rx="13.104421"
-       cy="283.55798"
-       cx="33.866673"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#adb0aa;fill-opacity:1;fill-rule:evenodd;stroke:#040000;stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       id="path2407" />
-    <ellipse
-       ry="4.5482697"
-       rx="11.825075"
-       cy="283.0947"
-       cx="33.866642"
-       id="path1825"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2327);stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
-    <ellipse
-       ry="4.6856823"
-       rx="10.975581"
-       cy="281.53421"
-       cx="33.779488"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2337);stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       id="path2983" />
-    <rect
-       y="274.18964"
-       x="27.725409"
-       height="8.8786917"
-       width="12.60958"
-       id="rect2699"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2707);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.84912622;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2251);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       d="m 10.440317,237.21324 h 46.852699 c 1.271246,0 2.265547,0.81391 2.324979,1.95512 l 1.858086,35.67929 c 0.08119,1.55912 -1.256895,2.81816 -2.818155,2.81816 H 9.0754071 c -1.5612598,0 -2.8993506,-1.25904 -2.8181547,-2.81816 l 1.8580908,-35.67929 c 0.056201,-1.07905 0.7637195,-1.95512 2.3249738,-1.95512 z"
-       id="rect2404"
-       sodipodi:nodetypes="cssssssss" />
-    <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       id="path2377"
-       d="m 12.295044,240.85427 -1.732756,30.75134 H 54.711906 L 52.849672,240.9846 Z"
-       style="fill:#101010;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.69745773;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient2689);stroke-width:1.38958859;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.24840764"
-       d="M 9.1800534,274.932 H 58.59979"
-       id="path2393" />
-    <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssssssss"
-       id="path2397"
-       d="m 10.208339,238.62311 47.211619,-0.0527 c 0.395725,-4.7e-4 0.780179,0.33109 0.811986,0.91023 l 1.899725,34.59846 c 0.08098,1.47445 -0.752902,2.49113 -2.229591,2.49113 H 9.7440545 c -1.4766897,0 -2.2221202,-1.01662 -2.142411,-2.49113 l 1.8469929,-34.1673 c 0.053987,-0.99854 0.2320788,-1.28809 0.7597026,-1.28867 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2421);stroke-width:1.39491498;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.70063692;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
-    <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       style="opacity:0.53142856;fill:url(#linearGradient2673);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.34872886pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 12.714916,241.46879 -1.119461,24.9276 c 15.406336,-3.3487 21.511638,-14.63573 40.667414,-18.3386 l -0.225225,-6.49684 z"
-       id="path2443" />
-    <ellipse
-       cy="242.44621"
-       cx="56.195328"
-       id="path2709"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient154);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       rx="1.5592721"
-       ry="0.77123845" />
-    <ellipse
-       cy="245.38362"
-       cx="56.353798"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient156);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       id="path2719"
-       rx="1.5592721"
-       ry="0.77123845" />
-    <ellipse
-       cy="248.17342"
-       cx="56.512257"
-       id="path2723"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient158);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       rx="1.5592721"
-       ry="0.77123845" />
-    <ellipse
-       cy="250.96329"
-       cx="56.670715"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient160);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       id="path2727"
-       rx="1.5592721"
-       ry="0.77123845" />
-    <ellipse
-       cy="253.75316"
-       cx="56.829182"
-       id="path2731"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2717);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-       rx="1.5592721"
-       ry="0.77123845" />
-    <path
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.32291663;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 38.892327,243.83526 a 15.841445,15.841445 0 0 1 1.558044,6.81561 15.841445,15.841445 0 0 1 -15.841409,15.84141 15.841445,15.841445 0 0 1 -3.998206,-0.53279 14.362391,14.362391 0 0 0 8.941573,3.1409 14.362391,14.362391 0 0 0 14.361914,-14.36243 14.362391,14.362391 0 0 0 -5.021916,-10.9027 z"
-       id="path987"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path1384"
-       d="m 99.275946,350.47305 c 2.346894,0.78098 -0.49309,-1.48411 0,0 z m 4.388674,-0.0586 c 1.45743,1.31928 0.94992,-1.92322 0,0 z m -2.27148,1.22265 c 1.67094,0.68164 1.08268,-0.87647 0,0 z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/icons_src/cr3_option_night_hc-48x48-src.svg b/icons_src/cr3_option_night_hc-48x48-src.svg
new file mode 100644
index 0000000000..3e6e1b7684
--- /dev/null
+++ b/icons_src/cr3_option_night_hc-48x48-src.svg
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="cr3_option_night_hc-48x48-src.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient2329">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2331" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop2333" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2321">
+      <stop
+         style="stop-color:#7b7f7a;stop-opacity:1;"
+         offset="0"
+         id="stop2323" />
+      <stop
+         style="stop-color:#7b7f7a;stop-opacity:0;"
+         offset="1"
+         id="stop2325" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2711">
+      <stop
+         style="stop-color:#909090;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2713" />
+      <stop
+         style="stop-color:#bebebe;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop2715" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2701">
+      <stop
+         style="stop-color:#585956;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2703" />
+      <stop
+         style="stop-color:#bbbeb8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2705" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2683">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2685" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2687" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2667">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2669" />
+      <stop
+         style="stop-color:#fcfcff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop2671" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2245">
+      <stop
+         id="stop2247"
+         offset="0.0000000"
+         style="stop-color:#dde1d9;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2249"
+         offset="1.0000000"
+         style="stop-color:#cacdc6;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="33.339787"
+       x2="34.784473"
+       y1="7.2293582"
+       x1="8.6116238"
+       gradientTransform="matrix(1.5760634,0,0,1.2345881,3.8759827,233.0285)"
+       id="linearGradient2251"
+       xlink:href="#linearGradient2245"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="55.200756"
+       x2="34.974548"
+       y1="13.004725"
+       x1="17.698339"
+       gradientTransform="matrix(1.5456627,0,0,1.2588708,7.5376346,236.24291)"
+       id="linearGradient2421"
+       xlink:href="#linearGradient2329"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2667"
+       id="linearGradient2673"
+       gradientTransform="matrix(1.7282682,0,0,1.2497815,6.9664899,232.99064)"
+       x1="11.492236"
+       y1="1.6537577"
+       x2="17.199417"
+       y2="26.729263"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2683"
+       id="linearGradient2689"
+       gradientTransform="matrix(7.958215,0,0,0.24450081,7.5376346,233.90035)"
+       x1="3.7069976"
+       y1="171.29134"
+       x2="3.7069974"
+       y2="162.45061"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2701"
+       id="linearGradient2707"
+       gradientTransform="matrix(2.5336478,0,0,1.7839951,3.352888,174.69911)"
+       x1="12.206709"
+       y1="53.535141"
+       x2="12.127711"
+       y2="64.892525"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient2717"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8569632,0,0,0.91848073,-7.7575127,250.13579)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2321"
+       id="linearGradient2327"
+       x1="-35.658386"
+       y1="33.416473"
+       x2="-35.658386"
+       y2="28.205938"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2587341,0,0,1.1545018,78.751073,248.78729)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2329"
+       id="linearGradient2337"
+       x1="-35.122688"
+       y1="34.242237"
+       x2="-35.074745"
+       y2="30.962345"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1683087,0,0,1.1893817,75.43949,246.19024)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient154"
+       gradientUnits="userSpaceOnUse"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientTransform="matrix(1.8569632,0,0,0.91848073,-8.3913641,238.82888)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient156"
+       gradientUnits="userSpaceOnUse"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientTransform="matrix(1.8569632,0,0,0.91848073,-8.2328999,241.7663)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient158"
+       gradientUnits="userSpaceOnUse"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientTransform="matrix(1.8569632,0,0,0.91848073,-8.074441,244.55609)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2711"
+       id="linearGradient160"
+       gradientUnits="userSpaceOnUse"
+       x1="34.300991"
+       y1="3.9384086"
+       x2="35.520542"
+       y2="3.8451097"
+       gradientTransform="matrix(1.8569632,0,0,0.91848073,-7.9159769,247.34594)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.398851"
+     inkscape:cx="17.272867"
+     inkscape:cy="19.507386"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1523"
+     inkscape:window-height="964"
+     inkscape:window-x="229"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29997)">
+    <g
+       id="g878"
+       transform="matrix(0.70867,0,0,0.70867,-0.07232394,121.82529)">
+      <path
+         sodipodi:nodetypes="cccccccccccccccc"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 10.169629,231.61301 c -6.4144537,-0.23654 -8.0365649,6.97369 -8.0997822,12.34675 -0.6664508,11.29154 -1.0464507,22.72048 -1.21662298,33.61419 1.66471848,6.19143 9.30614918,6.34402 14.10937218,6.07812 0.65869,8.99371 11.59147,11.25717 18.917974,11.19141 7.3089,0.0478 18.27993,-2.35296 18.69141,-11.38672 5.99318,1.37006 14.76378,-1.04712 14.50586,-8.52344 -1.06463,-12.81683 -0.56881,-25.92173 -2.48243,-38.58984 -3.6976,-7.68758 -13.85405,-3.82896 -20.39648,-4.73438 -11.34307,0.003 -22.686374,-0.005 -34.029301,0.004 z m 43.843751,11.39258 c 0.50391,9.68555 1.00782,19.37109 1.51172,29.05664 H 12.019239 l 1.513672,-29.05664 z"
+         id="path1394"
+         inkscape:connector-curvature="0" />
+      <ellipse
+         id="path2407"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#adb0aa;fill-opacity:1;fill-rule:evenodd;stroke:#040000;stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         cx="33.866673"
+         cy="283.55798"
+         rx="13.104421"
+         ry="5.4954019" />
+      <ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2327);stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path1825"
+         cx="33.866642"
+         cy="283.0947"
+         rx="11.825075"
+         ry="4.5482697" />
+      <ellipse
+         id="path2983"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2337);stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         cx="33.779488"
+         cy="281.53421"
+         rx="10.975581"
+         ry="4.6856823" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2707);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.84912622;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="rect2699"
+         width="12.60958"
+         height="8.8786917"
+         x="27.725409"
+         y="274.18964" />
+      <path
+         sodipodi:nodetypes="cssssssss"
+         id="rect2404"
+         d="m 10.440317,237.21324 h 46.852699 c 1.271246,0 2.265547,0.81391 2.324979,1.95512 l 1.858086,35.67929 c 0.08119,1.55912 -1.256895,2.81816 -2.818155,2.81816 H 9.0754071 c -1.5612598,0 -2.8993506,-1.25904 -2.8181547,-2.81816 l 1.8580908,-35.67929 c 0.056201,-1.07905 0.7637195,-1.95512 2.3249738,-1.95512 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2251);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.39491546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#101010;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.69745773;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.295044,240.85427 -1.732756,30.75134 H 54.711906 L 52.849672,240.9846 Z"
+         id="path2377"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2393"
+         d="M 9.1800534,274.932 H 58.59979"
+         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient2689);stroke-width:1.38958859;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.24840764"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2421);stroke-width:1.39491498;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.70063692;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 10.208339,238.62311 47.211619,-0.0527 c 0.395725,-4.7e-4 0.780179,0.33109 0.811986,0.91023 l 1.899725,34.59846 c 0.08098,1.47445 -0.752902,2.49113 -2.229591,2.49113 H 9.7440545 c -1.4766897,0 -2.2221202,-1.01662 -2.142411,-2.49113 l 1.8469929,-34.1673 c 0.053987,-0.99854 0.2320788,-1.28809 0.7597026,-1.28867 z"
+         id="path2397"
+         sodipodi:nodetypes="cssssssss"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2443"
+         d="m 12.714916,241.46879 -1.119461,24.9276 c 15.406336,-3.3487 21.511638,-14.63573 40.667414,-18.3386 l -0.225225,-6.49684 z"
+         style="opacity:0.53142856;fill:url(#linearGradient2673);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.34872886pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <ellipse
+         ry="0.77123845"
+         rx="1.5592721"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient154);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path2709"
+         cx="56.195328"
+         cy="242.44621" />
+      <ellipse
+         ry="0.77123845"
+         rx="1.5592721"
+         id="path2719"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient156);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         cx="56.353798"
+         cy="245.38362" />
+      <ellipse
+         ry="0.77123845"
+         rx="1.5592721"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient158);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path2723"
+         cx="56.512257"
+         cy="248.17342" />
+      <ellipse
+         ry="0.77123845"
+         rx="1.5592721"
+         id="path2727"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient160);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         cx="56.670715"
+         cy="250.96329" />
+      <ellipse
+         ry="0.77123845"
+         rx="1.5592721"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2717);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65299022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path2731"
+         cx="56.829182"
+         cy="253.75316" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path987"
+         d="m 38.892327,243.83526 a 15.841445,15.841445 0 0 1 1.558044,6.81561 15.841445,15.841445 0 0 1 -15.841409,15.84141 15.841445,15.841445 0 0 1 -3.998206,-0.53279 14.362391,14.362391 0 0 0 8.941573,3.1409 14.362391,14.362391 0 0 0 14.361914,-14.36243 14.362391,14.362391 0 0 0 -5.021916,-10.9027 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.32291663;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>