diff --git a/utils/pult/cddirectk.ui b/utils/pult/cddirectk.ui
index 731498b..e7b67d1 100644
--- a/utils/pult/cddirectk.ui
+++ b/utils/pult/cddirectk.ui
@@ -44,7 +44,7 @@
          <string>Add new</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/application/qad_application.qrc">
+         <iconset resource="../../../qad/libs/qglview/qglview.qrc">
           <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
         </property>
        </widget>
@@ -55,7 +55,7 @@
          <string>Remove all</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/application/qad_application.qrc">
+         <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
           <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
         </property>
        </widget>
@@ -79,7 +79,8 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../qad/application/qad_application.qrc"/>
+  <include location="../../../qad/libs/blockview/qad_blockview.qrc"/>
+  <include location="../../../qad/libs/qglview/qglview.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/utils/pult/cdgraphics.ui b/utils/pult/cdgraphics.ui
index 6a40b06..d7570f6 100644
--- a/utils/pult/cdgraphics.ui
+++ b/utils/pult/cdgraphics.ui
@@ -44,7 +44,7 @@
          <string>Add new</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/utils/qad_utils.qrc">
+         <iconset resource="../../../qad/libs/qglview/qglview.qrc">
           <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
         </property>
        </widget>
@@ -55,7 +55,7 @@
          <string>Clear all</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/utils/qad_utils.qrc">
+         <iconset resource="../../../qad/libs/application/qad_application.qrc">
           <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
         </property>
        </widget>
@@ -66,7 +66,7 @@
          <string>Remove all</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/utils/qad_utils.qrc">
+         <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
           <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
         </property>
        </widget>
@@ -74,10 +74,10 @@
       <item>
        <widget class="QToolButton" name="buttonConfigVisible">
         <property name="toolTip">
-         <string>Remove all</string>
+         <string>Show settings</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/application/qad_application.qrc">
+         <iconset resource="../../../qad/libs/application/qad_application.qrc">
           <normaloff>:/icons/layer-visible-off.png</normaloff>
           <normalon>:/icons/layer-visible-on.png</normalon>:/icons/layer-visible-off.png</iconset>
         </property>
@@ -92,10 +92,10 @@
       <item>
        <widget class="QToolButton" name="buttonLegendVisible">
         <property name="toolTip">
-         <string>Remove all</string>
+         <string>Legend</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/widgets/qad_widgets.qrc">
+         <iconset resource="../../../qad/libs/graphic/qad_graphic.qrc">
           <normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset>
         </property>
         <property name="checkable">
@@ -109,10 +109,10 @@
       <item>
        <widget class="QToolButton" name="buttonPause">
         <property name="toolTip">
-         <string>Remove all</string>
+         <string>Pause</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/graphic/qad_graphic.qrc">
+         <iconset resource="../../../qad/libs/graphic/qad_graphic.qrc">
           <normaloff>:/icons/media-playback-pause.png</normaloff>:/icons/media-playback-pause.png</iconset>
         </property>
         <property name="checkable">
@@ -126,10 +126,10 @@
       <item>
        <widget class="QToolButton" name="buttonBorderInputsVisible">
         <property name="toolTip">
-         <string>Remove all</string>
+         <string>Edges</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/widgets/qad_widgets.qrc">
+         <iconset resource="../../../qad/libs/graphic/qad_graphic.qrc">
           <normaloff>:/icons/border-line.png</normaloff>:/icons/border-line.png</iconset>
         </property>
         <property name="checkable">
@@ -159,10 +159,10 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../qad/utils/qad_utils.qrc"/>
-  <include location="../../qad/widgets/qad_widgets.qrc"/>
-  <include location="../../qad/application/qad_application.qrc"/>
-  <include location="../../qad/graphic/qad_graphic.qrc"/>
+  <include location="../../../qad/libs/application/qad_application.qrc"/>
+  <include location="../../../qad/libs/blockview/qad_blockview.qrc"/>
+  <include location="../../../qad/libs/graphic/qad_graphic.qrc"/>
+  <include location="../../../qad/libs/qglview/qglview.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/utils/pult/cdpult.qrc b/utils/pult/cdpult.qrc
index 9fd497f..2ab6b55 100644
--- a/utils/pult/cdpult.qrc
+++ b/utils/pult/cdpult.qrc
@@ -6,5 +6,6 @@
         <file>icons/flame.png</file>
         <file>icons/accessories-calculator.png</file>
         <file>icons/accessories-text-editor.png</file>
+		<file>icons/dialog-information.png</file>
     </qresource>
 </RCC>
diff --git a/utils/pult/cdpultwindow.cpp b/utils/pult/cdpultwindow.cpp
index c388c5a..08b6c5d 100644
--- a/utils/pult/cdpultwindow.cpp
+++ b/utils/pult/cdpultwindow.cpp
@@ -26,6 +26,7 @@ CDPultWindow::CDPultWindow(QWidget *parent) : EMainWindow(parent), Ui::CDPultWin
 	centralWidget()->hide();
 	setTabPosition(Qt::AllDockWidgetAreas, QTabWidget::North);
 	CDCore::instance()->initPult();
+	codeConfig->setCommentText("#");
 	def_config = codeConfig->text();
 	checkDefaultConfig->setChecked(true);
 	new ConfigHighlighter(codeConfig->document());
diff --git a/utils/pult/cdpultwindow.ui b/utils/pult/cdpultwindow.ui
index ee0273c..918e2c0 100644
--- a/utils/pult/cdpultwindow.ui
+++ b/utils/pult/cdpultwindow.ui
@@ -38,7 +38,7 @@
       <string>Open recent</string>
      </property>
      <property name="icon">
