diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp
index cc9d6c676..573e1a921 100644
--- a/src/app/dialogs/tools/dialogendline.cpp
+++ b/src/app/dialogs/tools/dialogendline.cpp
@@ -79,14 +79,14 @@ void DialogEndLine::DeployFormulaTextEdit()
     if (ui->plainTextEditFormula->height() < DIALOGENDLINE_MAX_FORMULA_HEIGHT)
     {
         ui->plainTextEditFormula->setFixedHeight(DIALOGENDLINE_MAX_FORMULA_HEIGHT);
-        QIcon icon(":/icon/16x16/go-next.png");
-        ui->pushButtonGrowLength->setIcon(icon);
+        //Set icon from theme (internal for Windows system)
+        ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next"));
     }
     else
     {
        ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight);
-       QIcon icon(":/icon/16x16/go-down.png");
-       ui->pushButtonGrowLength->setIcon(icon);
+       //Set icon from theme (internal for Windows system)
+       ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down"));
     }
 }
 
diff --git a/src/app/dialogs/tools/dialogendline.ui b/src/app/dialogs/tools/dialogendline.ui
index 862afb117..5a287426e 100644
--- a/src/app/dialogs/tools/dialogendline.ui
+++ b/src/app/dialogs/tools/dialogendline.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>486</width>
-    <height>522</height>
+    <height>586</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -186,9 +186,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../share/resources/icon.qrc">
-         <normaloff>:/icon/16x16/go-down.png</normaloff>
-         <activeoff>:/icon/16x16/go-next.png</activeoff>:/icon/16x16/go-down.png</iconset>
+        <iconset theme="go-down"/>
        </property>
        <property name="iconSize">
         <size>
diff --git a/src/app/share/resources/icon.qrc b/src/app/share/resources/icon.qrc
index 7fae467c5..64d48ee8e 100644
--- a/src/app/share/resources/icon.qrc
+++ b/src/app/share/resources/icon.qrc
@@ -52,7 +52,5 @@
         <file>icon/flags/uk.png</file>
         <file>icon/Graduation.png</file>
         <file>icon/individual.png</file>
-        <file>icon/16x16/go-down.png</file>
-        <file>icon/16x16/go-next.png</file>		
     </qresource>
 </RCC>
diff --git a/src/app/share/resources/icon/16x16/go-next.png b/src/app/share/resources/icon/16x16/go-next.png
deleted file mode 100644
index 5883d9dca..000000000
Binary files a/src/app/share/resources/icon/16x16/go-next.png and /dev/null differ
diff --git a/src/app/share/resources/icon/16x16/go-down.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/go-down.png
similarity index 100%
rename from src/app/share/resources/icon/16x16/go-down.png
rename to src/app/share/resources/icons/win.icon.theme/16x16/actions/go-down.png
diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png
new file mode 100755
index 000000000..d53d924b9
Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png differ
diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png
old mode 100644
new mode 100755
index 8eabaafe8..989e8d435
Binary files a/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png and b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png differ
diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png
old mode 100644
new mode 100755
index fc2c75622..95cc6e0e1
Binary files a/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png and b/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png differ
diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png
new file mode 100755
index 000000000..e44828414
Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png differ
diff --git a/src/app/share/resources/theme.qrc b/src/app/share/resources/theme.qrc
index 4950eb163..ae7c42bb5 100644
--- a/src/app/share/resources/theme.qrc
+++ b/src/app/share/resources/theme.qrc
@@ -34,5 +34,8 @@
         <file alias="24x24/actions/list-add.png">icons/win.icon.theme/24x24/actions/list-add.png</file>
         <file alias="32x32/actions/list-remove.png">icons/win.icon.theme/32x32/actions/list-remove.png</file>
         <file alias="32x32/actions/list-add.png">icons/win.icon.theme/32x32/actions/list-add.png</file>
+        <file>icons/win.icon.theme/16x16/actions/go-down.png</file>
+        <file>icons/win.icon.theme/24x24/actions/go-down.png</file>
+        <file>icons/win.icon.theme/32x32/actions/go-down.png</file>
     </qresource>
 </RCC>