diff --git a/src/dialogs/dialogbisector.ui b/src/dialogs/dialogbisector.ui
index bab63fbc7..32b1c777e 100644
--- a/src/dialogs/dialogbisector.ui
+++ b/src/dialogs/dialogbisector.ui
@@ -14,7 +14,7 @@
    <string>Bisector</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../icon.qrc">
+   <iconset resource="../../share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -83,6 +83,26 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QToolButton" name="toolButtonPutHere">
+       <property name="toolTip">
+        <string>Insert marked variable into the formula</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../share/resources/icon.qrc">
+         <normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QToolButton" name="toolButtonEqual">
        <property name="toolTip">
@@ -92,7 +112,7 @@
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset resource="../icon.qrc">
+        <iconset resource="../../share/resources/icon.qrc">
          <normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
        </property>
        <property name="iconSize">
@@ -186,26 +206,6 @@
          <item>
           <widget class="QLineEdit" name="lineEditNamePoint"/>
          </item>
-         <item>
-          <widget class="QToolButton" name="toolButtonPutHere">
-           <property name="toolTip">
-            <string>Insert marked variable into the formula</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../icon.qrc">
-             <normaloff>:/icon/24x24/putHere.png</normaloff>:/icon/24x24/putHere.png</iconset>
-           </property>
-           <property name="iconSize">
-            <size>
-             <width>24</width>
-             <height>24</height>
-            </size>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
        <item>
@@ -285,7 +285,7 @@
          <item>
           <widget class="QLabel" name="label_7">
            <property name="text">
-            <string>Type line</string>
+            <string>Type of line</string>
            </property>
           </widget>
          </item>
@@ -410,12 +410,11 @@
   <tabstop>radioButtonLengthArc</tabstop>
   <tabstop>radioButtonLengthSpline</tabstop>
   <tabstop>listWidget</tabstop>
-  <tabstop>toolButtonPutHere</tabstop>
   <tabstop>toolButtonEqual</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../icon.qrc"/>
+  <include location="../../share/resources/icon.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/dialogs/dialogdetail.cpp b/src/dialogs/dialogdetail.cpp
index 6b1b7ab9b..74780726a 100644
--- a/src/dialogs/dialogdetail.cpp
+++ b/src/dialogs/dialogdetail.cpp
@@ -87,7 +87,7 @@ void DialogDetail::ChoosedObject(qint64 id, const Scene::Scenes &type)
                 NewItem(id, Tool::NodeSplinePath, mode, NodeDetail::Contour);
                 break;
             default:
-                qWarning()<<tr("Get wrong scene object. Ignore.");
+                qWarning()<<tr("Got wrong scene object. Ignore.");
                 break;
         }
         this->show();
@@ -173,7 +173,7 @@ void DialogDetail::NewItem(qint64 id, const Tool::Tools &typeTool, const Draw::D
             break;
         }
         default:
-            qWarning()<<tr("Get wrong tools. Ignore.");
+            qWarning()<<tr("Got wrong tools. Ignore.");
             break;
     }
 
diff --git a/src/dialogs/dialogdetail.ui b/src/dialogs/dialogdetail.ui
index 7d25b3c3e..0bf4f0369 100644
--- a/src/dialogs/dialogdetail.ui
+++ b/src/dialogs/dialogdetail.ui
@@ -88,7 +88,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
-          <string>Option</string>
+          <string>Options</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
@@ -161,7 +161,7 @@
           <item>
            <widget class="QCheckBox" name="checkBoxSeams">
             <property name="text">
-             <string>Supplement for seams</string>
+             <string>Seam allowance</string>
             </property>
             <property name="checked">
              <bool>true</bool>
diff --git a/src/dialogs/dialogendline.ui b/src/dialogs/dialogendline.ui
index 9601b58d8..578808a41 100644
--- a/src/dialogs/dialogendline.ui
+++ b/src/dialogs/dialogendline.ui
@@ -251,7 +251,7 @@
               </size>
              </property>
              <property name="text">
-              <string>Angle degree </string>
+              <string>Degree of angel</string>
              </property>
             </widget>
            </item>
@@ -272,7 +272,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowRightUp.png</normaloff>:/icon/24x24/arrowRightUp.png</iconset>
                </property>
                <property name="iconSize">
@@ -289,7 +289,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowLeftUp.png</normaloff>:/icon/24x24/arrowLeftUp.png</iconset>
                </property>
                <property name="iconSize">
@@ -306,7 +306,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowLeft.png</normaloff>:/icon/24x24/arrowLeft.png</iconset>
                </property>
                <property name="iconSize">
@@ -323,7 +323,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowRight.png</normaloff>:/icon/24x24/arrowRight.png</iconset>
                </property>
                <property name="iconSize">
@@ -346,7 +346,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowUp.png</normaloff>:/icon/24x24/arrowUp.png</iconset>
                </property>
                <property name="iconSize">
@@ -363,7 +363,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowDown.png</normaloff>:/icon/24x24/arrowDown.png</iconset>
                </property>
                <property name="iconSize">
@@ -380,7 +380,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowLeftDown.png</normaloff>:/icon/24x24/arrowLeftDown.png</iconset>
                </property>
                <property name="iconSize">
@@ -397,7 +397,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowRightDown.png</normaloff>:/icon/24x24/arrowRightDown.png</iconset>
                </property>
                <property name="iconSize">
