support overriding icon color in theme

src/dialog/vfindreplacedialog.cpp

@@ -1,6 +1,8 @@
 #include "vfindreplacedialog.h"
 #include <QtWidgets>
 
+#include "utils/viconutils.h"
+
 VFindReplaceDialog::VFindReplaceDialog(QWidget *p_parent)
     : QWidget(p_parent), m_options(0), m_replaceAvailable(true)
 {
@@ -11,7 +13,7 @@ void VFindReplaceDialog::setupUI()
 {
     QLabel *titleLabel = new QLabel(tr("Find/Replace"));
     titleLabel->setProperty("TitleLabel", true);
-    m_closeBtn = new QPushButton(QIcon(":/resources/icons/close.svg"), "");
+    m_closeBtn = new QPushButton(VIconUtils::titleIcon(":/resources/icons/close.svg"), "");
     m_closeBtn->setProperty("TitleBtn", true);
     QHBoxLayout *titleLayout = new QHBoxLayout();
     titleLayout->addWidget(titleLabel);

src/dialog/vnewfiledialog.cpp

@@ -5,6 +5,7 @@
 #include "vlineedit.h"
 #include "utils/vutils.h"
 #include "utils/vmetawordmanager.h"
+#include "utils/viconutils.h"
 
 extern VConfigManager *g_config;
 
@@ -56,8 +57,8 @@ void VNewFileDialog::setupUI(const QString &p_title,
     m_templateCB->setToolTip(tr("Choose a template (magic word supported)"));
     m_templateCB->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 
-    QPushButton *templateBtn = new QPushButton(QIcon(":/resources/icons/manage_template.svg"),
-                                                 "");
+    QPushButton *templateBtn = new QPushButton(VIconUtils::buttonIcon(":/resources/icons/manage_template.svg"),
+                                               "");
     templateBtn->setToolTip(tr("Manage Templates"));
     templateBtn->setProperty("FlatBtn", true);
     connect(templateBtn, &QPushButton::clicked,

src/resources/icons/add_attachment.svg

@@ -3,5 +3,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<polygon points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
+<polygon style="fill:#000000" points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
 </svg>

src/resources/icons/add_snippet.svg

@@ -3,5 +3,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<polygon points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
+<polygon style="fill:#000000" points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
 </svg>

src/resources/icons/add_style.svg

@@ -3,5 +3,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<polygon points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
+<polygon style="fill:#000000" points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
 </svg>

src/resources/icons/apply_snippet.svg

@@ -4,13 +4,13 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g>
-	<polygon points="198.011,159.22 163.968,193.337 420.064,450 454,415.883 	"/>
-	<rect x="182" y="62" width="32" height="64"/>
-	<rect x="182" y="266" width="32" height="64"/>
-	<rect x="274" y="178" width="64" height="32"/>
-	<polygon points="303.941,112.143 281.314,89.465 236.06,134.82 258.687,157.498 	"/>
-	<polygon points="92.06,112.143 137.314,157.498 159.941,134.82 114.687,89.465 	"/>
-	<polygon points="92.06,279.141 114.687,301.816 159.941,256.462 137.314,233.784 	"/>
-	<rect x="58" y="178" width="64" height="32"/>
+	<polygon style="fill:#000000" points="198.011,159.22 163.968,193.337 420.064,450 454,415.883 	"/>
+	<rect style="fill:#000000" x="182" y="62" width="32" height="64"/>
+	<rect style="fill:#000000" x="182" y="266" width="32" height="64"/>
+	<rect style="fill:#000000" x="274" y="178" width="64" height="32"/>
+	<polygon style="fill:#000000" points="303.941,112.143 281.314,89.465 236.06,134.82 258.687,157.498 	"/>
+	<polygon style="fill:#000000" points="92.06,112.143 137.314,157.498 159.941,134.82 114.687,89.465 	"/>
+	<polygon style="fill:#000000" points="92.06,279.141 114.687,301.816 159.941,256.462 137.314,233.784 	"/>
+	<rect style="fill:#000000" x="58" y="178" width="64" height="32"/>
 </g>
 </svg>

src/resources/icons/attachment.svg

@@ -5,7 +5,7 @@
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g id="Icon_3_">
 	<g>
-		<path d="M341.334,128v234.666C341.334,409.604,302.938,448,256,448c-46.937,0-85.333-38.396-85.333-85.334V117.334
+		<path style="fill:#000000" d="M341.334,128v234.666C341.334,409.604,302.938,448,256,448c-46.937,0-85.333-38.396-85.333-85.334V117.334
 			C170.667,87.469,194.135,64,224,64c29.864,0,53.333,23.469,53.333,53.334v245.333c0,11.729-9.605,21.333-21.334,21.333
 			c-11.729,0-21.333-9.604-21.333-21.333V160h-32v202.667C202.667,392.531,226.135,416,256,416
 			c29.865,0,53.334-23.469,53.334-53.333V117.334C309.334,70.401,270.938,32,224,32c-46.938,0-85.334,38.401-85.334,85.334v245.332

src/resources/icons/bold.svg

@@ -4,4 +4,4 @@
   <title>Layer 1</title>
   <text stroke="#000000" transform="matrix(16.72881317138672,0,0,16.72881317138672,2707.567729830742,-3759.186347961426) " font-weight="bold" xml:space="preserve" text-anchor="middle" font-family="serif" font-size="24" id="svg_4" y="248.490375" x="-146.756839" stroke-width="0" fill="#000000">B</text>
  </g>
-</svg>
+</svg>

src/resources/icons/close.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M443.6,387.1L312.4,255.4l131.5-130c5.4-5.4,5.4-14.2,0-19.6l-37.4-37.6c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4
+<path style="fill:#000000" d="M443.6,387.1L312.4,255.4l131.5-130c5.4-5.4,5.4-14.2,0-19.6l-37.4-37.6c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4
 	L256,197.8L124.9,68.3c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4L68,105.9c-5.4,5.4-5.4,14.2,0,19.6l131.5,130L68.4,387.1
 	c-2.6,2.6-4.1,6.1-4.1,9.8c0,3.7,1.4,7.2,4.1,9.8l37.4,37.6c2.7,2.7,6.2,4.1,9.8,4.1c3.5,0,7.1-1.3,9.8-4.1L256,313.1l130.7,131.1
 	c2.7,2.7,6.2,4.1,9.8,4.1c3.5,0,7.1-1.3,9.8-4.1l37.4-37.6c2.6-2.6,4.1-6.1,4.1-9.8C447.7,393.2,446.2,389.7,443.6,387.1z"/>

src/resources/icons/close_note_tb.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M443.6,387.1L312.4,255.4l131.5-130c5.4-5.4,5.4-14.2,0-19.6l-37.4-37.6c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4
+<path style="fill:#000000" d="M443.6,387.1L312.4,255.4l131.5-130c5.4-5.4,5.4-14.2,0-19.6l-37.4-37.6c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4
 	L256,197.8L124.9,68.3c-2.6-2.6-6.1-4-9.8-4c-3.7,0-7.2,1.5-9.8,4L68,105.9c-5.4,5.4-5.4,14.2,0,19.6l131.5,130L68.4,387.1
 	c-2.6,2.6-4.1,6.1-4.1,9.8c0,3.7,1.4,7.2,4.1,9.8l37.4,37.6c2.7,2.7,6.2,4.1,9.8,4.1c3.5,0,7.1-1.3,9.8-4.1L256,313.1l130.7,131.1
 	c2.7,2.7,6.2,4.1,9.8,4.1c3.5,0,7.1-1.3,9.8-4.1l37.4-37.6c2.6-2.6,4.1-6.1,4.1-9.8C447.7,393.2,446.2,389.7,443.6,387.1z"/>

src/resources/icons/code_block.svg

@@ -1,6 +1,6 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <text style="cursor: move;" fill="#000000" stroke-width="0" x="-146.75684" y="248.49038" id="svg_4" font-size="24" font-family="serif" text-anchor="middle" xml:space="preserve" font-weight="bold" transform="matrix(16.72881317138672,0,0,16.72881317138672,2707.567729830742,-3759.186347961426) " stroke="#000000">#</text>
+  <text style="cursor: move;" fill="#000000" stroke-width="0" x="-146.75684" y="248.49038" id="svg_4" font-size="24" font-family="serif" text-anchor="middle" xml:space="preserve" font-weight="normal" transform="matrix(16.72881317138672,0,0,16.72881317138672,2707.567729830742,-3759.186347961426) " stroke="#000000">#</text>
  </g>
 </svg>

src/resources/icons/copy.svg

@@ -4,8 +4,8 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<polygon points="304,96 288,96 288,176 368,176 368,160 304,160 	"/>
-	<path d="M325.3,64H160v48h-48v336h240v-48h48V139L325.3,64z M336,432H128V128h32v272h176V432z M384,384H176V80h142.7l65.3,65.6V384
+	<polygon style="fill:#000000" points="304,96 288,96 288,176 368,176 368,160 304,160 	"/>
+	<path style="fill:#000000" d="M325.3,64H160v48h-48v336h240v-48h48V139L325.3,64z M336,432H128V128h32v272h176V432z M384,384H176V80h142.7l65.3,65.6V384
 		z"/>
 </g>
 </svg>

src/resources/icons/create_note.svg

@@ -3,5 +3,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<polygon points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
+<polygon style="fill:#000000" points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
 </svg>

src/resources/icons/create_note_tb.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M399.3,168.9c-0.7-2.9-2-5-3.5-6.8l-83.7-91.7c-1.9-2.1-4.1-3.1-6.6-4.4c-2.9-1.5-6.1-1.6-9.4-1.6H136.2
+<path style="fill:#000000" d="M399.3,168.9c-0.7-2.9-2-5-3.5-6.8l-83.7-91.7c-1.9-2.1-4.1-3.1-6.6-4.4c-2.9-1.5-6.1-1.6-9.4-1.6H136.2
 	c-12.4,0-23.7,9.6-23.7,22.9v335.2c0,13.4,11.3,25.9,23.7,25.9h243.1c12.4,0,21.2-12.5,21.2-25.9V178.4
 	C400.5,174.8,400.1,172.2,399.3,168.9z M305.5,111l58,63.5h-58V111z M144.5,416.5v-320h129v81.7c0,14.8,13.4,28.3,28.1,28.3h66.9
 	v210H144.5z"/>

src/resources/icons/create_notebook.svg

@@ -3,5 +3,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<polygon points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
+<polygon style="fill:#000000" points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
 </svg>

src/resources/icons/create_rootdir.svg

@@ -3,5 +3,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<polygon points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
+<polygon style="fill:#000000" points="448,224 288,224 288,64 224,64 224,224 64,224 64,288 224,288 224,448 288,448 288,288 448,288 "/>
 </svg>

src/resources/icons/create_rootdir_tb.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
+<path style="fill:#000000" d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
 	C460.803,416,480,396.802,480,373.333V186.667C480,163.198,460.803,144,437.334,144z M448,373.333
 	c0,5.782-4.885,10.667-10.666,10.667H74.666C68.884,384,64,379.115,64,373.333V176h373.334c5.781,0,10.666,4.885,10.666,10.667
 	V373.333z"/>

src/resources/icons/create_subdir.svg

@@ -1,9 +1,9 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <polygon fill="black" id="svg_1" points="272,170.0833282470703 189.9166717529297,170.0833282470703 189.9166717529297,88 157.0833282470703,88 157.0833282470703,170.0833282470703 75,170.0833282470703 75,202.9166717529297 157.0833282470703,202.9166717529297 157.0833282470703,285 189.9166717529297,285 189.9166717529297,202.9166717529297 272,202.9166717529297 "/>
+  <polygon fill="#000000" id="svg_1" points="272,170.0833282470703 189.9166717529297,170.0833282470703 189.9166717529297,88 157.0833282470703,88 157.0833282470703,170.0833282470703 75,170.0833282470703 75,202.9166717529297 157.0833282470703,202.9166717529297 157.0833282470703,285 189.9166717529297,285 189.9166717529297,202.9166717529297 272,202.9166717529297 "/>
   <g id="svg_7"/>
-  <polygon id="svg_9" fill="black" points="435.5,307.5833282470703 353.41668701171875,307.5833282470703 353.41668701171875,225.5 320.58331298828125,225.5 320.58331298828125,307.5833282470703 238.5,307.5833282470703 238.5,340.4166717529297 320.58331298828125,340.4166717529297 320.58331298828125,422.5 353.41668701171875,422.5 353.41668701171875,340.4166717529297 435.5,340.4166717529297 "/>
+  <polygon id="svg_9" fill="#000000" points="435.5,307.5833282470703 353.41668701171875,307.5833282470703 353.41668701171875,225.5 320.58331298828125,225.5 320.58331298828125,307.5833282470703 238.5,307.5833282470703 238.5,340.4166717529297 320.58331298828125,340.4166717529297 320.58331298828125,422.5 353.41668701171875,422.5 353.41668701171875,340.4166717529297 435.5,340.4166717529297 "/>
  </g>
 
 </svg>

src/resources/icons/cut.svg

@@ -4,16 +4,16 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g>
-	<path d="M405.178,115.667c13.314-32.667,17.309-64-5.326-83.667L255.726,224l-16.976,23c0,0-27.627,40.011-37.28,58.667
+	<path style="fill:#000000" d="M405.178,115.667c13.314-32.667,17.309-64-5.326-83.667L255.726,224l-16.976,23c0,0-27.627,40.011-37.28,58.667
 		s-19.306,39.333-27.294,54c-7.01,12.871-10.438,15.221-14.322,11.548c-0.506-0.591-1.026-1.168-1.553-1.736
 		c-0.037-0.047-0.073-0.09-0.11-0.138c-1.143-1.472-2.75-3.002-4.635-4.467C144.195,356.795,132.548,352,119.92,352
 		C89.037,352,64,380.653,64,416s25.037,64,55.92,64c25.282,0,46.635-19.205,53.553-45.561l-0.004,0.043
 		c0,0,13.355-41.482,32.661-71.482c19.306-30,49.596-43,49.596-43l31.954-32C287.68,288,391.863,148.334,405.178,115.667z
 		 M119.92,448c-15.418,0-27.918-14.353-27.918-32s12.5-32,27.918-32c15.419,0,27.918,14.353,27.918,32S135.339,448,119.92,448z
 		 M256,288c-8.836,0-16-7.163-16-16c0-8.836,7.164-16,16-16c8.837,0,16,7.164,16,16C272,280.837,264.837,288,256,288z"/>
-	<path d="M207.28,265.255c9.18-14.114,17.671-26.43,18.304-27.346l0.143-0.208l0.15-0.203l16.976-23l0.038-0.052l0.039-0.052
+	<path style="fill:#000000" d="M207.28,265.255c9.18-14.114,17.671-26.43,18.304-27.346l0.143-0.208l0.15-0.203l16.976-23l0.038-0.052l0.039-0.052
 		l2.941-3.918L111.896,32c-22.634,19.667-18.64,51-5.326,83.667C116.523,140.087,177.249,224.29,207.28,265.255z"/>
-	<path d="M391.828,352c-12.628,0-24.275,4.795-33.637,12.874c-1.885,1.465-3.492,2.995-4.635,4.467
+	<path style="fill:#000000" d="M391.828,352c-12.628,0-24.275,4.795-33.637,12.874c-1.885,1.465-3.492,2.995-4.635,4.467
 		c-0.037,0.048-0.072,0.091-0.109,0.138c-0.526,0.568-1.047,1.146-1.553,1.736c-3.884,3.673-7.312,1.323-14.322-11.548
 		c-7.988-14.667-17.641-35.344-27.294-54c-1.77-3.421-4.146-7.561-6.843-12.038c-1.272,1.712-2.264,3.043-2.932,3.938l-0.688,0.924
 		l-0.813,0.815l-28.688,28.729c10.433,6.855,24.565,18.276,35.306,34.965c19.305,30,32.66,71.482,32.66,71.482l-0.004-0.043

src/resources/icons/delete_attachment.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
+<path style="fill:#000000" d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
 	l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
 	h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
 	 M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>

src/resources/icons/delete_dir.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
+<path style="fill:#000000" d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
 	l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
 	h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
 	 M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>

src/resources/icons/delete_note.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
+<path style="fill:#000000" d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
 	l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
 	h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
 	 M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>

src/resources/icons/delete_notebook.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
+<path style="fill:#000000" d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
 	l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
 	h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
 	 M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>

src/resources/icons/delete_snippet.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
+<path style="fill:#000000" d="M341,128V99c0-19.1-14.5-35-34.5-35H205.4C185.5,64,171,79.9,171,99v29H80v32h9.2c0,0,5.4,0.6,8.2,3.4c2.8,2.8,3.9,9,3.9,9
 	l19,241.7c1.5,29.4,1.5,33.9,36,33.9h199.4c34.5,0,34.5-4.4,36-33.8l19-241.6c0,0,1.1-6.3,3.9-9.1c2.8-2.8,8.2-3.4,8.2-3.4h9.2v-32
 	h-91V128z M192,99c0-9.6,7.8-15,17.7-15h91.7c9.9,0,18.6,5.5,18.6,15v29H192V99z M183.5,384l-10.3-192h20.3L204,384H183.5z
 	 M267.1,384h-22V192h22V384z M328.7,384h-20.4l10.5-192h20.3L328.7,384z"/>

src/resources/icons/dir_info.svg

@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<polygon points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
-	<path d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
+	<polygon style="fill:#000000" points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
+	<path style="fill:#000000" d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
 </g>
 </svg>

src/resources/icons/dir_item.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
+<path style="fill:#000000" d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
 	C460.803,416,480,396.802,480,373.333V186.667C480,163.198,460.803,144,437.334,144z M448,373.333
 	c0,5.782-4.885,10.667-10.666,10.667H74.666C68.884,384,64,379.115,64,373.333V176h373.334c5.781,0,10.666,4.885,10.666,10.667
 	V373.333z"/>

src/resources/icons/discard_exit.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M215.469,332.802l29.863,29.864L352,256L245.332,149.333l-29.863,29.865l55.469,55.469H64v42.666h205.864L215.469,332.802z
+<path style="fill:#000000" d="M215.469,332.802l29.863,29.864L352,256L245.332,149.333l-29.863,29.865l55.469,55.469H64v42.666h205.864L215.469,332.802z
 	 M405.334,64H106.666C83.198,64,64,83.198,64,106.666V192h42.666v-85.333h298.668v298.668H106.666V320H64v85.334
 	C64,428.802,83.198,448,106.666,448h298.668C428.802,448,448,428.802,448,405.334V106.666C448,83.198,428.802,64,405.334,64z"/>
 </svg>

src/resources/icons/edit_note.svg

@@ -4,11 +4,11 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<path d="M442.8,99.6l-30.4-30.4c-7-6.9-18.2-6.9-25.1,0L355.5,101l55.5,55.5l31.8-31.7C449.7,117.7,449.7,106.5,442.8,99.6z"/>
+	<path style="fill:#000000" d="M442.8,99.6l-30.4-30.4c-7-6.9-18.2-6.9-25.1,0L355.5,101l55.5,55.5l31.8-31.7C449.7,117.7,449.7,106.5,442.8,99.6z"/>
 	<g>
-		<polygon points="346.1,110.5 174.1,288 160,352 224,337.9 400.6,164.9 		"/>
+		<polygon style="fill:#000000" points="346.1,110.5 174.1,288 160,352 224,337.9 400.6,164.9 		"/>
 	</g>
-	<path d="M384,256v150c0,5.1-3.9,10.1-9.2,10.1s-269-0.1-269-0.1c-5.6,0-9.8-5.4-9.8-10s0-268,0-268c0-5,4.7-10,10.6-10H256l32-32
+	<path style="fill:#000000" d="M384,256v150c0,5.1-3.9,10.1-9.2,10.1s-269-0.1-269-0.1c-5.6,0-9.8-5.4-9.8-10s0-268,0-268c0-5,4.7-10,10.6-10H256l32-32
 		H87.4c-13,0-23.4,10.3-23.4,23.3v305.3c0,12.9,10.5,23.4,23.4,23.4h305.3c12.9,0,23.3-10.5,23.3-23.4V224L384,256z"/>
 </g>
 </svg>

src/resources/icons/editing.svg

@@ -5,9 +5,9 @@
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g>
 	
-		<rect x="178.846" y="92.087" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 224.3476 631.1498)" width="128.085" height="354.049"/>
-	<path d="M471.723,88.393l-48.115-48.114c-11.723-11.724-31.558-10.896-44.304,1.85l-45.202,45.203l90.569,90.568l45.202-45.202
+		<rect style="fill:#000000" x="178.846" y="92.087" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 224.3476 631.1498)" width="128.085" height="354.049"/>
+	<path style="fill:#000000" d="M471.723,88.393l-48.115-48.114c-11.723-11.724-31.558-10.896-44.304,1.85l-45.202,45.203l90.569,90.568l45.202-45.202
 		C482.616,119.952,483.445,100.116,471.723,88.393z"/>
-	<polygon points="64.021,363.252 32,480 148.737,447.979 	"/>
+	<polygon style="fill:#000000" points="64.021,363.252 32,480 148.737,447.979 	"/>
 </g>
 </svg>

src/resources/icons/expand.svg

@@ -4,9 +4,9 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<polygon points="274,209.7 337.9,145.9 288,96 416,96 416,224 366.1,174.1 302.3,238 	"/>
-	<polygon points="274,302.3 337.9,366.1 288,416 416,416 416,288 366.1,337.9 302.3,274 	"/>
-	<polygon points="238,302.3 174.1,366.1 224,416 96,416 96,288 145.9,337.9 209.7,274 	"/>
-	<polygon points="238,209.7 174.1,145.9 224,96 96,96 96,224 145.9,174.1 209.7,238 	"/>
+	<polygon style="fill:#000000" points="274,209.7 337.9,145.9 288,96 416,96 416,224 366.1,174.1 302.3,238 	"/>
+	<polygon style="fill:#000000" points="274,302.3 337.9,366.1 288,416 416,416 416,288 366.1,337.9 302.3,274 	"/>
+	<polygon style="fill:#000000" points="238,302.3 174.1,366.1 224,416 96,416 96,288 145.9,337.9 209.7,274 	"/>
+	<polygon style="fill:#000000" points="238,209.7 174.1,145.9 224,96 96,96 96,224 145.9,174.1 209.7,238 	"/>
 </g>
 </svg>

src/resources/icons/find_replace.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M445,386.7l-84.8-85.9c13.8-24.1,21-50.9,21-77.9c0-87.6-71.2-158.9-158.6-158.9C135.2,64,64,135.3,64,222.9
+<path style="fill:#000000" d="M445,386.7l-84.8-85.9c13.8-24.1,21-50.9,21-77.9c0-87.6-71.2-158.9-158.6-158.9C135.2,64,64,135.3,64,222.9
 	c0,87.6,71.2,158.9,158.6,158.9c27.9,0,55.5-7.7,80.1-22.4l84.4,85.6c1.9,1.9,4.6,3.1,7.3,3.1c2.7,0,5.4-1.1,7.3-3.1l43.3-43.8
 	C449,397.1,449,390.7,445,386.7z M222.6,125.9c53.4,0,96.8,43.5,96.8,97c0,53.5-43.4,97-96.8,97c-53.4,0-96.8-43.5-96.8-97
 	C125.8,169.4,169.2,125.9,222.6,125.9z"/>

src/resources/icons/flash_page.svg

@@ -4,14 +4,14 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<path d="M400,172.9C400,95.1,333.9,32,256,32c-77.9,0-144,63.1-144,141c0,31,13.2,59,30.2,83h-0.3c10.9,15,21.4,27.7,31.5,45
+	<path style="fill:#000000" d="M400,172.9C400,95.1,333.9,32,256,32c-77.9,0-144,63.1-144,141c0,31,13.2,59,30.2,83h-0.3c10.9,15,21.4,27.7,31.5,45
 		c22,37.8,18.6,74.3,18.7,81.6v1.4h128v-1.4c0-8.9-3.6-43.8,18.4-81.6c10.1-17.3,20.6-30,31.5-45h-0.1C386.8,232,400,204,400,172.9z
 		 M351,254.4c-0.6,0.8-1.1,1.5-1.7,2.3c-8.1,10.9-16.5,22.2-24.7,36.1c-17.3,29.7-20.4,57.9-20.8,75.1H288V256l32-64h-16.6L272,256
 		v112h-32V256l-31.4-64H192l32,64v112h-15.9c-0.5-17.2-3.9-45.7-20.9-75c-4.5-7.7-9.1-15-13.7-21h0.2l-18.6-25.6
 		c-15.8-21.6-27.1-47.1-27.1-73.6c0-33.4,16-64.8,39.6-88.4s55-36.7,88.4-36.7c33.4,0,64.8,13.1,88.4,36.7
 		c23.6,23.6,39.6,55,39.6,88.4c0,26.5-11.3,51.9-27.1,73.5L351,254.4z"/>
-	<rect x="224" y="464" width="64" height="16"/>
-	<rect x="208" y="432" width="96" height="16"/>
-	<rect x="208" y="400" width="96" height="16"/>
+	<rect style="fill:#000000" x="224" y="464" width="64" height="16"/>
+	<rect style="fill:#000000" x="208" y="432" width="96" height="16"/>
+	<rect style="fill:#000000" x="208" y="400" width="96" height="16"/>
 </g>
 </svg>

src/resources/icons/heading.svg

@@ -2,6 +2,6 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <text stroke="#000000" transform="matrix(16.72881317138672,0,0,16.72881317138672,2707.567729830742,-3759.186347961426) " font-weight="bold" xml:space="preserve" text-anchor="middle" font-family="serif" font-size="24" id="svg_4" y="248.490375" x="-146.756839" stroke-width="0" fill="#000000">H</text>
+  <text stroke="#000000" transform="matrix(16.72881317138672,0,0,16.72881317138672,2707.567729830742,-3759.186347961426) " font-weight="normal" xml:space="preserve" text-anchor="middle" font-family="serif" font-size="24" id="svg_4" y="248.490375" x="-146.756839" stroke-width="0" fill="#000000">H</text>
  </g>
 </svg>

src/resources/icons/import_note.svg

@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<path d="M398.6,169.2c-0.9-2.2-2-4.3-3.5-6.1l-83.8-91.7c-1.9-2.1-4.2-3.6-6.7-4.9c-2.9-1.5-6.1-2.1-9.5-2.1H135.2
+	<path style="fill:#000000" d="M398.6,169.2c-0.9-2.2-2-4.3-3.5-6.1l-83.8-91.7c-1.9-2.1-4.2-3.6-6.7-4.9c-2.9-1.5-6.1-2.1-9.5-2.1H135.2
 		c-12.4,0-22.7,10.6-22.7,23.9v335.2c0,13.4,10.3,24.9,22.7,24.9h243.1c12.4,0,22.2-11.5,22.2-24.9V179.4
 		C400.5,175.8,400,172.3,398.6,169.2z M160.5,178.6c0-1.5,1.8-2.1,3.4-2.1h70.8c1.6,0,2.8,0.6,2.8,2.1v10.8c0,1.4-1.1,3.1-2.8,3.1
 		h-70.8c-1.6,0-3.4-1.7-3.4-3.1V178.6z M160.5,306.6c0-1.5,1.8-2.1,3.4-2.1h122.2c1.6,0,2.4,0.6,2.4,2.1v10.8c0,1.4-0.7,3.1-2.4,3.1

src/resources/icons/insert_image.svg

@@ -4,8 +4,8 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<path d="M368,224c26.5,0,48-21.5,48-48c0-26.5-21.5-48-48-48c-26.5,0-48,21.5-48,48C320,202.5,341.5,224,368,224z"/>
-	<path d="M452,64H60c-15.6,0-28,12.7-28,28.3v327.4c0,15.6,12.4,28.3,28,28.3h392c15.6,0,28-12.7,28-28.3V92.3
+	<path style="fill:#000000" d="M368,224c26.5,0,48-21.5,48-48c0-26.5-21.5-48-48-48c-26.5,0-48,21.5-48,48C320,202.5,341.5,224,368,224z"/>
+	<path style="fill:#000000" d="M452,64H60c-15.6,0-28,12.7-28,28.3v327.4c0,15.6,12.4,28.3,28,28.3h392c15.6,0,28-12.7,28-28.3V92.3
 		C480,76.7,467.6,64,452,64z M348.9,261.7c-3-3.5-7.6-6.2-12.8-6.2c-5.1,0-8.7,2.4-12.8,5.7l-18.7,15.8c-3.9,2.8-7,4.7-11.5,4.7
 		c-4.3,0-8.2-1.6-11-4.1c-1-0.9-2.8-2.6-4.3-4.1L224,215.3c-4-4.6-10-7.5-16.7-7.5c-6.7,0-12.9,3.3-16.8,7.8L64,368.2V107.7
 		c1-6.8,6.3-11.7,13.1-11.7h357.7c6.9,0,12.5,5.1,12.9,12l0.3,260.4L348.9,261.7z"/>

src/resources/icons/link.svg

@@ -4,11 +4,11 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<path d="M256.5,208H256v0C256.2,208,256.3,208,256.5,208z"/>
-	<path d="M368.5,160H320c0,0,26,17,31.6,48H368h0.5c17.6,0,31.5,13.9,31.5,31.5v32c0,17.6-13.9,32.5-31.5,32.5h-112
+	<path style="fill:#000000" d="M256.5,208H256v0C256.2,208,256.3,208,256.5,208z"/>
+	<path style="fill:#000000" d="M368.5,160H320c0,0,26,17,31.6,48H368h0.5c17.6,0,31.5,13.9,31.5,31.5v32c0,17.6-13.9,32.5-31.5,32.5h-112
 		c-17.6,0-32.5-14.9-32.5-32.5V240h-48v31.5c0,11.5,2.5,22.5,6.9,32.5c12.6,28.2,40.9,48,73.6,48h112c44.2,0,79.5-36.3,79.5-80.5
 		v-32C448,195.3,412.7,160,368.5,160z"/>
-	<path d="M329.6,208c-12.1-28.3-40.1-48-73.1-48h-112c-44.2,0-80.5,35.3-80.5,79.5v32c0,44.2,36.3,80.5,80.5,80.5H192
+	<path style="fill:#000000" d="M329.6,208c-12.1-28.3-40.1-48-73.1-48h-112c-44.2,0-80.5,35.3-80.5,79.5v32c0,44.2,36.3,80.5,80.5,80.5H192
 		c0,0-25.8-17-32.1-48h-15.4c-17.6,0-32.5-14.9-32.5-32.5v-32c0-17.6,14.9-31.5,32.5-31.5H256h0.5c17.6,0,31.5,13.9,31.5,31.5v32
 		c0,0.2,0,0.3,0,0.5h48c0-0.2,0-0.3,0-0.5v-32C336,228.3,333.7,217.6,329.6,208z"/>
 </g>

src/resources/icons/locate_attachment.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
+<path style="fill:#000000" d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
 	C460.803,416,480,396.802,480,373.333V186.667C480,163.198,460.803,144,437.334,144z M448,373.333
 	c0,5.782-4.885,10.667-10.666,10.667H74.666C68.884,384,64,379.115,64,373.333V176h373.334c5.781,0,10.666,4.885,10.666,10.667
 	V373.333z"/>

src/resources/icons/locate_note.svg

@@ -5,7 +5,7 @@
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g id="Icon">
 	<g>
-		<path d="M256,176c-44.004,0-80.001,36-80.001,80c0,44.004,35.997,80,80.001,80c44.005,0,79.999-35.996,79.999-80
+		<path style="fill:#000000" d="M256,176c-44.004,0-80.001,36-80.001,80c0,44.004,35.997,80,80.001,80c44.005,0,79.999-35.996,79.999-80
 			C335.999,212,300.005,176,256,176z M446.938,234.667c-9.605-88.531-81.074-160-169.605-169.599V32h-42.666v33.067
 			c-88.531,9.599-160,81.068-169.604,169.599H32v42.667h33.062c9.604,88.531,81.072,160,169.604,169.604V480h42.666v-33.062
 			c88.531-9.604,160-81.073,169.605-169.604H480v-42.667H446.938z M256,405.333c-82.137,0-149.334-67.198-149.334-149.333

src/resources/icons/locate_snippet.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
+<path style="fill:#000000" d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
 	C460.803,416,480,396.802,480,373.333V186.667C480,163.198,460.803,144,437.334,144z M448,373.333
 	c0,5.782-4.885,10.667-10.666,10.667H74.666C68.884,384,64,379.115,64,373.333V176h373.334c5.781,0,10.666,4.885,10.666,10.667
 	V373.333z"/>

src/resources/icons/manage_template.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
+<path style="fill:#000000" d="M437.334,144H256.006l-42.668-48H74.666C51.197,96,32,115.198,32,138.667v234.666C32,396.802,51.197,416,74.666,416h362.668
 	C460.803,416,480,396.802,480,373.333V186.667C480,163.198,460.803,144,437.334,144z M448,373.333
 	c0,5.782-4.885,10.667-10.666,10.667H74.666C68.884,384,64,379.115,64,373.333V176h373.334c5.781,0,10.666,4.885,10.666,10.667
 	V373.333z"/>

src/resources/icons/move_tab_left.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M189.3,128.4L89,233.4c-6,5.8-9,13.7-9,22.4c0,8.7,3,16.5,9,22.4l100.3,105.4c11.9,12.5,31.3,12.5,43.2,0
+<path style="fill:#000000" d="M189.3,128.4L89,233.4c-6,5.8-9,13.7-9,22.4c0,8.7,3,16.5,9,22.4l100.3,105.4c11.9,12.5,31.3,12.5,43.2,0
 	c11.9-12.5,11.9-32.7,0-45.2L184.4,288h217c16.9,0,30.6-14.3,30.6-32c0-17.7-13.7-32-30.6-32h-217l48.2-50.4
 	c11.9-12.5,11.9-32.7,0-45.2C220.6,115.9,201.3,115.9,189.3,128.4z"/>
 </svg>

src/resources/icons/move_tab_right.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M322.7,128.4L423,233.4c6,5.8,9,13.7,9,22.4c0,8.7-3,16.5-9,22.4L322.7,383.6c-11.9,12.5-31.3,12.5-43.2,0
+<path style="fill:#000000" d="M322.7,128.4L423,233.4c6,5.8,9,13.7,9,22.4c0,8.7-3,16.5-9,22.4L322.7,383.6c-11.9,12.5-31.3,12.5-43.2,0
 	c-11.9-12.5-11.9-32.7,0-45.2l48.2-50.4h-217C93.7,288,80,273.7,80,256c0-17.7,13.7-32,30.6-32h217l-48.2-50.4
 	c-11.9-12.5-11.9-32.7,0-45.2C291.4,115.9,310.7,115.9,322.7,128.4z"/>
 </svg>

src/resources/icons/note_info.svg

@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<polygon points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
-	<path d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
+	<polygon style="fill:#000000" points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
+	<path style="fill:#000000" d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
 </g>
 </svg>

src/resources/icons/note_info_tb.svg

@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<polygon points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
-	<path d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
+	<polygon style="fill:#000000" points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
+	<path style="fill:#000000" d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
 </g>
 </svg>

src/resources/icons/notebook_info.svg

@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<polygon points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
-	<path d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
+	<polygon style="fill:#000000" points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
+	<path style="fill:#000000" d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
 </g>
 </svg>

src/resources/icons/notebook_item.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M347.621,64c-40.941,0-79.121,14-91.578,44.495C242.5,78,205.408,64,164.466,64C109.265,64,64,89.98,64,143v1v8.995V417v9
+<path style="fill:#000000" d="M347.621,64c-40.941,0-79.121,14-91.578,44.495C242.5,78,205.408,64,164.466,64C109.265,64,64,89.98,64,143v1v8.995V417v9
 	h6.215h10.958h4.967c12.86-26.334,44.238-42,78.325-42c40.224,0,73.877,27.528,81.617,64h19.714c7.739-36.472,41.495-64,81.722-64
 	c34.085,0,61.149,11.666,78.429,42h4.967h10.959H448v-17V148v-4v-1C448,89.98,402.823,64,347.621,64z M248,410.926
 	C230,385.055,199.27,368,164.5,368c-34.769,0-64.5,10.055-83.5,35.926l-1,0.537V142l0,0v-1c3-41.825,40.089-61,84.293-61

src/resources/icons/outline.svg

@@ -5,19 +5,19 @@
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g>
 	<g>
-		<path d="M432,80v352H80V80H432 M448,64H64v384h384V64L448,64z"/>
+		<path style="fill:#000000" d="M432,80v352H80V80H432 M448,64H64v384h384V64L448,64z"/>
 		<g>
-			<rect x="192" y="152" width="192" height="16"/>
+			<rect style="fill:#000000" x="192" y="152" width="192" height="16"/>
 		</g>
 		<g>
-			<rect x="192" y="248" width="192" height="16"/>
+			<rect style="fill:#000000" x="192" y="248" width="192" height="16"/>
 		</g>
 		<g>
-			<rect x="192" y="344" width="192" height="16"/>
+			<rect style="fill:#000000" x="192" y="344" width="192" height="16"/>
 		</g>
 	</g>
-	<circle cx="144" cy="160" r="16"/>
-	<circle cx="144" cy="256" r="16"/>
-	<circle cx="144" cy="352" r="16"/>
+	<circle style="fill:#000000" cx="144" cy="160" r="16"/>
+	<circle style="fill:#000000" cx="144" cy="256" r="16"/>
+	<circle style="fill:#000000" cx="144" cy="352" r="16"/>
 </g>
 </svg>

src/resources/icons/paste.svg

@@ -4,11 +4,11 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g>
-	<path d="M255.988,32C160.473,32,78.934,91.804,46.727,176h34.639c9.396-20.484,22.457-39.35,38.868-55.762
+	<path style="fill:#000000" d="M255.988,32C160.473,32,78.934,91.804,46.727,176h34.639c9.396-20.484,22.457-39.35,38.868-55.762
 		C156.497,83.973,204.709,64,255.988,64c51.286,0,99.504,19.973,135.771,56.239C428.027,156.505,448,204.719,448,256
 		c0,51.285-19.973,99.501-56.239,135.765C355.494,428.029,307.275,448,255.988,448c-51.281,0-99.493-19.971-135.755-56.234
 		C103.821,375.354,90.76,356.486,81.362,336H46.725c32.206,84.201,113.746,144,209.264,144C379.703,480,480,379.715,480,256
 		C480,132.298,379.703,32,255.988,32z"/>
-	<polygon points="206.863,323.883 229.49,346.51 320,256 229.49,165.49 206.862,188.118 258.745,240 32,240 32,272 258.745,272 	"/>
+	<polygon style="fill:#000000" points="206.863,323.883 229.49,346.51 320,256 229.49,165.49 206.862,188.118 258.745,240 32,240 32,272 258.745,272 	"/>
 </g>
 </svg>

src/resources/icons/print.svg

@@ -4,11 +4,11 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<path d="M423.8,128H384V64H128v64H88.2C60.3,128,32,144.9,32,182.6v123.8c0,38,28.3,61.6,56.2,61.6c0,0,30.4,0,39.8,0v112h5h11h224
+	<path style="fill:#000000" d="M423.8,128H384V64H128v64H88.2C60.3,128,32,144.9,32,182.6v123.8c0,38,28.3,61.6,56.2,61.6c0,0,30.4,0,39.8,0v112h5h11h224
 		h8h8V368c10.3,0,39.8,0,39.8,0c27.9,0,56.2-22.6,56.2-53.6V182.6C480,146.9,451.8,128,423.8,128z M368,464H144V288h224V464z
 		 M368,128H144V80h224V128z M416,192h-17v-16h17V192z"/>
-	<rect x="160" y="320" width="192" height="16"/>
-	<rect x="160" y="368" width="192" height="16"/>
-	<rect x="160" y="416" width="192" height="16"/>
+	<rect style="fill:#000000" x="160" y="320" width="192" height="16"/>
+	<rect style="fill:#000000" x="160" y="368" width="192" height="16"/>
+	<rect style="fill:#000000" x="160" y="416" width="192" height="16"/>
 </g>
 </svg>

src/resources/icons/reading.svg

@@ -4,11 +4,11 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g>
-	<path d="M112,64v16v320h16V80h304v337.143c0,8.205-6.652,14.857-14.857,14.857H94.857C86.652,432,80,425.348,80,417.143V128h16v-16
+	<path style="fill:#000000" d="M112,64v16v320h16V80h304v337.143c0,8.205-6.652,14.857-14.857,14.857H94.857C86.652,432,80,425.348,80,417.143V128h16v-16
 		H64v305.143C64,434.157,77.843,448,94.857,448h322.285C434.157,448,448,434.157,448,417.143V64H112z"/>
-	<rect x="160" y="112" width="128" height="16"/>
-	<rect x="160" y="192" width="240" height="16"/>
-	<rect x="160" y="272" width="192" height="16"/>
-	<rect x="160" y="352" width="240" height="16"/>
+	<rect style="fill:#000000" x="160" y="112" width="128" height="16"/>
+	<rect style="fill:#000000" x="160" y="192" width="240" height="16"/>
+	<rect style="fill:#000000" x="160" y="272" width="192" height="16"/>
+	<rect style="fill:#000000" x="160" y="352" width="240" height="16"/>
 </g>
 </svg>

src/resources/icons/remove_split.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M458,210.409l-145.267-12.476L256,64l-56.743,133.934L54,210.409l110.192,95.524L131.161,448L256,372.686L380.83,448
+<path style="fill:#000000" d="M458,210.409l-145.267-12.476L256,64l-56.743,133.934L54,210.409l110.192,95.524L131.161,448L256,372.686L380.83,448
 	l-33.021-142.066L458,210.409z M272.531,345.286L256,335.312l-16.53,9.973l-59.988,36.191l15.879-68.296l4.369-18.79l-14.577-12.637
 	l-52.994-45.939l69.836-5.998l19.206-1.65l7.521-17.75l27.276-64.381l27.27,64.379l7.52,17.751l19.208,1.65l69.846,5.998
 	l-52.993,45.939l-14.576,12.636l4.367,18.788l15.875,68.299L272.531,345.286z"/>

src/resources/icons/save_exit.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M461.6,109.6l-54.9-43.3c-1.7-1.4-3.8-2.4-6.2-2.4c-2.4,0-4.6,1-6.3,2.5L194.5,323c0,0-78.5-75.5-80.7-77.7
+<path style="fill:#000000" d="M461.6,109.6l-54.9-43.3c-1.7-1.4-3.8-2.4-6.2-2.4c-2.4,0-4.6,1-6.3,2.5L194.5,323c0,0-78.5-75.5-80.7-77.7
 	c-2.2-2.2-5.1-5.9-9.5-5.9c-4.4,0-6.4,3.1-8.7,5.4c-1.7,1.8-29.7,31.2-43.5,45.8c-0.8,0.9-1.3,1.4-2,2.1c-1.2,1.7-2,3.6-2,5.7
 	c0,2.2,0.8,4,2,5.7l2.8,2.6c0,0,139.3,133.8,141.6,136.1c2.3,2.3,5.1,5.2,9.2,5.2c4,0,7.3-4.3,9.2-6.2L462,121.8
 	c1.2-1.7,2-3.6,2-5.8C464,113.5,463,111.4,461.6,109.6z"/>

src/resources/icons/settings.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path d="M450,138.3l-47.7,48.5l-2.7,2.8l-1.6,1.7c-1.1,0.8-2.4,1.2-3.9,1.2c-1.6,0-3.1-0.6-4.3-1.6l-0.9-0.9l-2.7-2.7l-41.3-42.1
+<path style="fill:#000000" d="M450,138.3l-47.7,48.5l-2.7,2.8l-1.6,1.7c-1.1,0.8-2.4,1.2-3.9,1.2c-1.6,0-3.1-0.6-4.3-1.6l-0.9-0.9l-2.7-2.7l-41.3-42.1
 	l-2.2-2.2l-1.7-1.7c-1-1.5-1.6-3.4-1.6-5.3c0-1.7,0.6-3.2,1.6-4.4l0.7-0.8l2.6-2.6l47.9-48.7c-5.1-10.1-24.7-14.9-35.1-14.1
 	c-17.1,1.3-34.7,7-52.8,25.5c-0.7,0.8-1.5,1.6-2.2,2.3C277.5,120,272.6,156,282.6,189c0.7,1.4,1.3,3.1,1.6,4.6
 	c1.1,5.5-0.4,10.2-4,13.5l-37.9,36.4c-11.8-12-13.5-13.6-13.5-13.6c-2-2-6-3.3-9.5-1.2l-5.9,3.6c-22.7-23.1-32.3-32.4-35.4-43.6

src/resources/icons/snippet_info.svg

@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <g>
-	<polygon points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
-	<path d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
+	<polygon style="fill:#000000" points="288,448 288,192 192,192 192,208 224,208 224,448 192,448 192,464 320,464 320,448 	"/>
+	<path style="fill:#000000" d="M255.8,144.5c26.6,0,48.2-21.6,48.2-48.2s-21.6-48.2-48.2-48.2c-26.6,0-48.2,21.6-48.2,48.2S229.2,144.5,255.8,144.5z"/>
 </g>
 </svg>

src/resources/icons/snippets.svg

@@ -4,13 +4,13 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
 <g>
-	<polygon points="198.011,159.22 163.968,193.337 420.064,450 454,415.883 	"/>
-	<rect x="182" y="62" width="32" height="64"/>
-	<rect x="182" y="266" width="32" height="64"/>
-	<rect x="274" y="178" width="64" height="32"/>
-	<polygon points="303.941,112.143 281.314,89.465 236.06,134.82 258.687,157.498 	"/>
-	<polygon points="92.06,112.143 137.314,157.498 159.941,134.82 114.687,89.465 	"/>
-	<polygon points="92.06,279.141 114.687,301.816 159.941,256.462 137.314,233.784 	"/>
-	<rect x="58" y="178" width="64" height="32"/>
+	<polygon style="fill:#000000" points="198.011,159.22 163.968,193.337 420.064,450 454,415.883 	"/>
+	<rect style="fill:#000000" x="182" y="62" width="32" height="64"/>
+	<rect style="fill:#000000" x="182" y="266" width="32" height="64"/>
+	<rect style="fill:#000000" x="274" y="178" width="64" height="32"/>
+	<polygon style="fill:#000000" points="303.941,112.143 281.314,89.465 236.06,134.82 258.687,157.498 	"/>
+	<polygon style="fill:#000000"  points="92.06,112.143 137.314,157.498 159.941,134.82 114.687,89.465 	"/>
+	<polygon style="fill:#000000"  points="92.06,279.141 114.687,301.816 159.941,256.462 137.314,233.784 	"/>
+	<rect style="fill:#000000"  x="58" y="178" width="64" height="32"/>
 </g>
 </svg>

src/resources/icons/split_window.svg

@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M458,210.409l-145.267-12.476L256,64l-56.743,133.934L54,210.409l110.192,95.524L131.161,448L256,372.686L380.83,448
+<path style="fill:#000000"  d="M458,210.409l-145.267-12.476L256,64l-56.743,133.934L54,210.409l110.192,95.524L131.161,448L256,372.686L380.83,448
 	l-33.021-142.066L458,210.409z M272.531,345.287L256,335.313l-0.002-189.277l27.27,64.379l7.52,17.751l19.208,1.65l69.846,5.998
 	l-52.993,45.939l-14.576,12.636l4.367,18.788l15.875,68.299L272.531,345.287z"/>
 </svg>

src/resources/themes/v_white/v_white.palette

@@ -16,7 +16,7 @@ title_fg=#000000
 title_bg=#DADBDB
 
 hover_fg=#000000
-hover_bg=#DCDCDC
+hover_bg=#BCBCBC
 
 selected_fg=#000000
 selected_bg=#D3D3D3
@@ -43,6 +43,9 @@ content_bg=#FFFFFF
 selection_fg=#000000
 selection_bg=#64b5f6
 
+danger_red=#C9302C
+icon_fg=#222222
+
 [soft_defined]
 ; VAvatar.
 avatar_border_bg=@title_bg
@@ -57,7 +60,12 @@ navigation_label_bg=#F4F4F4
 
 ; Style of the bubble of VButtonWithWidget.
 bubble_fg=#FFFFFF
-bubble_bg=#6C6C6C
+bubble_bg=#616161
+
+; Icons' foreground.
+danger_icon_fg=@danger_red
+item_icon_fg=@icon_fg
+title_icon_fg=@icon_fg
 
 [widgets]
 ; Widget color attributes.
@@ -79,6 +87,8 @@ menu_bg=@base_bg
 menu_fg=@base_fg
 menu_item_selected_bg=@selected_bg
 menu_separator_bg=@separator_bg
+menu_icon_fg=@icon_fg
+menu_icon_danger_fg=@danger_icon_fg
 
 ; Tooltip.
 tooltip_border=@border_bg
@@ -89,6 +99,12 @@ tooltip_fg=@base_fg
 toolbar_bg=@main_bg
 toolbutton_hover_bg=@hover_bg
 toolbutton_pressed_bg=@pressed_bg
+toolbutton_checked_bg=@selected_bg
+toolbutton_icon_fg=@icon_fg
+toolbutton_icon_danger_fg=@danger_icon_fg
+
+; Toolbox.
+toolbox_icon_fg=@icon_fg
 
 ; Dockwidget.
 dockwidget_title_bg=@title_bg
@@ -99,6 +115,7 @@ pushbutton_fg=@base_fg
 pushbutton_bg=transparent
 pushbutton_border=@border_bg
 pushbutton_pressed_bg=@pressed_bg
+pushbutton_checked_bg=@selected_bg
 pushbutton_hover_bg=@hover_bg
 pushbutton_default_border=#424242
 
@@ -125,6 +142,9 @@ pushbutton_dangerbtn_hover_fg=#FFF
 pushbutton_dangerbtn_hover_bg=#C9302C
 pushbutton_dangerbtn_hover_border=#AC2925
 
+button_icon_fg=@icon_fg
+button_icon_danger_fg=@danger_icon_fg
+
 ; ComboBox.
 combobox_border=@border_bg
 combobox_fg=@content_fg
@@ -135,6 +155,7 @@ combobox_view_selected_fg=@selected_fg
 combobox_view_item_hover_fg=@hover_fg
 combobox_view_item_hover_bg=@hover_bg
 combobox_focus_bg=@focus_bg
+combobox_item_icon_fg=@item_icon_fg
 
 ; Label.
 label_fg=@base_fg
@@ -165,7 +186,10 @@ tabbar_hover_bg=@hover_bg
 tabbar_hover_border=@border_bg
 
 tabbar_closebutton_hover_bg=@hover_bg
-tabbar_clostbutton_focus_bg=@focus_bg
+tabbar_closebutton_focus_bg=@focus_bg
+
+tabbar_icon_fg=@icon_fg
+tabbar_icon_special_fg=@danger_red
 
 ; SelectorItem.
 selectoritem_border=@base_fg
@@ -186,6 +210,7 @@ treeview_item_selected_avtive_fg=@active_fg
 treeview_item_selected_avtive_bg=@active_bg
 treeview_item_selected_inactive_fg=@inactive_fg
 treeview_item_selected_inactive_bg=@inactive_bg
+treeview_item_icon_fg=@item_icon_fg
 
 ; ListView.
 listview_fg=@content_fg
@@ -211,3 +236,7 @@ statusbar_bg=@main_bg
 scrollbar_bg=#EEEEEE
 scrollbar_handle_bg=#D0D0D0
 scrollbar_addline_bg=#E0E0E0
+
+; VEditWindow.
+editwindow_corner_icon_fg=@icon_fg
+editwindow_corner_icon_inactive_fg=#808080

src/resources/themes/v_white/v_white.qss

@@ -108,6 +108,10 @@ QToolButton::pressed {
     background: @toolbutton_pressed_bg;
 }
 
+QToolButton::checked {
+    background: @toolbutton_checked_bg;
+}
+
 /* the subcontrols below are used only in the MenuButtonPopup mode */
 QToolButton::menu-button {
     border: none;
@@ -147,6 +151,10 @@ QPushButton:pressed {
     background-color: @pushbutton_pressed_bg;
 }
 
+QPushButton:checked {
+    background-color: @pushbutton_checked_bg;
+}
+
 QPushButton:hover {
     background-color: @pushbutton_hover_bg;
 }
@@ -496,7 +504,7 @@ QTabBar::close-button:hover {
 
 QTabBar::close-button:focus {
     image: url(close.svg);
-    background-color: @tabbar_clostbutton_focus_bg;
+    background-color: @tabbar_closebutton_focus_bg;
 }
 /* End QTabBar */
 
@@ -644,3 +652,8 @@ QStatusBar {
 QWidget[MainEditor="true"] {
     border: none;
 }
+
+QDialog {
+    color: @base_fg;
+    background: @base_bg;
+}

src/src.pro

@@ -100,7 +100,8 @@ SOURCES += main.cpp\
     vinsertselector.cpp \
     utils/vclipboardutils.cpp \
     vpalette.cpp \
-    vbuttonmenuitem.cpp
+    vbuttonmenuitem.cpp \
+    utils/viconutils.cpp
 
 HEADERS  += vmainwindow.h \
     vdirectorytree.h \
@@ -187,7 +188,8 @@ HEADERS  += vmainwindow.h \
     vinsertselector.h \
     utils/vclipboardutils.h \
     vpalette.h \
-    vbuttonmenuitem.h
+    vbuttonmenuitem.h \
+    utils/viconutils.h
 
 RESOURCES += \
     vnote.qrc \

src/utils/viconutils.cpp

@@ -0,0 +1,38 @@
+#include "viconutils.h"
+
+#include <QDebug>
+#include <QRegExp>
+#include <QByteArray>
+#include <QPixMap>
+#include <QFileInfo>
+
+#include "vutils.h"
+
+VIconUtils::VIconUtils()
+{
+
+}
+
+QIcon VIconUtils::icon(const QString &p_file, const QString &p_fg)
+{
+    QFileInfo fi(p_file);
+    bool isSvg = fi.suffix().toLower() == "svg";
+    if (p_fg.isEmpty() || !isSvg) {
+        return QIcon(p_file);
+    }
+
+    QString content = VUtils::readFileFromDisk(p_file);
+    Q_ASSERT(!content.isEmpty());
+    // Must have a # to avoid fill="none".
+    QRegExp reg("(\\s|\")(fill|stroke)(:|(=\"))#[^#\"\\s]+");
+    if (content.indexOf(reg) == -1) {
+        return QIcon(p_file);
+    }
+
+    content.replace(reg, QString("\\1\\2\\3%1").arg(p_fg));
+    QByteArray data = content.toLocal8Bit();
+    QPixmap pixmap;
+    pixmap.loadFromData(data, "svg");
+
+    return QIcon(pixmap);
+}

src/utils/viconutils.h

@@ -0,0 +1,92 @@
+#ifndef VICONUTILS_H
+#define VICONUTILS_H
+
+#include <QString>
+#include <QIcon>
+
+#include "vpalette.h"
+
+extern VPalette *g_palette;
+
+
+class VIconUtils
+{
+public:
+    // Get an icon from @p_file file. May change the foreground of the icon.
+    static QIcon icon(const QString &p_file, const QString &p_fg = QString());
+
+    static QIcon toolButtonIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("toolbutton_icon_fg"));
+    }
+
+    static QIcon toolButtonDangerIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("toolbutton_icon_danger_fg"));
+    }
+
+    static QIcon menuIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("menu_icon_fg"));
+    }
+
+    static QIcon menuDangerIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("menu_icon_danger_fg"));
+    }
+
+    static QIcon toolBoxIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("toolbox_icon_fg"));
+    }
+
+    static QIcon comboBoxIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("combobox_item_icon_fg"));
+    }
+
+    static QIcon treeViewIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("treeview_item_icon_fg"));
+    }
+
+    static QIcon tabBarIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("tabbar_icon_fg"));
+    }
+
+    static QIcon tabBarSpecialIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("tabbar_icon_special_fg"));
+    }
+
+    static QIcon editWindowCornerIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("editwindow_corner_icon_fg"));
+    }
+
+    static QIcon editWindowCornerInactiveIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("editwindow_corner_icon_inactive_fg"));
+    }
+
+    static QIcon titleIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("title_icon_fg"));
+    }
+
+    static QIcon buttonIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("button_icon_fg"));
+    }
+
+    static QIcon buttonDangerIcon(const QString &p_file)
+    {
+        return icon(p_file, g_palette->color("button_icon_danger_fg"));
+    }
+
+private:
+    VIconUtils();
+};
+
+#endif // VICONUTILS_H

