diff --git a/interface/fonts/dvu_sans-12.font b/interface/fonts/dvu_sans-12.font
index 82ba8883..d0e7cbaf 100644
--- a/interface/fonts/dvu_sans-12.font
+++ b/interface/fonts/dvu_sans-12.font
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<Font version="3" type="FreeType" name="dvu_sans-12" resourceGroup="ttfs" filename="dvu_sans.ttf" size="12" />
+<Font version="3" type="FreeType" name="dvu_sans-12" resourceGroup="ttf" filename="dvu_sans.ttf" size="12" />
diff --git a/interface/imagesets/button1.imageset b/interface/imagesets/button1.imageset
index 276a3f51..29def16a 100644
--- a/interface/imagesets/button1.imageset
+++ b/interface/imagesets/button1.imageset
@@ -1,7 +1,16 @@
 <?xml version="1.0" ?>
-<Imageset version="2" name="ColobotButton" resourceGroup="textures" imagefile="button1.png" autoScaled="vertical" nativeHorzRes="2560" nativeVertRes="1920">
+<Imageset version="2" name="ColobotButton1" resourceGroup="textures" imagefile="button1.png" autoScaled="vertical" nativeHorzRes="2560" nativeVertRes="1920">
     <Image name="ButtonBgChecked" width="128" height="128" xPos="0" yPos="0" />
     <Image name="ButtonBgHover" width="128" height="128" xPos="128" yPos="0" />
+        <Image name="ButtonBgHoverTL" width="12" height="12" xPos="128" yPos="0" />
+        <Image name="ButtonBgHoverT" width="104" height="12" xPos="140" yPos="0" />
+        <Image name="ButtonBgHoverTR" width="12" height="12" xPos="244" yPos="0" />
+        <Image name="ButtonBgHoverL" width="12" height="12" xPos="128" yPos="12" />
+        <Image name="ButtonBgHoverC" width="104" height="104" xPos="140" yPos="12" />
+        <Image name="ButtonBgHoverR" width="12" height="12" xPos="244" yPos="12" />
+        <Image name="ButtonBgHoverBL" width="12" height="12" xPos="128" yPos="116" />
+        <Image name="ButtonBgHoverB" width="104" height="12" xPos="140" yPos="116" />
+        <Image name="ButtonBgHoverBR" width="12" height="12" xPos="244" yPos="116" />
     <Image name="ButtonBgNormal" width="128" height="128" xPos="256" yPos="0" />
         <Image name="ButtonBgNormalTL" width="12" height="12" xPos="256" yPos="0" />
         <Image name="ButtonBgNormalT" width="104" height="12" xPos="268" yPos="0" />
@@ -13,9 +22,27 @@
         <Image name="ButtonBgNormalB" width="104" height="12" xPos="268" yPos="116" />
         <Image name="ButtonBgNormalBR" width="12" height="12" xPos="372" yPos="116" />
     <Image name="ButtonBgPushed" width="128" height="128" xPos="384" yPos="0" />
+        <Image name="ButtonBgPushedTL" width="12" height="12" xPos="384" yPos="0" />
+        <Image name="ButtonBgPushedT" width="104" height="12" xPos="396" yPos="0" />
+        <Image name="ButtonBgPushedTR" width="12" height="12" xPos="500" yPos="0" />
+        <Image name="ButtonBgPushedL" width="12" height="12" xPos="384" yPos="12" />
+        <Image name="ButtonBgPushedC" width="104" height="104" xPos="396" yPos="12" />
+        <Image name="ButtonBgPushedR" width="12" height="12" xPos="500" yPos="12" />
+        <Image name="ButtonBgPushedBL" width="12" height="12" xPos="384" yPos="116" />
+        <Image name="ButtonBgPushedB" width="104" height="12" xPos="396" yPos="116" />
+        <Image name="ButtonBgPushedBR" width="12" height="12" xPos="500" yPos="116" />
     <Image name="SomeUnknownBar1" width="384" height="64" xPos="512" yPos="0" />
     <Image name="SomeUnknownBar2" width="384" height="64" xPos="512" yPos="64" />
     <Image name="ButtonBgDisabled" width="128" height="128" xPos="896" yPos="0" />