@@ -575,7 +575,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../icon.qrc"/>
+  <include location="../../share/resources/icon.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/dialogs/dialoghistory.cpp b/src/dialogs/dialoghistory.cpp
index 268a7db85..1ac2394a5 100644
--- a/src/dialogs/dialoghistory.cpp
+++ b/src/dialogs/dialoghistory.cpp
@@ -240,7 +240,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
                 p1Line2 = domElement.attribute("p1Line2", "").toLongLong();
                 p2Line2 = domElement.attribute("p2Line2", "").toLongLong();
             }
-            record = QString(tr("%5 - point of intersecting lines %1_%2 and %3_%4")).arg(data->GetPoint(p1Line1).name(),
+            record = QString(tr("%5 - intersection of lines %1_%2 and %3_%4")).arg(data->GetPoint(p1Line1).name(),
                                                                                          data->GetPoint(p2Line1).name(),
                                                                                          data->GetPoint(p1Line2).name(),
                                                                                          data->GetPoint(p2Line2).name(),
@@ -320,7 +320,7 @@ QString DialogHistory::Record(const VToolRecord &tool)
             break;
         }
         default:
-            qWarning()<<tr("Get wrong tool type. Ignore.");
+            qWarning()<<tr("Got wrong tool type. Ignore.");
             break;
     }
     return record;
diff --git a/src/dialogs/dialoglineintersect.ui b/src/dialogs/dialoglineintersect.ui
index 9326698ea..bb2e1b3bd 100644
--- a/src/dialogs/dialoglineintersect.ui
+++ b/src/dialogs/dialoglineintersect.ui
@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>384</width>
+    <width>370</width>
     <height>196</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Point of line intersection</string>
+   <string>Intersection of lines</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../icon.qrc">
+   <iconset resource="../../share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <property name="locale">
@@ -173,7 +173,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../icon.qrc"/>
+  <include location="../../share/resources/icon.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/dialogs/dialognormal.ui b/src/dialogs/dialognormal.ui
index 70d5491a4..079a90e4d 100644
--- a/src/dialogs/dialognormal.ui
+++ b/src/dialogs/dialognormal.ui
@@ -14,7 +14,7 @@
    <string>Normal</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../icon.qrc">
+   <iconset resource="../../share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <property name="locale">
@@ -95,7 +95,7 @@
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset resource="../icon.qrc">
+        <iconset resource="../../share/resources/icon.qrc">
          <normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
        </property>
        <property name="iconSize">
@@ -294,7 +294,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowRightUp.png</normaloff>:/icon/24x24/arrowRightUp.png</iconset>
                </property>
                <property name="iconSize">
@@ -311,7 +311,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowLeftUp.png</normaloff>:/icon/24x24/arrowLeftUp.png</iconset>
                </property>
                <property name="iconSize">
@@ -328,7 +328,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowLeft.png</normaloff>:/icon/24x24/arrowLeft.png</iconset>
                </property>
                <property name="iconSize">
@@ -345,7 +345,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowRight.png</normaloff>:/icon/24x24/arrowRight.png</iconset>
                </property>
                <property name="iconSize">
@@ -368,7 +368,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowUp.png</normaloff>:/icon/24x24/arrowUp.png</iconset>
                </property>
                <property name="iconSize">
@@ -385,7 +385,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowDown.png</normaloff>:/icon/24x24/arrowDown.png</iconset>
                </property>
                <property name="iconSize">
@@ -402,7 +402,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowLeftDown.png</normaloff>:/icon/24x24/arrowLeftDown.png</iconset>
                </property>
                <property name="iconSize">
@@ -419,7 +419,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../icon.qrc">
+                <iconset resource="../../share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/arrowRightDown.png</normaloff>:/icon/24x24/arrowRightDown.png</iconset>
                </property>
                <property name="iconSize">
diff --git a/src/geometry/vsplinepath.cpp b/src/geometry/vsplinepath.cpp
index 79b2acf76..2dfd02166 100644
--- a/src/geometry/vsplinepath.cpp
+++ b/src/geometry/vsplinepath.cpp
@@ -75,7 +75,7 @@ VSpline VSplinePath::GetSpline(qint32 index) const
     }
     if (index < 1 || index > Count())
     {
-        throw VException(tr("This spline is not exist."));
+        throw VException(tr("This spline does not exist."));
     }
     VSpline spl(&points, path[index-1].P(), path[index].P(), path[index-1].Angle2(), path[index].Angle1(),
             path[index-1].KAsm2(), path[index].KAsm1(), this->kCurve);
@@ -126,7 +126,7 @@ void VSplinePath::UpdatePoint(qint32 indexSpline, const SplinePoint::Position &p
 {
     if (indexSpline < 1 || indexSpline > Count())
     {
-        throw VException(tr("This spline is not exist."));
+        throw VException(tr("This spline does not exist."));
     }
     if (pos == SplinePoint::FirstPoint)
     {
@@ -142,7 +142,7 @@ VSplinePoint VSplinePath::GetSplinePoint(qint32 indexSpline, SplinePoint::Positi
 {
     if (indexSpline < 1 || indexSpline > Count())
     {
-        throw VException(tr("This spline is not exist."));
+        throw VException(tr("This spline does not exist."));
     }
     if (pos == SplinePoint::FirstPoint)
     {