src/vattachmentlist.cpp

@@ -9,6 +9,7 @@
 #include "dialog/vconfirmdeletiondialog.h"
 #include "dialog/vsortdialog.h"
 #include "utils/vimnavigationforwidget.h"
+#include "utils/viconutils.h"
 
 extern VConfigManager *g_config;
 extern VMainWindow *g_mainWin;
@@ -25,14 +26,14 @@ VAttachmentList::VAttachmentList(QWidget *p_parent)
 
 void VAttachmentList::setupUI()
 {
-    m_addBtn = new QPushButton(QIcon(":/resources/icons/add_attachment.svg"), "");
+    m_addBtn = new QPushButton(VIconUtils::buttonIcon(":/resources/icons/add_attachment.svg"), "");
     m_addBtn->setToolTip(tr("Add"));
     m_addBtn->setProperty("FlatBtn", true);
     m_addBtn->setDefault(true);
     connect(m_addBtn, &QPushButton::clicked,
             this, &VAttachmentList::addAttachment);
 
-    m_clearBtn = new QPushButton(QIcon(":/resources/icons/clear_attachment.svg"), "");
+    m_clearBtn = new QPushButton(VIconUtils::buttonDangerIcon(":/resources/icons/clear_attachment.svg"), "");
     m_clearBtn->setToolTip(tr("Clear"));
     m_clearBtn->setProperty("FlatBtn", true);
     connect(m_clearBtn, &QPushButton::clicked,
@@ -76,7 +77,7 @@ void VAttachmentList::setupUI()
                 }
             });
 