+        <Image name="ButtonBgDisabledTL" width="12" height="12" xPos="896" yPos="0" />
+        <Image name="ButtonBgDisabledT" width="104" height="12" xPos="908" yPos="0" />
+        <Image name="ButtonBgDisabledTR" width="12" height="12" xPos="1012" yPos="0" />
+        <Image name="ButtonBgDisabledL" width="12" height="12" xPos="896" yPos="12" />
+        <Image name="ButtonBgDisabledC" width="104" height="104" xPos="908" yPos="12" />
+        <Image name="ButtonBgDisabledR" width="12" height="12" xPos="1012" yPos="12" />
+        <Image name="ButtonBgDisabledBL" width="12" height="12" xPos="896" yPos="116" />
+        <Image name="ButtonBgDisabledB" width="104" height="12" xPos="908" yPos="116" />
+        <Image name="ButtonBgDisabledBR" width="12" height="12" xPos="1012" yPos="116" />
     
     <Image name="Stop" width="128" height="128" xPos="0" yPos="128" />
     <Image name="Reset" width="128" height="128" xPos="128" yPos="128" />
diff --git a/interface/imagesets/button2.imageset b/interface/imagesets/button2.imageset
index 8d81374c..e25e2ae1 100644
--- a/interface/imagesets/button2.imageset
+++ b/interface/imagesets/button2.imageset
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<Imageset version="2" name="ColobotButton" resourceGroup="textures" imagefile="button2.png" autoScaled="vertical" nativeHorzRes="2560" nativeVertRes="1920">
+<Imageset version="2" name="ColobotButton2" resourceGroup="textures" imagefile="button2.png" autoScaled="vertical" nativeHorzRes="2560" nativeVertRes="1920">
     <Image name="ResearchTracked" width="128" height="128" xPos="0" yPos="0" />
     <Image name="ResearchWinged" width="128" height="128" xPos="128" yPos="0" />
     <Image name="ResearchThumper" width="128" height="128" xPos="256" yPos="0" />
diff --git a/interface/layouts/test.layout b/interface/layouts/test.layout
index f1ac8420..7f3ebba9 100644
--- a/interface/layouts/test.layout
+++ b/interface/layouts/test.layout
@@ -1,20 +1,18 @@
 <?xml version="1.0" ?>
 <GUILayout version="4">
-    <Window type="DefaultWindow" name="root" />
-    
-    <!--<Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
+    <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
     <Property name="MaxSize" value="{{1,0},{1,0}}" />
     
     <Window type="DefaultWindow" name="root">
         <Window type="Colobot/ImageButton" name="test_button">
             <Property name="Area" value="{{0,0},{0,0},{0,64},{0,64}}" />
             <Property name="Disabled" value="false" />
-            <Property name="Image" value="ColobotButton/Edit" />
+            <Property name="Image" value="ColobotButton1/Edit" />
         </Window>
         <Window type="Colobot/TextButton" name="test_button2">
             <Property name="Area" value="{{0,0},{0,128},{0,192},{0,192}}" />
             <Property name="Disabled" value="false" />
             <Property name="Text" value="test" />
         </Window>
-    </Window>-->
+    </Window>
 </GUILayout>
diff --git a/interface/looknfeel/colobot.looknfeel b/interface/looknfeel/colobot.looknfeel
index 12dace6d..99d40f8f 100644
--- a/interface/looknfeel/colobot.looknfeel
+++ b/interface/looknfeel/colobot.looknfeel
@@ -4,91 +4,91 @@
         <PropertyDefinition name="Image" initialValue="" redrawOnWrite="true" />
         
         <ImagerySection name="background_normal">
-            <ImageryComponent>
+            <FrameComponent>
                 <Area>