-      <iconset resource="../../qad/application/qad_application.qrc">
+      <iconset resource="../../../qad/libs/widgets/qad_widgets.qrc">
        <normaloff>:/icons/document-open-recent.png</normaloff>:/icons/document-open-recent.png</iconset>
      </property>
     </widget>
@@ -51,7 +51,7 @@
   </widget>
   <widget class="EDockWidget" name="dockCDKView">
    <property name="windowIcon">
-    <iconset resource="../../qad/application/qad_application.qrc">
+    <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
      <normaloff>:/icons/document-edit.png</normaloff>:/icons/document-edit.png</iconset>
    </property>
    <property name="windowTitle">
@@ -73,7 +73,7 @@
   </widget>
   <widget class="EDockWidget" name="dockLog">
    <property name="windowIcon">
-    <iconset resource="cdpult.qrc">
+    <iconset>
      <normaloff>:/icons/dialog-information.png</normaloff>:/icons/dialog-information.png</iconset>
    </property>
    <property name="windowTitle">
@@ -114,7 +114,7 @@
   </widget>
   <widget class="EDockWidget" name="dockCDXView">
    <property name="windowIcon">
-    <iconset resource="../../qad/widgets/qad_widgets.qrc">
+    <iconset resource="../../../qad/libs/widgets/qad_widgets.qrc">
      <normaloff>:/icons/qvariantedit.png</normaloff>:/icons/qvariantedit.png</iconset>
    </property>
    <property name="windowTitle">
@@ -133,7 +133,7 @@
   </widget>
   <widget class="EDockWidget" name="dockSession">
    <property name="windowIcon">
-    <iconset resource="../../qad/application/qad_application.qrc">
+    <iconset resource="../../../qad/libs/application/qad_application.qrc">
      <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
    </property>
    <property name="windowTitle">
@@ -150,7 +150,7 @@
         <string>Apply</string>
        </property>
        <property name="icon">
-        <iconset resource="../../qad/widgets/qad_widgets.qrc">
+        <iconset resource="../../../qad/libs/application/qad_application.qrc">
          <normaloff>:/icons/dialog-ok-apply.png</normaloff>:/icons/dialog-ok-apply.png</iconset>
        </property>
       </widget>
@@ -181,7 +181,7 @@
             <string>Select icon...</string>
            </property>
            <property name="icon">
-            <iconset resource="../../qad/blockview/qad_blockview.qrc">
+            <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
              <normaloff>:/icons/view-preview.png</normaloff>:/icons/view-preview.png</iconset>
            </property>
           </widget>
@@ -304,7 +304,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
   </widget>
   <widget class="EDockWidget" name="dockCDCView">
    <property name="windowIcon">
-    <iconset resource="../../qad/blockview/qad_blockview.qrc">
+    <iconset resource="../../../qad/libs/graphic/qad_graphic.qrc">
      <normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset>
    </property>
    <property name="windowTitle">
@@ -323,7 +323,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
   </widget>
   <widget class="EDockWidget" name="dockGraphics">
    <property name="windowIcon">
-    <iconset resource="../../qad/blockview/qad_blockview.qrc">
+    <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
      <normaloff>:/icons/format-stroke-color.png</normaloff>:/icons/format-stroke-color.png</iconset>
    </property>
    <property name="windowTitle">
@@ -342,7 +342,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
   </widget>
   <widget class="EDockWidget" name="dockDirectK">
    <property name="windowIcon">
-    <iconset resource="../../qad/widgets/qad_widgets.qrc">
+    <iconset resource="../../../qad/libs/widgets/qad_widgets.qrc">
      <normaloff>:/icons/tools-wizard.png</normaloff>:/icons/tools-wizard.png</iconset>
    </property>
    <property name="windowTitle">
@@ -380,7 +380,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
   </widget>
   <action name="actionOpen">
    <property name="icon">
-    <iconset resource="../../qad/application/qad_application.qrc">
+    <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
      <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
    </property>
    <property name="text">
@@ -392,7 +392,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
   </action>
   <action name="actionSave">
    <property name="icon">
-    <iconset resource="../../qad/application/qad_application.qrc">
+    <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
      <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
    </property>
    <property name="text">
@@ -404,7 +404,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
   </action>
   <action name="actionSaveAs">
    <property name="icon">
-    <iconset resource="../../qad/application/qad_application.qrc">
+    <iconset resource="../../../qad/libs/widgets/qad_widgets.qrc">
      <normaloff>:/icons/document-save-as.png</normaloff>:/icons/document-save-as.png</iconset>
    </property>
    <property name="text">
@@ -490,10 +490,11 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../qad/application/qad_application.qrc"/>
-  <include location="../../qad/blockview/qad_blockview.qrc"/>
-  <include location="../../qad/widgets/qad_widgets.qrc"/>
   <include location="cdpult.qrc"/>
+  <include location="../../../qad/libs/application/qad_application.qrc"/>
+  <include location="../../../qad/libs/blockview/qad_blockview.qrc"/>
+  <include location="../../../qad/libs/graphic/qad_graphic.qrc"/>
+  <include location="../../../qad/libs/widgets/qad_widgets.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/utils/pult/icons/dialog-information.png b/utils/pult/icons/dialog-information.png
new file mode 100644
index 0000000..dfe70b9
Binary files /dev/null and b/utils/pult/icons/dialog-information.png differ