diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
index 6ad353cdf37..7b35e3a0090 100644
--- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
+++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
@@ -14,9 +14,19 @@
    <string>CGAL Constrained Delaunay Triangulation</string>
   </property>
   <property name="windowIcon" >
-   <iconset/>
+   <iconset>
+    <normaloff/>
+   </iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>66</y>
+     <width>400</width>
+     <height>209</height>
+    </rect>
+   </property>
    <layout class="QGridLayout" >
     <item row="0" column="0" >
      <widget class="QGraphicsView" name="graphicsView" >
@@ -36,8 +46,25 @@
     </item>
    </layout>
   </widget>
-  <widget class="QStatusBar" name="statusbar" />
+  <widget class="QStatusBar" name="statusbar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>275</y>
+     <width>400</width>
+     <height>25</height>
+    </rect>
+   </property>
+  </widget>
   <widget class="QToolBar" name="fileToolBar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>29</y>
+     <width>116</width>
+     <height>37</height>
+    </rect>
+   </property>
    <property name="windowTitle" >
     <string>File Tools</string>
    </property>
@@ -52,6 +79,14 @@
    <addaction name="actionSaveConstraints" />
   </widget>
   <widget class="QToolBar" name="toolBar" >
+   <property name="geometry" >
+    <rect>
+     <x>116</x>
+     <y>29</y>
+     <width>284</width>
+     <height>37</height>
+    </rect>
+   </property>
    <property name="windowTitle" >
     <string>Visualization Tools</string>
    </property>
@@ -73,7 +108,7 @@
      <x>0</x>
      <y>0</y>
      <width>400</width>
-     <height>19</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile" >
@@ -144,7 +179,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../icons/Input.qrc" >:/cgal/Input/inputPolyline.png</iconset>
+    <iconset resource="../icons/Input.qrc" >
+     <normaloff>:/cgal/Input/inputPolyline.png</normaloff>:/cgal/Input/inputPolyline.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Insert Polyline</string>
@@ -158,7 +194,8 @@
   </action>
   <action name="actionClear" >
    <property name="icon" >
-    <iconset resource="../icons/File.qrc" >:/cgal/fileToolbar/fileNew.png</iconset>
+    <iconset resource="../icons/File.qrc" >
+     <normaloff>:/cgal/fileToolbar/fileNew.png</normaloff>:/cgal/fileToolbar/fileNew.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Clear</string>
@@ -175,7 +212,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../icons/Triangulation_2.qrc" >:/cgal/Triangulation_2/Voronoi_diagram_2.png</iconset>
+    <iconset resource="../icons/Triangulation_2.qrc" >
+     <normaloff>:/cgal/Triangulation_2/Voronoi_diagram_2.png</normaloff>:/cgal/Triangulation_2/Voronoi_diagram_2.png</iconset>
    </property>
    <property name="text" >
     <string>Show &amp;Voronoi Diagram</string>
@@ -192,7 +230,8 @@
     <bool>true</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../icons/Triangulation_2.qrc" >:/cgal/Triangulation_2/Delaunay_triangulation_2.png</iconset>
+    <iconset resource="../icons/Triangulation_2.qrc" >
+     <normaloff>:/cgal/Triangulation_2/Delaunay_triangulation_2.png</normaloff>:/cgal/Triangulation_2/Delaunay_triangulation_2.png</iconset>
    </property>
    <property name="text" >
     <string>Show &amp;Delaunay Triangulation</string>
@@ -203,7 +242,8 @@
   </action>
   <action name="actionLoadConstraints" >
    <property name="icon" >
-    <iconset resource="../icons/File.qrc" >:/cgal/fileToolbar/fileOpen.png</iconset>
+    <iconset resource="../icons/File.qrc" >
+     <normaloff>:/cgal/fileToolbar/fileOpen.png</normaloff>:/cgal/fileToolbar/fileOpen.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Load Constraints...</string>
@@ -214,7 +254,8 @@
   </action>
   <action name="actionSaveConstraints" >
    <property name="icon" >
-    <iconset resource="../icons/File.qrc" >:/cgal/fileToolbar/fileSave.png</iconset>
+    <iconset resource="../icons/File.qrc" >
+     <normaloff>:/cgal/fileToolbar/fileSave.png</normaloff>:/cgal/fileToolbar/fileSave.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Save Constraints...</string>
@@ -228,7 +269,8 @@
     <bool>true</bool>
    </property>
    <property name="icon" >
-    <iconset resource="Constrained_Delaunay_triangulation_2.qrc" >:/cgal/Actions/icons/circumcenter.png</iconset>
+    <iconset resource="Constrained_Delaunay_triangulation_2.qrc" >
+     <normaloff>:/cgal/Actions/icons/circumcenter.png</normaloff>:/cgal/Actions/icons/circumcenter.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Circumcenter</string>
@@ -239,7 +281,8 @@
   </action>
   <action name="actionRecenter" >
    <property name="icon" >
-    <iconset resource="../icons/Input.qrc" >:/cgal/Input/zoom-best-fit</iconset>
+    <iconset resource="../icons/Input.qrc" >
+     <normaloff>:/cgal/Input/zoom-best-fit</normaloff>:/cgal/Input/zoom-best-fit</iconset>
    </property>
    <property name="text" >
     <string>Re&amp;center the viewport</string>
@@ -267,7 +310,7 @@
  <resources>
   <include location="Constrained_Delaunay_triangulation_2.qrc" />
   <include location="../icons/File.qrc" />
-  <include location="../icons/Logos.qrc" />
+  <include location="../resources/CGAL.qrc" />
   <include location="../icons/Triangulation_2.qrc" />
   <include location="../icons/Input.qrc" />
  </resources>
diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui
index 514c204d421..5e57e946ae3 100644
--- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui
+++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui
@@ -14,7 +14,7 @@
    <string>CGAL Delaunay Triangulation</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../icons/Logos.qrc" >
+   <iconset resource="../resources/CGAL.qrc" >
     <normaloff>:/cgal/logos/cgal_icon</normaloff>:/cgal/logos/cgal_icon</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
@@ -311,7 +311,7 @@
  <resources>
   <include location="Delaunay_triangulation_2.qrc" />
   <include location="../icons/File.qrc" />
-  <include location="../icons/Logos.qrc" />
+  <include location="../resources/CGAL.qrc" />
   <include location="../icons/Triangulation_2.qrc" />
   <include location="../icons/Input.qrc" />
  </resources>