-                    <Dim type="LeftEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="TopEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="RightEdge">
-                        <UnifiedDim scale="1" offset="0" type="RightEdge" />
-                    </Dim>
-                    <Dim type="BottomEdge">
-                        <UnifiedDim scale="1" offset="0" type="BottomEdge" />
-                    </Dim>
+                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
+                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBgNormal" />
+                <Image component="TopLeftCorner"     name="ColobotButton1/ButtonBgNormalTL" />
+                <Image component="TopEdge"           name="ColobotButton1/ButtonBgNormalT" />
+                <Image component="TopRightCorner"    name="ColobotButton1/ButtonBgNormalTR" />
+                <Image component="LeftEdge"          name="ColobotButton1/ButtonBgNormalL" />
+                <Image component="Background"        name="ColobotButton1/ButtonBgNormalC" />
+                <Image component="RightEdge"         name="ColobotButton1/ButtonBgNormalR" />
+                <Image component="BottomLeftCorner"  name="ColobotButton1/ButtonBgNormalBL" />
+                <Image component="BottomEdge"        name="ColobotButton1/ButtonBgNormalB" />
+                <Image component="BottomRightCorner" name="ColobotButton1/ButtonBgNormalBR" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
-            </ImageryComponent>
+            </FrameComponent>
         </ImagerySection>
 
         <ImagerySection name="background_hover">
-            <ImageryComponent>
+            <FrameComponent>
                 <Area>
-                    <Dim type="LeftEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="TopEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="RightEdge">
-                        <UnifiedDim scale="1" offset="0" type="RightEdge" />
-                    </Dim>
-                    <Dim type="BottomEdge">
-                        <UnifiedDim scale="1" offset="0" type="BottomEdge" />
-                    </Dim>
+                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
+                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBgHover" />
+                <Image component="TopLeftCorner"     name="ColobotButton1/ButtonBgHoverTL" />
+                <Image component="TopEdge"           name="ColobotButton1/ButtonBgHoverT" />
+                <Image component="TopRightCorner"    name="ColobotButton1/ButtonBgHoverTR" />
+                <Image component="LeftEdge"          name="ColobotButton1/ButtonBgHoverL" />
+                <Image component="Background"        name="ColobotButton1/ButtonBgHoverC" />
+                <Image component="RightEdge"         name="ColobotButton1/ButtonBgHoverR" />
+                <Image component="BottomLeftCorner"  name="ColobotButton1/ButtonBgHoverBL" />
+                <Image component="BottomEdge"        name="ColobotButton1/ButtonBgHoverB" />
+                <Image component="BottomRightCorner" name="ColobotButton1/ButtonBgHoverBR" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
-            </ImageryComponent>
+            </FrameComponent>
         </ImagerySection>
         
         <ImagerySection name="background_pushed">
-            <ImageryComponent>
+            <FrameComponent>
                 <Area>
-                    <Dim type="LeftEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="TopEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="RightEdge">
-                        <UnifiedDim scale="1" offset="0" type="RightEdge" />
-                    </Dim>
-                    <Dim type="BottomEdge">
-                        <UnifiedDim scale="1" offset="0" type="BottomEdge" />
-                    </Dim>
+                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
+                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBgPushed" />
+                <Image component="TopLeftCorner"     name="ColobotButton1/ButtonBgPushedTL" />
+                <Image component="TopEdge"           name="ColobotButton1/ButtonBgPushedT" />
+                <Image component="TopRightCorner"    name="ColobotButton1/ButtonBgPushedTR" />
+                <Image component="LeftEdge"          name="ColobotButton1/ButtonBgPushedL" />
+                <Image component="Background"        name="ColobotButton1/ButtonBgPushedC" />
+                <Image component="RightEdge"         name="ColobotButton1/ButtonBgPushedR" />
+                <Image component="BottomLeftCorner"  name="ColobotButton1/ButtonBgPushedBL" />
+                <Image component="BottomEdge"        name="ColobotButton1/ButtonBgPushedB" />
+                <Image component="BottomRightCorner" name="ColobotButton1/ButtonBgPushedBR" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
-            </ImageryComponent>
+            </FrameComponent>
         </ImagerySection>
         
         <ImagerySection name="background_disabled">