-    m_locateBtn = new QPushButton(QIcon(":/resources/icons/locate_attachment.svg"), "");
+    m_locateBtn = new QPushButton(VIconUtils::buttonIcon(":/resources/icons/locate_attachment.svg"), "");
     m_locateBtn->setToolTip(tr("Open Folder"));
     m_locateBtn->setProperty("FlatBtn", true);
     connect(m_locateBtn, &QPushButton::clicked,
@@ -124,14 +125,14 @@ void VAttachmentList::initActions()
                 handleItemActivated(item);
             });
 
-    m_deleteAct = new QAction(QIcon(":/resources/icons/delete_attachment.svg"),
+    m_deleteAct = new QAction(VIconUtils::menuDangerIcon(":/resources/icons/delete_attachment.svg"),
                               tr("&Delete"),
                               this);
     m_deleteAct->setToolTip(tr("Delete selected attachments"));
     connect(m_deleteAct, &QAction::triggered,
             this, &VAttachmentList::deleteSelectedItems);
 
-    m_sortAct = new QAction(QIcon(":/resources/icons/sort.svg"),
+    m_sortAct = new QAction(VIconUtils::menuIcon(":/resources/icons/sort.svg"),
                             tr("&Sort"),
                             this);
     m_sortAct->setToolTip(tr("Sort attachments manually"));

src/vdirectorytree.cpp

@@ -11,6 +11,7 @@
 #include "vmainwindow.h"
 #include "dialog/vsortdialog.h"
 #include "utils/vimnavigationforwidget.h"
+#include "utils/viconutils.h"
 
 extern VMainWindow *g_mainWin;
 
@@ -76,43 +77,43 @@ void VDirectoryTree::initShortcuts()
 
 void VDirectoryTree::initActions()
 {
-    newRootDirAct = new QAction(QIcon(":/resources/icons/create_rootdir.svg"),
+    newRootDirAct = new QAction(VIconUtils::menuIcon(":/resources/icons/create_rootdir.svg"),
                                 tr("New &Root Folder"), this);
     newRootDirAct->setToolTip(tr("Create a root folder in current notebook"));
     connect(newRootDirAct, &QAction::triggered,
             this, &VDirectoryTree::newRootDirectory);
 
-    newSubDirAct = new QAction(QIcon(":/resources/icons/create_subdir.svg"),
+    newSubDirAct = new QAction(VIconUtils::menuIcon(":/resources/icons/create_subdir.svg"),
                                tr("&New Subfolder"), this);
     newSubDirAct->setToolTip(tr("Create a subfolder"));
     connect(newSubDirAct, &QAction::triggered,
             this, &VDirectoryTree::newSubDirectory);
 
-    deleteDirAct = new QAction(QIcon(":/resources/icons/delete_dir.svg"),
+    deleteDirAct = new QAction(VIconUtils::menuDangerIcon(":/resources/icons/delete_dir.svg"),
                                tr("&Delete"), this);
     deleteDirAct->setToolTip(tr("Delete selected folder"));
     connect(deleteDirAct, &QAction::triggered,
             this, &VDirectoryTree::deleteSelectedDirectory);
 
-    dirInfoAct = new QAction(QIcon(":/resources/icons/dir_info.svg"),
+    dirInfoAct = new QAction(VIconUtils::menuIcon(":/resources/icons/dir_info.svg"),
                              tr("&Info\t%1").arg(VUtils::getShortcutText(c_infoShortcutSequence)), this);
     dirInfoAct->setToolTip(tr("View and edit current folder's information"));
     connect(dirInfoAct, &QAction::triggered,
             this, &VDirectoryTree::editDirectoryInfo);
 
-    copyAct = new QAction(QIcon(":/resources/icons/copy.svg"),
+    copyAct = new QAction(VIconUtils::menuIcon(":/resources/icons/copy.svg"),
                           tr("&Copy\t%1").arg(VUtils::getShortcutText(c_copyShortcutSequence)), this);
     copyAct->setToolTip(tr("Copy selected folders"));
     connect(copyAct, &QAction::triggered,
             this, &VDirectoryTree::copySelectedDirectories);
 
-    cutAct = new QAction(QIcon(":/resources/icons/cut.svg"),
+    cutAct = new QAction(VIconUtils::menuIcon(":/resources/icons/cut.svg"),
                          tr("C&ut\t%1").arg(VUtils::getShortcutText(c_cutShortcutSequence)), this);
     cutAct->setToolTip(tr("Cut selected folders"));
     connect(cutAct, &QAction::triggered,
             this, &VDirectoryTree::cutSelectedDirectories);
 
-    pasteAct = new QAction(QIcon(":/resources/icons/paste.svg"),
+    pasteAct = new QAction(VIconUtils::menuIcon(":/resources/icons/paste.svg"),
                            tr("&Paste\t%1").arg(VUtils::getShortcutText(c_pasteShortcutSequence)), this);
     pasteAct->setToolTip(tr("Paste folders in this folder"));
     connect(pasteAct, &QAction::triggered,
@@ -128,7 +129,7 @@ void VDirectoryTree::initActions()
     connect(m_reloadAct, &QAction::triggered,
             this, &VDirectoryTree::reloadFromDisk);
 
-    m_sortAct = new QAction(QIcon(":/resources/icons/sort.svg"),
+    m_sortAct = new QAction(VIconUtils::menuIcon(":/resources/icons/sort.svg"),
                             tr("&Sort"),
                             this);
     m_sortAct->setToolTip(tr("Sort folders in this folder/notebook manually"));
@@ -173,7 +174,7 @@ void VDirectoryTree::fillTreeItem(QTreeWidgetItem *p_item, VDirectory *p_directo
     p_item->setText(col, name);
     p_item->setToolTip(col, name);
     p_item->setData(col, Qt::UserRole, QVariant::fromValue(p_directory));
-    p_item->setIcon(col, QIcon(":/resources/icons/dir_item.svg"));
+    p_item->setIcon(col, VIconUtils::treeViewIcon(":/resources/icons/dir_item.svg"));
 }
 
 void VDirectoryTree::updateDirectoryTree()

src/vedit.cpp

@@ -11,6 +11,7 @@
 #include "veditoperations.h"
 #include "vedittab.h"
 #include "dialog/vinsertlinkdialog.h"
+#include "utils/viconutils.h"
 
 extern VConfigManager *g_config;
 
@@ -766,13 +767,13 @@ void VEdit::contextMenuEvent(QContextMenuEvent *p_event)
         VEditTab *editTab = dynamic_cast<VEditTab *>(parent());
         V_ASSERT(editTab);
         if (editTab->isEditMode()) {
-            QAction *saveExitAct = new QAction(QIcon(":/resources/icons/save_exit.svg"),
+            QAction *saveExitAct = new QAction(VIconUtils::menuIcon(":/resources/icons/save_exit.svg"),
                                                tr("&Save Changes And Read"), this);
             saveExitAct->setToolTip(tr("Save changes and exit edit mode"));
             connect(saveExitAct, &QAction::triggered,
                     this, &VEdit::handleSaveExitAct);
 
-            QAction *discardExitAct = new QAction(QIcon(":/resources/icons/discard_exit.svg"),
+            QAction *discardExitAct = new QAction(VIconUtils::menuIcon(":/resources/icons/discard_exit.svg"),
                                                   tr("&Discard Changes And Read"), this);
             discardExitAct->setToolTip(tr("Discard changes and exit edit mode"));
             connect(discardExitAct, &QAction::triggered,
@@ -785,7 +786,7 @@ void VEdit::contextMenuEvent(QContextMenuEvent *p_event)
             }
         } else if (m_file->isModifiable()) {
             // HTML.
-            QAction *editAct= new QAction(QIcon(":/resources/icons/edit_note.svg"),
+            QAction *editAct= new QAction(VIconUtils::menuIcon(":/resources/icons/edit_note.svg"),
                                           tr("&Edit"), this);
             editAct->setToolTip(tr("Edit current note"));
             connect(editAct, &QAction::triggered,

src/veditwindow.cpp

@@ -11,6 +11,7 @@
 #include "vhtmltab.h"
 #include "vfilelist.h"
 #include "vconfigmanager.h"
+#include "utils/viconutils.h"
 
 extern VConfigManager *g_config;
 extern VMainWindow *g_mainWin;
@@ -57,25 +58,25 @@ VEditWindow::VEditWindow(VEditArea *editArea, QWidget *parent)
 
 void VEditWindow::initTabActions()
 {
-    m_locateAct = new QAction(QIcon(":/resources/icons/locate_note.svg"),
+    m_locateAct = new QAction(VIconUtils::menuIcon(":/resources/icons/locate_note.svg"),
                               tr("Locate To Folder"), this);
     m_locateAct->setToolTip(tr("Locate the folder of current note"));
     connect(m_locateAct, &QAction::triggered,
             this, &VEditWindow::handleLocateAct);
 
-    m_moveLeftAct = new QAction(QIcon(":/resources/icons/move_tab_left.svg"),
+    m_moveLeftAct = new QAction(VIconUtils::menuIcon(":/resources/icons/move_tab_left.svg"),
                                 tr("Move One Split Left"), this);
     m_moveLeftAct->setToolTip(tr("Move current tab to the split on the left"));
     connect(m_moveLeftAct, &QAction::triggered,
             this, &VEditWindow::handleMoveLeftAct);
 
-    m_moveRightAct = new QAction(QIcon(":/resources/icons/move_tab_right.svg"),
+    m_moveRightAct = new QAction(VIconUtils::menuIcon(":/resources/icons/move_tab_right.svg"),
                                  tr("Move One Split Right"), this);
     m_moveRightAct->setToolTip(tr("Move current tab to the split on the right"));
     connect(m_moveRightAct, &QAction::triggered,
             this, &VEditWindow::handleMoveRightAct);
 
-    m_closeTabAct = new QAction(QIcon(":/resources/icons/close.svg"),
+    m_closeTabAct = new QAction(VIconUtils::menuIcon(":/resources/icons/close.svg"),
                                 tr("Close Tab"), this);
     m_closeTabAct->setToolTip(tr("Close current note tab"));
     connect(m_closeTabAct, &QAction::triggered,
@@ -125,7 +126,7 @@ void VEditWindow::initTabActions()
                 }
             });
 
-    m_noteInfoAct = new QAction(QIcon(":/resources/icons/note_info.svg"),
+    m_noteInfoAct = new QAction(VIconUtils::menuIcon(":/resources/icons/note_info.svg"),
                                 tr("Note Info"), this);
     m_noteInfoAct->setToolTip(tr("View and edit information of the note"));
     connect(m_noteInfoAct, &QAction::triggered,
@@ -169,7 +170,7 @@ void VEditWindow::initTabActions()
                 editor->reloadFromDisk();
             });
 
-    m_recycleBinAct = new QAction(QIcon(":/resources/icons/recycle_bin.svg"),
+    m_recycleBinAct = new QAction(VIconUtils::menuIcon(":/resources/icons/recycle_bin.svg"),
                                   tr("&Recycle Bin"), this);
     m_recycleBinAct->setToolTip(tr("Open the recycle bin of this note"));
     connect(m_recycleBinAct, &QAction::triggered,
@@ -200,7 +201,7 @@ void VEditWindow::initTabActions()
 void VEditWindow::setupCornerWidget()
 {
     // Left button
-    leftBtn = new QPushButton(QIcon(":/resources/icons/corner_tablist.svg"),
+    leftBtn = new QPushButton(VIconUtils::editWindowCornerIcon(":/resources/icons/corner_tablist.svg"),
                               "", this);
     leftBtn->setProperty("CornerBtn", true);
     leftBtn->setToolTip(tr("Opened Notes List"));
@@ -212,7 +213,7 @@ void VEditWindow::setupCornerWidget()
 
     // Right button
     // Actions
-    splitAct = new QAction(QIcon(":/resources/icons/split_window.svg"),
+    splitAct = new QAction(VIconUtils::menuIcon(":/resources/icons/split_window.svg"),
                            tr("Split"), this);
     splitAct->setToolTip(tr("Split current window vertically"));
     connect(splitAct, &QAction::triggered,
@@ -220,13 +221,13 @@ void VEditWindow::setupCornerWidget()
                 splitWindow(true);
             });
 
-    removeSplitAct = new QAction(QIcon(":/resources/icons/remove_split.svg"),
+    removeSplitAct = new QAction(VIconUtils::menuIcon(":/resources/icons/remove_split.svg"),
                                  tr("Remove split"), this);
     removeSplitAct->setToolTip(tr("Remove current split window"));
     connect(removeSplitAct, &QAction::triggered,
             this, &VEditWindow::removeSplit);
 
-    rightBtn = new QPushButton(QIcon(":/resources/icons/corner_menu.svg"),
+    rightBtn = new QPushButton(VIconUtils::editWindowCornerIcon(":/resources/icons/corner_menu.svg"),
                                "", this);
     rightBtn->setProperty("CornerBtn", true);
     rightBtn->setToolTip(tr("Menu"));
@@ -522,16 +523,16 @@ void VEditWindow::updateTabInfo(int p_index)
     setTabText(p_index, generateTabText(p_index, editor));
     setTabToolTip(p_index, generateTooltip(file));
 
-    QString iconUrl;
+    QIcon icon;
     if (editMode) {
-        iconUrl = editor->isModified() ? ":/resources/icons/editing_modified.svg"
-                                       : ":/resources/icons/editing.svg";
+        icon = editor->isModified() ? VIconUtils::tabBarSpecialIcon(":/resources/icons/editing_modified.svg")
+                                    : VIconUtils::tabBarIcon(":/resources/icons/editing.svg");
     } else {
-        iconUrl = editor->isModified() ? ":/resources/icons/reading_modified.svg"
-                                       : ":/resources/icons/reading.svg";
+        icon = editor->isModified() ? VIconUtils::tabBarSpecialIcon(":/resources/icons/reading_modified.svg")
+                                    : VIconUtils::tabBarIcon(":/resources/icons/reading.svg");
     }
 
-    setTabIcon(p_index, QIcon(iconUrl));
+    setTabIcon(p_index, icon);
 }
 
 void VEditWindow::updateAllTabsSequence()
@@ -968,11 +969,11 @@ void VEditWindow::connectEditTab(const VEditTab *p_tab)
 void VEditWindow::setCurrentWindow(bool p_current)
 {
     if (p_current) {
-        rightBtn->setIcon(QIcon(":/resources/icons/corner_menu_cur.svg"));
-        leftBtn->setIcon(QIcon(":/resources/icons/corner_tablist_cur.svg"));
+        rightBtn->setIcon(VIconUtils::editWindowCornerIcon(":/resources/icons/corner_menu_cur.svg"));
+        leftBtn->setIcon(VIconUtils::editWindowCornerIcon(":/resources/icons/corner_tablist_cur.svg"));
     } else {
-        rightBtn->setIcon(QIcon(":/resources/icons/corner_menu.svg"));
-        leftBtn->setIcon(QIcon(":/resources/icons/corner_tablist.svg"));
+        rightBtn->setIcon(VIconUtils::editWindowCornerInactiveIcon(":/resources/icons/corner_menu.svg"));
+        leftBtn->setIcon(VIconUtils::editWindowCornerInactiveIcon(":/resources/icons/corner_tablist.svg"));
     }
 }
 

src/vfilelist.cpp

@@ -16,6 +16,7 @@
 #include "dialog/vsortdialog.h"
 #include "vmainwindow.h"
 #include "utils/vimnavigationforwidget.h"
+#include "utils/viconutils.h"
 
 extern VConfigManager *g_config;
 extern VNote *g_vnote;
@@ -86,7 +87,7 @@ void VFileList::initShortcuts()
 
 void VFileList::initActions()
 {
-    newFileAct = new QAction(QIcon(":/resources/icons/create_note.svg"),
+    newFileAct = new QAction(VIconUtils::menuIcon(":/resources/icons/create_note.svg"),
                              tr("&New Note"), this);
     QString shortcutStr = VUtils::getShortcutText(g_config->getShortcutKeySequence("NewNote"));
     if (!shortcutStr.isEmpty()) {
@@ -97,7 +98,7 @@ void VFileList::initActions()
     connect(newFileAct, SIGNAL(triggered(bool)),
             this, SLOT(newFile()));
 
-    m_openInReadAct = new QAction(QIcon(":/resources/icons/reading.svg"),
+    m_openInReadAct = new QAction(VIconUtils::menuIcon(":/resources/icons/reading.svg"),
                                   tr("&Open In Read Mode"), this);
     m_openInReadAct->setToolTip(tr("Open current note in read mode"));
     connect(m_openInReadAct, &QAction::triggered,
@@ -108,7 +109,7 @@ void VFileList::initActions()
                 }
             });
 
-    m_openInEditAct = new QAction(QIcon(":/resources/icons/editing.svg"),
+    m_openInEditAct = new QAction(VIconUtils::menuIcon(":/resources/icons/editing.svg"),
                                   tr("Open In &Edit Mode"), this);
     m_openInEditAct->setToolTip(tr("Open current note in edit mode"));
     connect(m_openInEditAct, &QAction::triggered,
@@ -119,31 +120,31 @@ void VFileList::initActions()
                 }
             });
 
-    deleteFileAct = new QAction(QIcon(":/resources/icons/delete_note.svg"),
+    deleteFileAct = new QAction(VIconUtils::menuDangerIcon(":/resources/icons/delete_note.svg"),
                                 tr("&Delete"), this);
     deleteFileAct->setToolTip(tr("Delete selected note"));
     connect(deleteFileAct, SIGNAL(triggered(bool)),
             this, SLOT(deleteSelectedFiles()));
 
-    fileInfoAct = new QAction(QIcon(":/resources/icons/note_info.svg"),
+    fileInfoAct = new QAction(VIconUtils::menuIcon(":/resources/icons/note_info.svg"),
                               tr("&Info\t%1").arg(VUtils::getShortcutText(c_infoShortcutSequence)), this);
     fileInfoAct->setToolTip(tr("View and edit current note's information"));
     connect(fileInfoAct, SIGNAL(triggered(bool)),
             this, SLOT(fileInfo()));
 
-    copyAct = new QAction(QIcon(":/resources/icons/copy.svg"),
+    copyAct = new QAction(VIconUtils::menuIcon(":/resources/icons/copy.svg"),
                           tr("&Copy\t%1").arg(VUtils::getShortcutText(c_copyShortcutSequence)), this);
     copyAct->setToolTip(tr("Copy selected notes"));
     connect(copyAct, &QAction::triggered,
             this, &VFileList::copySelectedFiles);
 
-    cutAct = new QAction(QIcon(":/resources/icons/cut.svg"),
+    cutAct = new QAction(VIconUtils::menuIcon(":/resources/icons/cut.svg"),
                          tr("C&ut\t%1").arg(VUtils::getShortcutText(c_cutShortcutSequence)), this);
     cutAct->setToolTip(tr("Cut selected notes"));
     connect(cutAct, &QAction::triggered,
             this, &VFileList::cutSelectedFiles);
 
-    pasteAct = new QAction(QIcon(":/resources/icons/paste.svg"),
+    pasteAct = new QAction(VIconUtils::menuIcon(":/resources/icons/paste.svg"),
                            tr("&Paste\t%1").arg(VUtils::getShortcutText(c_pasteShortcutSequence)), this);
     pasteAct->setToolTip(tr("Paste notes in current folder"));
     connect(pasteAct, &QAction::triggered,
@@ -154,7 +155,7 @@ void VFileList::initActions()
     connect(m_openLocationAct, &QAction::triggered,
             this, &VFileList::openFileLocation);
 
-    m_sortAct = new QAction(QIcon(":/resources/icons/sort.svg"),
+    m_sortAct = new QAction(VIconUtils::menuIcon(":/resources/icons/sort.svg"),
                             tr("&Sort"),
                             this);
     m_sortAct->setToolTip(tr("Sort notes in this folder manually"));

src/vmainwindow.cpp

@@ -34,6 +34,7 @@
 #include "vtoolbox.h"
 #include "vbuttonmenuitem.h"
 #include "vpalette.h"
+#include "utils/viconutils.h"
 
 VMainWindow *g_mainWin;
 
@@ -332,7 +333,7 @@ void VMainWindow::initViewToolBar(QSize p_iconSize)
     }
 
     m_viewActGroup = new QActionGroup(this);
-    QAction *onePanelViewAct = new QAction(QIcon(":/resources/icons/one_panel.svg"),
+    QAction *onePanelViewAct = new QAction(VIconUtils::menuIcon(":/resources/icons/one_panel.svg"),
                                            tr("&Single Panel"),
                                            m_viewActGroup);
     onePanelViewAct->setStatusTip(tr("Display only the notes list panel"));
@@ -340,7 +341,7 @@ void VMainWindow::initViewToolBar(QSize p_iconSize)
     onePanelViewAct->setCheckable(true);
     onePanelViewAct->setData((int)PanelViewState::SinglePanel);
 
-    QAction *twoPanelViewAct = new QAction(QIcon(":/resources/icons/two_panels.svg"),
+    QAction *twoPanelViewAct = new QAction(VIconUtils::menuIcon(":/resources/icons/two_panels.svg"),
                                            tr("&Two Panels"),
                                            m_viewActGroup);
     twoPanelViewAct->setStatusTip(tr("Display both the folders and notes list panel"));
@@ -348,7 +349,7 @@ void VMainWindow::initViewToolBar(QSize p_iconSize)
     twoPanelViewAct->setCheckable(true);
     twoPanelViewAct->setData((int)PanelViewState::TwoPanels);
 
-    QAction *compactViewAct = new QAction(QIcon(":/resources/icons/compact_mode.svg"),
+    QAction *compactViewAct = new QAction(VIconUtils::menuIcon(":/resources/icons/compact_mode.svg"),
                                            tr("&Compact Mode"),
                                            m_viewActGroup);
     compactViewAct->setStatusTip(tr("Integrate the folders and notes list panel in one column"));
@@ -386,7 +387,7 @@ void VMainWindow::initViewToolBar(QSize p_iconSize)
     panelMenu->addAction(twoPanelViewAct);
     panelMenu->addAction(compactViewAct);
 
-    expandViewAct = new QAction(QIcon(":/resources/icons/expand.svg"),
+    expandViewAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/expand.svg"),
                                 tr("Expand"), this);
     expandViewAct->setStatusTip(tr("Expand the edit area"));
     expandViewAct->setCheckable(true);
@@ -422,7 +423,7 @@ void VMainWindow::initEditToolBar(QSize p_iconSize)
 
     m_editToolBar->addSeparator();
 
-    m_headingSequenceAct = new QAction(QIcon(":/resources/icons/heading_sequence.svg"),
+    m_headingSequenceAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/heading_sequence.svg"),
                                        tr("Heading Sequence"),
                                        this);
     m_headingSequenceAct->setStatusTip(tr("Enable heading sequence in current note in edit mode"));
@@ -440,7 +441,7 @@ void VMainWindow::initEditToolBar(QSize p_iconSize)
 
     initHeadingButton(m_editToolBar);
 
-    QAction *boldAct = new QAction(QIcon(":/resources/icons/bold.svg"),
+    QAction *boldAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/bold.svg"),
                                    tr("Bold\t%1").arg(VUtils::getShortcutText("Ctrl+B")),
                                    this);
     boldAct->setStatusTip(tr("Insert bold text or change selected text to bold"));
@@ -453,7 +454,7 @@ void VMainWindow::initEditToolBar(QSize p_iconSize)
 
     m_editToolBar->addAction(boldAct);
 
-    QAction *italicAct = new QAction(QIcon(":/resources/icons/italic.svg"),
+    QAction *italicAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/italic.svg"),
                                      tr("Italic\t%1").arg(VUtils::getShortcutText("Ctrl+I")),
                                      this);
     italicAct->setStatusTip(tr("Insert italic text or change selected text to italic"));
@@ -466,7 +467,7 @@ void VMainWindow::initEditToolBar(QSize p_iconSize)
 
     m_editToolBar->addAction(italicAct);
 
-    QAction *strikethroughAct = new QAction(QIcon(":/resources/icons/strikethrough.svg"),
+    QAction *strikethroughAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/strikethrough.svg"),
                                             tr("Strikethrough\t%1").arg(VUtils::getShortcutText("Ctrl+D")),
                                             this);
     strikethroughAct->setStatusTip(tr("Insert strikethrough text or change selected text to strikethroughed"));
@@ -479,7 +480,7 @@ void VMainWindow::initEditToolBar(QSize p_iconSize)
 
     m_editToolBar->addAction(strikethroughAct);
 
-    QAction *inlineCodeAct = new QAction(QIcon(":/resources/icons/inline_code.svg"),
+    QAction *inlineCodeAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/inline_code.svg"),
                                          tr("Inline Code\t%1").arg(VUtils::getShortcutText("Ctrl+K")),
                                          this);
     inlineCodeAct->setStatusTip(tr("Insert inline-code text or change selected text to inline-coded"));
@@ -492,7 +493,7 @@ void VMainWindow::initEditToolBar(QSize p_iconSize)
 
     m_editToolBar->addAction(inlineCodeAct);
 
-    QAction *codeBlockAct = new QAction(QIcon(":/resources/icons/code_block.svg"),
+    QAction *codeBlockAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/code_block.svg"),
                                         tr("Code Block\t%1").arg(VUtils::getShortcutText("Ctrl+M")),
                                         this);
     codeBlockAct->setStatusTip(tr("Insert fenced code block text or wrap selected text into a fenced code block"));
@@ -508,7 +509,7 @@ void VMainWindow::initEditToolBar(QSize p_iconSize)
     m_editToolBar->addSeparator();
 
     // Insert link.
-    QAction *insetLinkAct = new QAction(QIcon(":/resources/icons/link.svg"),
+    QAction *insetLinkAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/link.svg"),
                                         tr("Insert Link\t%1").arg(VUtils::getShortcutText("Ctrl+L")),
                                         this);
     insetLinkAct->setStatusTip(tr("Insert a link"));
@@ -522,7 +523,7 @@ void VMainWindow::initEditToolBar(QSize p_iconSize)
     m_editToolBar->addAction(insetLinkAct);
 
     // Insert image.
-    QAction *insertImageAct = new QAction(QIcon(":/resources/icons/insert_image.svg"),
+    QAction *insertImageAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/insert_image.svg"),
                                           tr("Insert Image"),
                                           this);
     insertImageAct->setStatusTip(tr("Insert an image from file or URL"));
@@ -555,7 +556,7 @@ void VMainWindow::initNoteToolBar(QSize p_iconSize)
 
     // Attachment.
     m_attachmentList = new VAttachmentList(this);
-    m_attachmentBtn = new VButtonWithWidget(QIcon(":/resources/icons/attachment.svg"),
+    m_attachmentBtn = new VButtonWithWidget(VIconUtils::toolButtonIcon(":/resources/icons/attachment.svg"),
                                             "",
                                             m_attachmentList,
                                             this);
@@ -566,7 +567,7 @@ void VMainWindow::initNoteToolBar(QSize p_iconSize)
     m_attachmentBtn->setFocusPolicy(Qt::NoFocus);
     m_attachmentBtn->setEnabled(false);
 
-    QAction *flashPageAct = new QAction(QIcon(":/resources/icons/flash_page.svg"),
+    QAction *flashPageAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/flash_page.svg"),
                                         tr("Flash Page"),
                                         this);
     flashPageAct->setStatusTip(tr("Open the Flash Page to edit"));
@@ -589,13 +590,14 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
         fileToolBar->setIconSize(p_iconSize);
     }
 
-    newRootDirAct = new QAction(QIcon(":/resources/icons/create_rootdir_tb.svg"),
-                                tr("New &Root Folder"), this);
+    newRootDirAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/create_rootdir_tb.svg"),
+                                tr("New &Root Folder"),
+                                this);
     newRootDirAct->setStatusTip(tr("Create a root folder in current notebook"));
     connect(newRootDirAct, &QAction::triggered,
             directoryTree, &VDirectoryTree::newRootDirectory);
 
-    newNoteAct = new QAction(QIcon(":/resources/icons/create_note_tb.svg"),
+    newNoteAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/create_note_tb.svg"),
                              tr("New &Note"), this);
     newNoteAct->setStatusTip(tr("Create a note in current folder"));
     QString keySeq = g_config->getShortcutKeySequence("NewNote");
@@ -604,19 +606,19 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
     connect(newNoteAct, &QAction::triggered,
             m_fileList, &VFileList::newFile);
 
-    noteInfoAct = new QAction(QIcon(":/resources/icons/note_info_tb.svg"),
+    noteInfoAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/note_info_tb.svg"),
                               tr("Note &Info"), this);
     noteInfoAct->setStatusTip(tr("View and edit current note's information"));
     connect(noteInfoAct, &QAction::triggered,
             this, &VMainWindow::curEditFileInfo);
 
-    deleteNoteAct = new QAction(QIcon(":/resources/icons/delete_note_tb.svg"),
+    deleteNoteAct = new QAction(VIconUtils::toolButtonDangerIcon(":/resources/icons/delete_note_tb.svg"),
                                 tr("&Delete Note"), this);
     deleteNoteAct->setStatusTip(tr("Delete current note"));
     connect(deleteNoteAct, &QAction::triggered,
             this, &VMainWindow::deleteCurNote);
 
-    editNoteAct = new QAction(QIcon(":/resources/icons/edit_note.svg"),
+    editNoteAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/edit_note.svg"),
                               tr("&Edit"), this);
     editNoteAct->setStatusTip(tr("Edit current note"));
     keySeq = g_config->getShortcutKeySequence("EditNote");
@@ -625,7 +627,7 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
     connect(editNoteAct, &QAction::triggered,
             editArea, &VEditArea::editFile);
 
-    discardExitAct = new QAction(QIcon(":/resources/icons/discard_exit.svg"),
+    discardExitAct = new QAction(VIconUtils::menuIcon(":/resources/icons/discard_exit.svg"),
                                  tr("Discard Changes And Read"), this);
     discardExitAct->setStatusTip(tr("Discard changes and exit edit mode"));
     discardExitAct->setToolTip(tr("Discard Changes And Read"));
@@ -636,7 +638,7 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
     exitEditMenu->setToolTipsVisible(true);
     exitEditMenu->addAction(discardExitAct);
 
-    saveExitAct = new QAction(QIcon(":/resources/icons/save_exit.svg"),
+    saveExitAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/save_exit.svg"),
                               tr("Save Changes And Read"), this);
     saveExitAct->setStatusTip(tr("Save changes and exit edit mode"));
     saveExitAct->setMenu(exitEditMenu);
@@ -646,7 +648,7 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
     connect(saveExitAct, &QAction::triggered,
             editArea, &VEditArea::saveAndReadFile);
 
-    saveNoteAct = new QAction(QIcon(":/resources/icons/save_note.svg"),
+    saveNoteAct = new QAction(VIconUtils::toolButtonIcon(":/resources/icons/save_note.svg"),
                               tr("Save"), this);
     saveNoteAct->setStatusTip(tr("Save changes to current note"));
     keySeq = g_config->getShortcutKeySequence("SaveNote");
@@ -911,7 +913,7 @@ void VMainWindow::initFileMenu()
     fileMenu->addAction(openAct);
 
     // Import notes from files.
-    m_importNoteAct = newAction(QIcon(":/resources/icons/import_note.svg"),
+    m_importNoteAct = newAction(VIconUtils::menuIcon(":/resources/icons/import_note.svg"),
                                 tr("&New Notes From Files"), this);
     m_importNoteAct->setToolTip(tr("Create notes from external files in current folder by copy"));
     connect(m_importNoteAct, &QAction::triggered,
@@ -934,7 +936,7 @@ void VMainWindow::initFileMenu()
     fileMenu->addSeparator();
 
     // Print.
-    m_printAct = new QAction(QIcon(":/resources/icons/print.svg"),
+    m_printAct = new QAction(VIconUtils::menuIcon(":/resources/icons/print.svg"),
                              tr("&Print"), this);
     m_printAct->setToolTip(tr("Print current note"));
     connect(m_printAct, &QAction::triggered,
@@ -945,7 +947,7 @@ void VMainWindow::initFileMenu()
     initThemeMenu(fileMenu);
 
     // Settings.
-    QAction *settingsAct = newAction(QIcon(":/resources/icons/settings.svg"),
+    QAction *settingsAct = newAction(VIconUtils::menuIcon(":/resources/icons/settings.svg"),
                                      tr("&Settings"), this);
     settingsAct->setToolTip(tr("View and change settings for VNote"));
     settingsAct->setMenuRole(QAction::PreferencesRole);
@@ -1017,7 +1019,7 @@ void VMainWindow::initEditMenu()
     editMenu->setToolTipsVisible(true);
 
     // Find/Replace.
-    m_findReplaceAct = newAction(QIcon(":/resources/icons/find_replace.svg"),
+    m_findReplaceAct = newAction(VIconUtils::menuIcon(":/resources/icons/find_replace.svg"),
                                  tr("Find/Replace"), this);
     m_findReplaceAct->setToolTip(tr("Open Find/Replace dialog to search in current note"));
     QString keySeq = g_config->getShortcutKeySequence("Find");
@@ -1239,10 +1241,10 @@ void VMainWindow::initDockWindows()
 
     m_toolBox = new VToolBox(this);
     m_toolBox->addItem(outline,
-                       QIcon(":/resources/icons/outline.svg"),
+                       VIconUtils::toolBoxIcon(":/resources/icons/outline.svg"),
                        tr("Outline"));
     m_toolBox->addItem(m_snippetList,
-                       QIcon(":/resources/icons/snippets.svg"),
+                       VIconUtils::toolBoxIcon(":/resources/icons/snippets.svg"),
                        tr("Snippets"));
 
     toolDock->setWidget(m_toolBox);
@@ -1562,7 +1564,7 @@ void VMainWindow::initRenderStyleMenu(QMenu *p_menu)
     connect(m_renderStyleActs, &QActionGroup::triggered,
             this, &VMainWindow::setRenderStyle);
 
-    QAction *addAct = newAction(QIcon(":/resources/icons/add_style.svg"),
+    QAction *addAct = newAction(VIconUtils::menuIcon(":/resources/icons/add_style.svg"),
                                 tr("&Add Style"),
                                 m_renderStyleActs);
     addAct->setToolTip(tr("Open the folder to add your custom CSS style files "
@@ -1615,7 +1617,7 @@ void VMainWindow::initCodeBlockStyleMenu(QMenu *p_menu)
     connect(m_codeBlockStyleActs, &QActionGroup::triggered,
             this, &VMainWindow::setCodeBlockStyle);
 
-    QAction *addAct = newAction(QIcon(":/resources/icons/add_style.svg"),
+    QAction *addAct = newAction(VIconUtils::menuIcon(":/resources/icons/add_style.svg"),
                                 tr("&Add Style"),
                                 m_codeBlockStyleActs);
     addAct->setToolTip(tr("Open the folder to add your custom CSS style files "
@@ -1762,7 +1764,7 @@ void VMainWindow::initEditorStyleMenu(QMenu *p_menu)
     connect(m_editorStyleActs, &QActionGroup::triggered,
             this, &VMainWindow::setEditorStyle);
 
-    QAction *addAct = newAction(QIcon(":/resources/icons/add_style.svg"),
+    QAction *addAct = newAction(VIconUtils::menuIcon(":/resources/icons/add_style.svg"),
                                 tr("&Add Style"), m_editorStyleActs);
     addAct->setToolTip(tr("Open the folder to add your custom MDHL style files"));
     addAct->setCheckable(true);
@@ -2734,9 +2736,9 @@ void VMainWindow::openFlashPage()
 
 void VMainWindow::initHeadingButton(QToolBar *p_tb)
 {
-    m_headingBtn = new QPushButton(QIcon(":/resources/icons/heading.svg"),
-                                              "",
-                                              this);
+    m_headingBtn = new QPushButton(VIconUtils::toolButtonIcon(":/resources/icons/heading.svg"),
+                                   "",
+                                   this);
     m_headingBtn->setToolTip(tr("Headings"));
     m_headingBtn->setProperty("CornerBtn", true);
     m_headingBtn->setFocusPolicy(Qt::NoFocus);

src/vmdeditor.cpp

@@ -18,6 +18,7 @@
 #include "vorphanfile.h"
 #include "vnotefile.h"
 #include "vpreviewmanager.h"
+#include "utils/viconutils.h"
 
 extern VConfigManager *g_config;
 
@@ -264,7 +265,7 @@ void VMdEditor::contextMenuEvent(QContextMenuEvent *p_event)
         VEditTab *editTab = dynamic_cast<VEditTab *>(parent());
         Q_ASSERT(editTab);
         if (editTab->isEditMode()) {
-            QAction *saveExitAct = new QAction(QIcon(":/resources/icons/save_exit.svg"),
+            QAction *saveExitAct = new QAction(VIconUtils::menuIcon(":/resources/icons/save_exit.svg"),
                                                tr("&Save Changes And Read"),
                                                menu);
             saveExitAct->setToolTip(tr("Save changes and exit edit mode"));
@@ -273,7 +274,7 @@ void VMdEditor::contextMenuEvent(QContextMenuEvent *p_event)
                         emit m_object->saveAndRead();
                     });
 
-            QAction *discardExitAct = new QAction(QIcon(":/resources/icons/discard_exit.svg"),
+            QAction *discardExitAct = new QAction(VIconUtils::menuIcon(":/resources/icons/discard_exit.svg"),
                                                   tr("&Discard Changes And Read"),
                                                   menu);
             discardExitAct->setToolTip(tr("Discard changes and exit edit mode"));

src/vnotebookselector.cpp

@@ -22,6 +22,7 @@
 #include "vnofocusitemdelegate.h"
 #include "vmainwindow.h"
 #include "utils/vimnavigationforwidget.h"
+#include "utils/viconutils.h"
 
 extern VConfigManager *g_config;
 
@@ -57,13 +58,13 @@ VNotebookSelector::VNotebookSelector(QWidget *p_parent)
 
 void VNotebookSelector::initActions()
 {
-    m_deleteNotebookAct = new QAction(QIcon(":/resources/icons/delete_notebook.svg"),
+    m_deleteNotebookAct = new QAction(VIconUtils::menuDangerIcon(":/resources/icons/delete_notebook.svg"),
                                       tr("&Delete"), this);
     m_deleteNotebookAct->setToolTip(tr("Delete current notebook"));
     connect(m_deleteNotebookAct, SIGNAL(triggered(bool)),
             this, SLOT(deleteNotebook()));
 
-    m_notebookInfoAct = new QAction(QIcon(":/resources/icons/notebook_info.svg"),
+    m_notebookInfoAct = new QAction(VIconUtils::menuIcon(":/resources/icons/notebook_info.svg"),
                                     tr("&Info"), this);
     m_notebookInfoAct->setToolTip(tr("View and edit current notebook's information"));
     connect(m_notebookInfoAct, SIGNAL(triggered(bool)),
@@ -84,7 +85,7 @@ void VNotebookSelector::initActions()
                 QDesktopServices::openUrl(url);
             });
 
-    m_recycleBinAct = new QAction(QIcon(":/resources/icons/recycle_bin.svg"),
+    m_recycleBinAct = new QAction(VIconUtils::menuIcon(":/resources/icons/recycle_bin.svg"),
                                   tr("&Recycle Bin"), this);
     m_recycleBinAct->setToolTip(tr("Open the recycle bin of this notebook"));
     connect(m_recycleBinAct, &QAction::triggered,
@@ -100,7 +101,7 @@ void VNotebookSelector::initActions()
                 QDesktopServices::openUrl(url);
             });
 
-    m_emptyRecycleBinAct = new QAction(QIcon(":/resources/icons/empty_recycle_bin.svg"),
+    m_emptyRecycleBinAct = new QAction(VIconUtils::menuDangerIcon(":/resources/icons/empty_recycle_bin.svg"),
                                        tr("&Empty Recycle Bin"), this);
     m_emptyRecycleBinAct->setToolTip(tr("Empty the recycle bin of this notebook"));
     connect(m_emptyRecycleBinAct, &QAction::triggered,
@@ -216,7 +217,7 @@ int VNotebookSelector::itemIndexOfNotebook(const VNotebook *p_notebook) const
 void VNotebookSelector::insertAddNotebookItem()
 {
     QListWidgetItem *item = new QListWidgetItem();
-    item->setIcon(QIcon(":/resources/icons/create_notebook.svg"));
+    item->setIcon(VIconUtils::comboBoxIcon(":/resources/icons/create_notebook.svg"));
     item->setText(tr("Add Notebook"));
     QFont font;
     font.setItalic(true);
@@ -447,7 +448,7 @@ void VNotebookSelector::fillItem(QListWidgetItem *p_item,
 {
     p_item->setText(p_notebook->getName());
     p_item->setToolTip(p_notebook->getName());
-    p_item->setIcon(QIcon(":/resources/icons/notebook_item.svg"));
+    p_item->setIcon(VIconUtils::comboBoxIcon(":/resources/icons/notebook_item.svg"));
     p_item->setData(Qt::UserRole, (qulonglong)p_notebook);
 }
 

src/vsnippetlist.cpp

@@ -9,6 +9,7 @@
 #include "dialog/vsortdialog.h"
 #include "dialog/vconfirmdeletiondialog.h"
 #include "vmainwindow.h"
+#include "utils/viconutils.h"
 
 extern VConfigManager *g_config;
 
@@ -42,13 +43,13 @@ VSnippetList::VSnippetList(QWidget *p_parent)
 
 void VSnippetList::setupUI()
 {
-    m_addBtn = new QPushButton(QIcon(":/resources/icons/add_snippet.svg"), "");
+    m_addBtn = new QPushButton(VIconUtils::buttonIcon(":/resources/icons/add_snippet.svg"), "");
     m_addBtn->setToolTip(tr("New Snippet"));
     m_addBtn->setProperty("FlatBtn", true);
     connect(m_addBtn, &QPushButton::clicked,
             this, &VSnippetList::newSnippet);
 
-    m_locateBtn = new QPushButton(QIcon(":/resources/icons/locate_snippet.svg"), "");
+    m_locateBtn = new QPushButton(VIconUtils::buttonIcon(":/resources/icons/locate_snippet.svg"), "");
     m_locateBtn->setToolTip(tr("Open Folder"));
     m_locateBtn->setProperty("FlatBtn", true);
     connect(m_locateBtn, &QPushButton::clicked,
@@ -86,7 +87,7 @@ void VSnippetList::setupUI()
 
 void VSnippetList::initActions()
 {
-    m_applyAct = new QAction(QIcon(":/resources/icons/apply_snippet.svg"),
+    m_applyAct = new QAction(VIconUtils::menuIcon(":/resources/icons/apply_snippet.svg"),
                              tr("&Apply"),
                              this);
     m_applyAct->setToolTip(tr("Insert this snippet in editor"));
@@ -96,21 +97,21 @@ void VSnippetList::initActions()
                 handleItemActivated(item);
             });
 
-    m_infoAct = new QAction(QIcon(":/resources/icons/snippet_info.svg"),
+    m_infoAct = new QAction(VIconUtils::menuIcon(":/resources/icons/snippet_info.svg"),
                             tr("&Info\t%1").arg(VUtils::getShortcutText(c_infoShortcutSequence)),
                             this);
     m_infoAct->setToolTip(tr("View and edit snippet's information"));
     connect(m_infoAct, &QAction::triggered,
             this, &VSnippetList::snippetInfo);
 
-    m_deleteAct = new QAction(QIcon(":/resources/icons/delete_snippet.svg"),
+    m_deleteAct = new QAction(VIconUtils::menuDangerIcon(":/resources/icons/delete_snippet.svg"),
                               tr("&Delete"),
                               this);
     m_deleteAct->setToolTip(tr("Delete selected snippets"));
     connect(m_deleteAct, &QAction::triggered,
             this, &VSnippetList::deleteSelectedItems);
 
-    m_sortAct = new QAction(QIcon(":/resources/icons/sort.svg"),
+    m_sortAct = new QAction(VIconUtils::menuIcon(":/resources/icons/sort.svg"),
                             tr("&Sort"),
                             this);
     m_sortAct->setToolTip(tr("Sort snippets manually"));

src/vwebview.cpp

@@ -12,6 +12,7 @@
 #include <QImage>
 #include "vfile.h"
 #include "utils/vclipboardutils.h"
+#include "utils/viconutils.h"
 
 // We set the property of the clipboard to mark that the URL copied in the
 // clipboard has been altered.
@@ -73,7 +74,7 @@ void VWebView::contextMenuEvent(QContextMenuEvent *p_event)
     const QList<QAction *> actions = menu->actions();
 
     if (!hasSelection() && m_file && m_file->isModifiable()) {
-        QAction *editAct= new QAction(QIcon(":/resources/icons/edit_note.svg"),
+        QAction *editAct= new QAction(VIconUtils::menuIcon(":/resources/icons/edit_note.svg"),
                                       tr("&Edit"), menu);
         editAct->setToolTip(tr("Edit current note"));
         connect(editAct, &QAction::triggered,