diff --git a/src/app/puzzle/puzzlemainwindow.h b/src/app/puzzle/puzzlemainwindow.h
index ac1ba0cb6..6cf5977ee 100644
--- a/src/app/puzzle/puzzlemainwindow.h
+++ b/src/app/puzzle/puzzlemainwindow.h
@@ -51,6 +51,7 @@ private:
 
     void InitMenuBar();
 
+private slots:
     void New();
     void Open();
     void Save();
diff --git a/src/app/puzzle/puzzlemainwindow.ui b/src/app/puzzle/puzzlemainwindow.ui
index 0dee51b58..55b7f1b95 100644
--- a/src/app/puzzle/puzzlemainwindow.ui
+++ b/src/app/puzzle/puzzlemainwindow.ui
@@ -13,7 +13,86 @@
   <property name="windowTitle">
    <string>PuzzleMainWindow</string>
   </property>
-  <widget class="QWidget" name="centralWidget"/>
+  <widget class="QWidget" name="centralWidget">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="layoutDirection">
+    <enum>Qt::LeftToRight</enum>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayoutMainWidget">
+    <property name="sizeConstraint">
+     <enum>QLayout::SetDefaultConstraint</enum>
+    </property>
+    <item>
+     <widget class="QGraphicsView" name="graphicsView"/>
+    </item>
+    <item>
+     <widget class="QTabWidget" name="tabWidgetProperties">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>320</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="tabShape">
+       <enum>QTabWidget::Rounded</enum>
+      </property>
+      <property name="currentIndex">
+       <number>0</number>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>32</width>
+        <height>32</height>
+       </size>
+      </property>
+      <widget class="QWidget" name="tabCurrentPieceProperty">
+       <attribute name="icon">
+        <iconset resource="share/resources/puzzleicon.qrc">
+         <normaloff>:/puzzleicon/64x64/iconCurrentPiece.png</normaloff>:/puzzleicon/64x64/iconCurrentPiece.png</iconset>
+       </attribute>
+       <attribute name="title">
+        <string/>
+       </attribute>
+      </widget>
+      <widget class="QWidget" name="tabLayoutProperty">
+       <attribute name="icon">
+        <iconset resource="share/resources/puzzleicon.qrc">
+         <normaloff>:/puzzleicon/64x64/iconLayout.png</normaloff>:/puzzleicon/64x64/iconLayout.png</iconset>
+       </attribute>
+       <attribute name="title">
+        <string/>
+       </attribute>
+      </widget>
+      <widget class="QWidget" name="tabTilesProperty">
+       <attribute name="icon">
+        <iconset resource="share/resources/puzzleicon.qrc">
+         <normaloff>:/puzzleicon/64x64/iconTiles.png</normaloff>:/puzzleicon/64x64/iconTiles.png</iconset>
+       </attribute>
+       <attribute name="title">
+        <string/>
+       </attribute>
+      </widget>
+      <widget class="QWidget" name="tabLayersProperty">
+       <attribute name="icon">
+        <iconset resource="share/resources/puzzleicon.qrc">
+         <normaloff>:/puzzleicon/64x64/iconLayers.png</normaloff>:/puzzleicon/64x64/iconLayers.png</iconset>
+       </attribute>
+       <attribute name="title">
+        <string/>
+       </attribute>
+      </widget>
+     </widget>
+    </item>
+   </layout>
+  </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
@@ -69,6 +148,27 @@
    </attribute>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
+  <widget class="QDockWidget" name="dockWidgetPieceCarroussel">
+   <property name="minimumSize">
+    <size>
+     <width>160</width>
+     <height>160</height>
+    </size>
+   </property>
+   <property name="features">
+    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::AllDockWidgetAreas</set>
+   </property>
+   <property name="windowTitle">
+    <string>Piece Carrousel</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidget"/>
+  </widget>
   <action name="actionOpen">
    <property name="text">
     <string>Open</string>
@@ -108,7 +208,8 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset theme="application-exit"/>
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>E&amp;xit</string>
@@ -137,6 +238,8 @@
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="share/resources/puzzleicon.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/src/app/puzzle/share/resources/puzzleicon.qrc b/src/app/puzzle/share/resources/puzzleicon.qrc
index 871f678c4..563bb83a4 100644
--- a/src/app/puzzle/share/resources/puzzleicon.qrc
+++ b/src/app/puzzle/share/resources/puzzleicon.qrc
@@ -1,5 +1,9 @@
 <RCC>
     <qresource prefix="/">
         <file>puzzleicon/64x64/logo.png</file>
+        <file>puzzleicon/64x64/iconLayout.png</file>
+        <file>puzzleicon/64x64/iconCurrentPiece.png</file>
+        <file>puzzleicon/64x64/iconLayers.png</file>
+        <file>puzzleicon/64x64/iconTiles.png</file>
     </qresource>
 </RCC>
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png
new file mode 100644
index 000000000..0e12bb443
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconCurrentPiece.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png
new file mode 100644
index 000000000..2f36eba4d
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayers.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout.png
new file mode 100644
index 000000000..70a5a5691
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconLayout.png differ
diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png b/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png
new file mode 100644
index 000000000..ee3099a77
Binary files /dev/null and b/src/app/puzzle/share/resources/puzzleicon/64x64/iconTiles.png differ