-            <ImageryComponent>
+            <FrameComponent>
                 <Area>
-                    <Dim type="LeftEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="TopEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="RightEdge">
-                        <UnifiedDim scale="1" offset="0" type="RightEdge" />
-                    </Dim>
-                    <Dim type="BottomEdge">
-                        <UnifiedDim scale="1" offset="0" type="BottomEdge" />
-                    </Dim>
+                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
+                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBgDisabled" />
+                <Image component="TopLeftCorner"     name="ColobotButton1/ButtonBgDisabledTL" />
+                <Image component="TopEdge"           name="ColobotButton1/ButtonBgDisabledT" />
+                <Image component="TopRightCorner"    name="ColobotButton1/ButtonBgDisabledTR" />
+                <Image component="LeftEdge"          name="ColobotButton1/ButtonBgDisabledL" />
+                <Image component="Background"        name="ColobotButton1/ButtonBgDisabledC" />
+                <Image component="RightEdge"         name="ColobotButton1/ButtonBgDisabledR" />
+                <Image component="BottomLeftCorner"  name="ColobotButton1/ButtonBgDisabledBL" />
+                <Image component="BottomEdge"        name="ColobotButton1/ButtonBgDisabledB" />
+                <Image component="BottomRightCorner" name="ColobotButton1/ButtonBgDisabledBR" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
-            </ImageryComponent>
+            </FrameComponent>
         </ImagerySection>
         
         <ImagerySection name="image">
@@ -135,7 +135,7 @@
             </ImageryComponent>
         </ImagerySection>
         
-        <!-- TODO: background_dead => ColobotButton/Disabled -->
+        <!-- TODO: background_dead => ColobotButton1/Disabled -->
         
         <StateImagery name="Normal">
             <Layer>
@@ -170,188 +170,92 @@
         <PropertyDefinition name="Align" initialValue="WordWrapCentreAligned" redrawOnWrite="true" />
         <PropertyDefinition name="VAlign" initialValue="CentreAligned" redrawOnWrite="true" />
         
-        <ImagerySection name="background_normal_top_left">
+        <ImagerySection name="background_normal">
             <FrameComponent>
                 <Area>
                     <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
                     <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
-                    <Dim type="RightEdge"><UnifiedDim scale="0.05" offset="0" type="RightEdge" /></Dim>
-                    <Dim type="BottomEdge"><UnifiedDim scale="0.05" offset="0" type="BottomEdge" /></Dim>
-                </Area>
-                <Image name="ColobotButton/ButtonBgNormalTL" />
-                <VertFormat type="Stretched" />
-                <HorzFormat type="Stretched" />
-            </FrameComponent>
-        </ImagerySection>
-        <ImagerySection name="background_normal_top">
-            <FrameComponent>
-                <Area>
-                    <Dim type="LeftEdge"><UnifiedDim scale="0.05" offset="0" type="LeftEdge" /></Dim>
-                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
-                    <Dim type="RightEdge"><UnifiedDim scale="0.95" offset="0" type="RightEdge" /></Dim>
-                    <Dim type="BottomEdge"><UnifiedDim scale="0.05" offset="0" type="BottomEdge" /></Dim>
-                </Area>
-                <Image name="ColobotButton/ButtonBgNormalT" />
-                <VertFormat type="Stretched" />
-                <HorzFormat type="Stretched" />
-            </FrameComponent>
-        </ImagerySection>
-        <ImagerySection name="background_normal_top_right">
-            <FrameComponent>
-                <Area>
-                    <Dim type="LeftEdge"><UnifiedDim scale="0.95" offset="0" type="LeftEdge" /></Dim>
-                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
-                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
-                    <Dim type="BottomEdge"><UnifiedDim scale="0.05" offset="0" type="BottomEdge" /></Dim>
-                </Area>
-                <Image name="ColobotButton/ButtonBgNormalTR" />
-                <VertFormat type="Stretched" />
-                <HorzFormat type="Stretched" />
-            </FrameComponent>
-        </ImagerySection>
-        <ImagerySection name="background_normal_left">
-            <FrameComponent>
-                <Area>
-                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
-                    <Dim type="TopEdge"><UnifiedDim scale="0.05" offset="0" type="TopEdge" /></Dim>
-                    <Dim type="RightEdge"><UnifiedDim scale="0.05" offset="0" type="RightEdge" /></Dim>
-                    <Dim type="BottomEdge"><UnifiedDim scale="0.95" offset="0" type="BottomEdge" /></Dim>
-                </Area>
-                <Image name="ColobotButton/ButtonBgNormalL" />
-                <VertFormat type="Stretched" />
-                <HorzFormat type="Stretched" />
-            </FrameComponent>
-        </ImagerySection>
-        <ImagerySection name="background_normal_right">
-            <FrameComponent>
-                <Area>
-                    <Dim type="LeftEdge"><UnifiedDim scale="0.95" offset="0" type="LeftEdge" /></Dim>
-                    <Dim type="TopEdge"><UnifiedDim scale="0.05" offset="0" type="TopEdge" /></Dim>
-                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
-                    <Dim type="BottomEdge"><UnifiedDim scale="0.95" offset="0" type="BottomEdge" /></Dim>
-                </Area>
-                <Image name="ColobotButton/ButtonBgNormalR" />
-                <VertFormat type="Stretched" />
-                <HorzFormat type="Stretched" />
-            </FrameComponent>
-        </ImagerySection>
-        <ImagerySection name="background_normal_bottom_left">
-            <FrameComponent>
-                <Area>
-                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
-                    <Dim type="TopEdge"><UnifiedDim scale="0.95" offset="0" type="TopEdge" /></Dim>
-                    <Dim type="RightEdge"><UnifiedDim scale="0.05" offset="0" type="RightEdge" /></Dim>
-                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
-                </Area>
-                <Image name="ColobotButton/ButtonBgNormalBL" />
-                <VertFormat type="Stretched" />
-                <HorzFormat type="Stretched" />
-            </FrameComponent>
-        </ImagerySection>
-        <ImagerySection name="background_normal_bottom">
-            <FrameComponent>
-                <Area>
-                    <Dim type="LeftEdge"><UnifiedDim scale="0.05" offset="0" type="LeftEdge" /></Dim>
-                    <Dim type="TopEdge"><UnifiedDim scale="0.95" offset="0" type="TopEdge" /></Dim>
-                    <Dim type="RightEdge"><UnifiedDim scale="0.95" offset="0" type="RightEdge" /></Dim>
-                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
-                </Area>
-                <Image name="ColobotButton/ButtonBgNormalB" />
-                <VertFormat type="Stretched" />
-                <HorzFormat type="Stretched" />
-            </FrameComponent>
-        </ImagerySection>
-        <ImagerySection name="background_normal_bottom_right">
-            <FrameComponent>
-                <Area>
-                    <Dim type="LeftEdge"><UnifiedDim scale="0.95" offset="0" type="LeftEdge" /></Dim>
-                    <Dim type="TopEdge"><UnifiedDim scale="0.95" offset="0" type="TopEdge" /></Dim>
                     <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
                     <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBgNormalBR" />
-                <VertFormat type="Stretched" />
-                <HorzFormat type="Stretched" />
-            </FrameComponent>
-        </ImagerySection>
-        <ImagerySection name="background_normal_center">
-            <FrameComponent>
-                <Area>
-                    <Dim type="LeftEdge"><UnifiedDim scale="0.05" offset="0" type="LeftEdge" /></Dim>
-                    <Dim type="TopEdge"><UnifiedDim scale="0.05" offset="0" type="TopEdge" /></Dim>
-                    <Dim type="RightEdge"><UnifiedDim scale="0.95" offset="0" type="RightEdge" /></Dim>
-                    <Dim type="BottomEdge"><UnifiedDim scale="0.95" offset="0" type="BottomEdge" /></Dim>
-                </Area>
-                <Image name="ColobotButton/ButtonBgNormalC" />
+                <Image component="TopLeftCorner"     name="ColobotButton1/ButtonBgNormalTL" />
+                <Image component="TopEdge"           name="ColobotButton1/ButtonBgNormalT" />
+                <Image component="TopRightCorner"    name="ColobotButton1/ButtonBgNormalTR" />
+                <Image component="LeftEdge"          name="ColobotButton1/ButtonBgNormalL" />
+                <Image component="Background"        name="ColobotButton1/ButtonBgNormalC" />
+                <Image component="RightEdge"         name="ColobotButton1/ButtonBgNormalR" />
+                <Image component="BottomLeftCorner"  name="ColobotButton1/ButtonBgNormalBL" />
+                <Image component="BottomEdge"        name="ColobotButton1/ButtonBgNormalB" />
+                <Image component="BottomRightCorner" name="ColobotButton1/ButtonBgNormalBR" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
             </FrameComponent>
         </ImagerySection>
 
         <ImagerySection name="background_hover">
-            <ImageryComponent>
+            <FrameComponent>
                 <Area>
-                    <Dim type="LeftEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="TopEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="RightEdge">
-                        <UnifiedDim scale="1" offset="0" type="RightEdge" />
-                    </Dim>
-                    <Dim type="BottomEdge">
-                        <UnifiedDim scale="1" offset="0" type="BottomEdge" />
-                    </Dim>
+                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
+                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBgHover" />
+                <Image component="TopLeftCorner"     name="ColobotButton1/ButtonBgHoverTL" />
+                <Image component="TopEdge"           name="ColobotButton1/ButtonBgHoverT" />
+                <Image component="TopRightCorner"    name="ColobotButton1/ButtonBgHoverTR" />
+                <Image component="LeftEdge"          name="ColobotButton1/ButtonBgHoverL" />
+                <Image component="Background"        name="ColobotButton1/ButtonBgHoverC" />
+                <Image component="RightEdge"         name="ColobotButton1/ButtonBgHoverR" />
+                <Image component="BottomLeftCorner"  name="ColobotButton1/ButtonBgHoverBL" />
+                <Image component="BottomEdge"        name="ColobotButton1/ButtonBgHoverB" />
+                <Image component="BottomRightCorner" name="ColobotButton1/ButtonBgHoverBR" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
-            </ImageryComponent>
+            </FrameComponent>
         </ImagerySection>
         
         <ImagerySection name="background_pushed">
-            <ImageryComponent>
+            <FrameComponent>
                 <Area>
-                    <Dim type="LeftEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="TopEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="RightEdge">
-                        <UnifiedDim scale="1" offset="0" type="RightEdge" />
-                    </Dim>
-                    <Dim type="BottomEdge">
-                        <UnifiedDim scale="1" offset="0" type="BottomEdge" />
-                    </Dim>
+                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
+                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBgPushed" />
+                <Image component="TopLeftCorner"     name="ColobotButton1/ButtonBgPushedTL" />
+                <Image component="TopEdge"           name="ColobotButton1/ButtonBgPushedT" />
+                <Image component="TopRightCorner"    name="ColobotButton1/ButtonBgPushedTR" />
+                <Image component="LeftEdge"          name="ColobotButton1/ButtonBgPushedL" />
+                <Image component="Background"        name="ColobotButton1/ButtonBgPushedC" />
+                <Image component="RightEdge"         name="ColobotButton1/ButtonBgPushedR" />
+                <Image component="BottomLeftCorner"  name="ColobotButton1/ButtonBgPushedBL" />
+                <Image component="BottomEdge"        name="ColobotButton1/ButtonBgPushedB" />
+                <Image component="BottomRightCorner" name="ColobotButton1/ButtonBgPushedBR" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
-            </ImageryComponent>
+            </FrameComponent>
         </ImagerySection>
         
         <ImagerySection name="background_disabled">
-            <ImageryComponent>
+            <FrameComponent>
                 <Area>
-                    <Dim type="LeftEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="TopEdge">
-                        <AbsoluteDim value="0" />
-                    </Dim>
-                    <Dim type="RightEdge">
-                        <UnifiedDim scale="1" offset="0" type="RightEdge" />
-                    </Dim>
-                    <Dim type="BottomEdge">
-                        <UnifiedDim scale="1" offset="0" type="BottomEdge" />
-                    </Dim>
+                    <Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
+                    <Dim type="RightEdge"><UnifiedDim scale="1" offset="0" type="RightEdge" /></Dim>
+                    <Dim type="BottomEdge"><UnifiedDim scale="1" offset="0" type="BottomEdge" /></Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBgDisabled" />
+                <Image component="TopLeftCorner"     name="ColobotButton1/ButtonBgDisabledTL" />
+                <Image component="TopEdge"           name="ColobotButton1/ButtonBgDisabledT" />
+                <Image component="TopRightCorner"    name="ColobotButton1/ButtonBgDisabledTR" />
+                <Image component="LeftEdge"          name="ColobotButton1/ButtonBgDisabledL" />
+                <Image component="Background"        name="ColobotButton1/ButtonBgDisabledC" />
+                <Image component="RightEdge"         name="ColobotButton1/ButtonBgDisabledR" />
+                <Image component="BottomLeftCorner"  name="ColobotButton1/ButtonBgDisabledBL" />
+                <Image component="BottomEdge"        name="ColobotButton1/ButtonBgDisabledB" />
+                <Image component="BottomRightCorner" name="ColobotButton1/ButtonBgDisabledBR" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
-            </ImageryComponent>
+            </FrameComponent>
         </ImagerySection>
         
         <ImagerySection name="label">
@@ -380,22 +284,31 @@
             <ImageryComponent>
                 <Area>
                     <Dim type="LeftEdge">
-                        <AbsoluteDim value="7" />
+                        <OperatorDim op="Add">
+                            <ImageDim name="ColobotButton1/ButtonBgNormalL" dimension="Width" />
+                            <AbsoluteDim value="3" />
+                        </OperatorDim>
                     </Dim>
                     <Dim type="TopEdge">
-                        <AbsoluteDim value="7" />
+                        <OperatorDim op="Add">
+                            <ImageDim name="ColobotButton1/ButtonBgNormalTL" dimension="Height" />
+                            <AbsoluteDim value="3" />
+                        </OperatorDim>
                     </Dim>
-                    <Dim type="RightEdge">
-                        <AbsoluteDim value="13" />
+                    <Dim type="Width">
+                        <ImageDim name="ColobotButton1/ButtonBgNormalL" dimension="Width" />
                     </Dim>
                     <Dim type="BottomEdge">
                         <OperatorDim op="Subtract">
                             <WidgetDim dimension="Height" />
-                            <AbsoluteDim value="7" />
+                            <OperatorDim op="Add">
+                                <ImageDim name="ColobotButton1/ButtonBgNormalBL" dimension="Height" />
+                                <AbsoluteDim value="3" />
+                            </OperatorDim>
                         </OperatorDim>
                     </Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBar1" />
+                <Image name="ColobotButton2/ButtonBar1" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
             </ImageryComponent>
@@ -405,19 +318,37 @@
             <ImageryComponent>
                 <Area>
                     <Dim type="LeftEdge">
-                        <UnifiedDim scale="0.9875" offset="0" type="LeftEdge" />
+                        <OperatorDim op="Subtract">
+                            <WidgetDim dimension="Width" />
+                            <OperatorDim op="Add">
+                                <OperatorDim op="Add">
+                                    <ImageDim name="ColobotButton1/ButtonBgNormalBR" dimension="Width" />
+                                    <ImageDim name="ColobotButton1/ButtonBgNormalR" dimension="Width" />
+                                </OperatorDim>
+                                <AbsoluteDim value="3" />
+                            </OperatorDim>
+                        </OperatorDim>
                     </Dim>
                     <Dim type="TopEdge">
-                        <UnifiedDim scale="0.010416667" offset="0" type="TopEdge" />
+                        <OperatorDim op="Add">
+                            <ImageDim name="ColobotButton1/ButtonBgNormalTR" dimension="Height" />
+                            <AbsoluteDim value="3" />
+                        </OperatorDim>
                     </Dim>
-                    <Dim type="RightEdge">
-                        <UnifiedDim scale="0.9921875" offset="0" type="RightEdge" />
+                    <Dim type="Width">
+                        <ImageDim name="ColobotButton1/ButtonBgNormalR" dimension="Width" />
                     </Dim>
                     <Dim type="BottomEdge">
-                        <UnifiedDim scale="0.979166667" offset="0" type="BottomEdge" />
+                        <OperatorDim op="Subtract">
+                            <WidgetDim dimension="Height" />
+                            <OperatorDim op="Add">
+                                <ImageDim name="ColobotButton1/ButtonBgNormalBR" dimension="Height" />
+                                <AbsoluteDim value="3" />
+                            </OperatorDim>
+                        </OperatorDim>
                     </Dim>
                 </Area>
-                <Image name="ColobotButton/ButtonBar2" />
+                <Image name="ColobotButton2/ButtonBar2" />
                 <VertFormat type="Stretched" />
                 <HorzFormat type="Stretched" />
             </ImageryComponent>
@@ -425,15 +356,7 @@
         
         <StateImagery name="Normal">
             <Layer>
-                <Section section="background_normal_center" />
-                <Section section="background_normal_top_left" />
-                <Section section="background_normal_top" />
-                <Section section="background_normal_top_right" />
-                <Section section="background_normal_left" />
-                <Section section="background_normal_right" />
-                <Section section="background_normal_bottom_left" />
-                <Section section="background_normal_bottom" />
-                <Section section="background_normal_bottom_right" />
+                <Section section="background_normal" />
                 <Section section="label" />
                 <Section section="bar1" />
                 <Section section="bar2" />
diff --git a/tools/generate-imageset-button-code.sh b/tools/generate-imageset-button-code.sh
new file mode 100755
index 00000000..d2e2d6e4
--- /dev/null
+++ b/tools/generate-imageset-button-code.sh
@@ -0,0 +1,12 @@
+name=$1
+x=$2
+y=$3
+echo "<Image name=\"${name}TL\" width=\"12\" height=\"12\" xPos=\"$x\" yPos=\"0\" />"
+echo "<Image name=\"${name}T\" width=\"104\" height=\"12\" xPos=\"$(($x+12))\" yPos=\"$y\" />"
+echo "<Image name=\"${name}TR\" width=\"12\" height=\"12\" xPos=\"$(($x+116))\" yPos=\"$y\" />"
+echo "<Image name=\"${name}L\" width=\"12\" height=\"12\" xPos=\"$x\" yPos=\"$(($y+12))\" />"
+echo "<Image name=\"${name}C\" width=\"104\" height=\"104\" xPos=\"$(($x+12))\" yPos=\"$(($y+12))\" />"
+echo "<Image name=\"${name}R\" width=\"12\" height=\"12\" xPos=\"$(($x+116))\" yPos=\"$(($y+12))\" />"
+echo "<Image name=\"${name}BL\" width=\"12\" height=\"12\" xPos=\"$x\" yPos=\"$(($y+116))\" />"
+echo "<Image name=\"${name}B\" width=\"104\" height=\"12\" xPos=\"$(($x+12))\" yPos=\"$(($y+116))\" />"
+echo "<Image name=\"${name}BR\" width=\"12\" height=\"12\" xPos=\"$(($x+116))\" yPos=\"$(($y+116))\" />"