From 542bd31d00613689c5518de04a1fc3a36d8f8716 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 19 Nov 2013 01:43:35 +0100
Subject: [PATCH] reftests: Fix border-image-repeat test

The new downscaling code in Cairo doesn't allow this test, so we remove
the CSS that made the border downscaled.

So the test does test less now, but it still tests the repeat modes of
border images.
---
 testsuite/reftests/border-image-repeat.css    |    7 +-
 testsuite/reftests/border-image-repeat.ref.ui | 1100 ++++++++---------
 testsuite/reftests/border-image-repeat.sh     |  100 +-
 testsuite/reftests/border-image-repeat.ui     |   68 +-
 4 files changed, 637 insertions(+), 638 deletions(-)

diff --git a/testsuite/reftests/border-image-repeat.css b/testsuite/reftests/border-image-repeat.css
index c43fa59047..61d331e3ba 100644
--- a/testsuite/reftests/border-image-repeat.css
+++ b/testsuite/reftests/border-image-repeat.css
@@ -8,7 +8,7 @@ GtkButton {
   border-image-source: url("border-image-balls.png");
   border-image-slice: 20;
   border-image-repeat: stretch;
-  border-width: 5px;
+  border-width: 20px;
   border-style: solid;
 }
 
@@ -31,20 +31,25 @@ GtkButton {
 
 #red {
   background-image: url("border-image-ball-red.png");
+  background-color: black;
 }
 
 #yellow {
   background-image: url("border-image-ball-yellow.png");
+  background-color: black;
 }
 
 #yellow-3 {
   background-image: url("border-image-3-balls-yellow.png");
+  background-color: black;
 }
 
 #green {
   background-image: url("border-image-ball-green.png");
+  background-color: black;
 }
 
 #green-3 {
   background-image: url("border-image-3-balls-green.png");
+  background-color: black;
 }
diff --git a/testsuite/reftests/border-image-repeat.ref.ui b/testsuite/reftests/border-image-repeat.ref.ui
index ffdefc5a2e..48765ab6e9 100644
--- a/testsuite/reftests/border-image-repeat.ref.ui
+++ b/testsuite/reftests/border-image-repeat.ref.ui
@@ -11,64 +11,64 @@
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-stretch-hstretch0">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">5</property>
+            <property name="x">20</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-stretch-vstretch0">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">5</property>
+            <property name="y">20</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-stretch-hstretch1">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">5</property>
-            <property name="y">18</property>
+            <property name="x">20</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-stretch-vstretch1">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">5</property>
+            <property name="x">72</property>
+            <property name="y">20</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-stretch-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
@@ -81,1947 +81,1947 @@
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-stretch-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
+            <property name="x">72</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-stretch-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">18</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-stretch-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">18</property>
+            <property name="x">72</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-stretch-hrepeat0">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">29</property>
+            <property name="x">116</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-stretch-vstretch0">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">5</property>
+            <property name="x">100</property>
+            <property name="y">20</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-stretch-hrepeat1">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">29</property>
-            <property name="y">18</property>
+            <property name="x">116</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-stretch-vstretch1">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">5</property>
+            <property name="x">172</property>
+            <property name="y">20</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-stretch-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
+            <property name="x">100</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-stretch-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
+            <property name="x">172</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-stretch-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">18</property>
+            <property name="x">100</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-stretch-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">18</property>
+            <property name="x">172</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-stretch-hround0">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">55</property>
+            <property name="x">220</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-stretch-vstretch0">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">5</property>
+            <property name="x">200</property>
+            <property name="y">20</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-stretch-hround1">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">55</property>
-            <property name="y">18</property>
+            <property name="x">220</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-stretch-vstretch1">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">5</property>
+            <property name="x">272</property>
+            <property name="y">20</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-stretch-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
+            <property name="x">200</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-stretch-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
+            <property name="x">272</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-stretch-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">18</property>
+            <property name="x">200</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-stretch-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">18</property>
+            <property name="x">272</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-stretch-hspace00">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">81</property>
+            <property name="x">324</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-stretch-hspace10">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">87</property>
+            <property name="x">348</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-stretch-vstretch0">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">5</property>
+            <property name="x">300</property>
+            <property name="y">20</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-stretch-hspace01">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">81</property>
-            <property name="y">18</property>
+            <property name="x">324</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-stretch-hspace11">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">87</property>
-            <property name="y">18</property>
+            <property name="x">348</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-stretch-vstretch1">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">5</property>
+            <property name="x">372</property>
+            <property name="y">20</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-stretch-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
+            <property name="x">300</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-stretch-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
+            <property name="x">372</property>
             <property name="y">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-stretch-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">18</property>
+            <property name="x">300</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-stretch-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">18</property>
+            <property name="x">372</property>
+            <property name="y">72</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-repeat-hstretch0">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">5</property>
-            <property name="y">25</property>
+            <property name="x">20</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-repeat-vrepeat0">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">29</property>
+            <property name="y">116</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-repeat-hstretch1">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">5</property>
-            <property name="y">43</property>
+            <property name="x">20</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-repeat-vrepeat1">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">29</property>
+            <property name="x">72</property>
+            <property name="y">116</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-repeat-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">25</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-repeat-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">25</property>
+            <property name="x">72</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-repeat-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">43</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-repeat-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">43</property>
+            <property name="x">72</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-repeat-hrepeat0">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">29</property>
-            <property name="y">25</property>
+            <property name="x">116</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-repeat-vrepeat0">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">29</property>
+            <property name="x">100</property>
+            <property name="y">116</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-repeat-hrepeat1">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">29</property>
-            <property name="y">43</property>
+            <property name="x">116</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-repeat-vrepeat1">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">29</property>
+            <property name="x">172</property>
+            <property name="y">116</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-repeat-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">25</property>
+            <property name="x">100</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-repeat-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">25</property>
+            <property name="x">172</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-repeat-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">43</property>
+            <property name="x">100</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-repeat-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">43</property>
+            <property name="x">172</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-repeat-hround0">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">55</property>
-            <property name="y">25</property>
+            <property name="x">220</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-repeat-vrepeat0">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">29</property>
+            <property name="x">200</property>
+            <property name="y">116</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-repeat-hround1">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">55</property>
-            <property name="y">43</property>
+            <property name="x">220</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-repeat-vrepeat1">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">29</property>
+            <property name="x">272</property>
+            <property name="y">116</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-repeat-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">25</property>
+            <property name="x">200</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-repeat-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">25</property>
+            <property name="x">272</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-repeat-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">43</property>
+            <property name="x">200</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-repeat-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">43</property>
+            <property name="x">272</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-repeat-hspace00">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">81</property>
-            <property name="y">25</property>
+            <property name="x">324</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-repeat-hspace10">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">87</property>
-            <property name="y">25</property>
+            <property name="x">348</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-repeat-vrepeat0">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">29</property>
+            <property name="x">300</property>
+            <property name="y">116</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-repeat-hspace01">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">81</property>
-            <property name="y">43</property>
+            <property name="x">324</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-repeat-hspace11">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">87</property>
-            <property name="y">43</property>
+            <property name="x">348</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-repeat-vrepeat1">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">29</property>
+            <property name="x">372</property>
+            <property name="y">116</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-repeat-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">25</property>
+            <property name="x">300</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-repeat-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">25</property>
+            <property name="x">372</property>
+            <property name="y">100</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-repeat-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">43</property>
+            <property name="x">300</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-repeat-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">43</property>
+            <property name="x">372</property>
+            <property name="y">172</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-round-hstretch0">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">5</property>
-            <property name="y">50</property>
+            <property name="x">20</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-round-vround0">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">55</property>
+            <property name="y">220</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-round-hstretch1">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">5</property>
-            <property name="y">68</property>
+            <property name="x">20</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-round-vround1">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">55</property>
+            <property name="x">72</property>
+            <property name="y">220</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-round-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">50</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-round-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">50</property>
+            <property name="x">72</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-round-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">68</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-round-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">68</property>
+            <property name="x">72</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-round-hrepeat0">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">29</property>
-            <property name="y">50</property>
+            <property name="x">116</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-round-vround0">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">55</property>
+            <property name="x">100</property>
+            <property name="y">220</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-round-hrepeat1">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">29</property>
-            <property name="y">68</property>
+            <property name="x">116</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-round-vround1">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">55</property>
+            <property name="x">172</property>
+            <property name="y">220</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-round-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">50</property>
+            <property name="x">100</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-round-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">50</property>
+            <property name="x">172</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-round-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">68</property>
+            <property name="x">100</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-round-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">68</property>
+            <property name="x">172</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-round-hround0">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">55</property>
-            <property name="y">50</property>
+            <property name="x">220</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-round-vround0">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">55</property>
+            <property name="x">200</property>
+            <property name="y">220</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-round-hround1">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">55</property>
-            <property name="y">68</property>
+            <property name="x">220</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-round-vround1">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">55</property>
+            <property name="x">272</property>
+            <property name="y">220</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-round-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">50</property>
+            <property name="x">200</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-round-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">50</property>
+            <property name="x">272</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-round-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">68</property>
+            <property name="x">200</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-round-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">68</property>
+            <property name="x">272</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-round-hspace00">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">81</property>
-            <property name="y">50</property>
+            <property name="x">324</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-round-hspace10">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">87</property>
-            <property name="y">50</property>
+            <property name="x">348</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-round-vround0">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">55</property>
+            <property name="x">300</property>
+            <property name="y">220</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-round-hspace01">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">81</property>
-            <property name="y">68</property>
+            <property name="x">324</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-round-hspace11">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">87</property>
-            <property name="y">68</property>
+            <property name="x">348</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-round-vround1">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">55</property>
+            <property name="x">372</property>
+            <property name="y">220</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-round-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">50</property>
+            <property name="x">300</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-round-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">50</property>
+            <property name="x">372</property>
+            <property name="y">200</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-round-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">68</property>
+            <property name="x">300</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-round-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">68</property>
+            <property name="x">372</property>
+            <property name="y">272</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-space-hstretch0">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">5</property>
-            <property name="y">75</property>
+            <property name="x">20</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-space-vspace00">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">81</property>
+            <property name="y">324</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-space-vspace10">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">87</property>
+            <property name="y">348</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-space-hstretch1">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">5</property>
-            <property name="y">93</property>
+            <property name="x">20</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-space-vspace01">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">81</property>
+            <property name="x">72</property>
+            <property name="y">324</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-stretch-space-vspace11">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">87</property>
+            <property name="x">72</property>
+            <property name="y">348</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-space-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">75</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-space-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">75</property>
+            <property name="x">72</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-space-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
             <property name="x">0</property>
-            <property name="y">93</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-stretch-space-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">18</property>
-            <property name="y">93</property>
+            <property name="x">72</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-space-hrepeat0">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">29</property>
-            <property name="y">75</property>
+            <property name="x">116</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-space-vspace00">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">81</property>
+            <property name="x">100</property>
+            <property name="y">324</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-space-vspace10">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">87</property>
+            <property name="x">100</property>
+            <property name="y">348</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-space-hrepeat1">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">29</property>
-            <property name="y">93</property>
+            <property name="x">116</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-space-vspace01">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">81</property>
+            <property name="x">172</property>
+            <property name="y">324</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-repeat-space-vspace11">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">87</property>
+            <property name="x">172</property>
+            <property name="y">348</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-space-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">75</property>
+            <property name="x">100</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-space-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">75</property>
+            <property name="x">172</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-space-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">25</property>
-            <property name="y">93</property>
+            <property name="x">100</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-repeat-space-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">43</property>
-            <property name="y">93</property>
+            <property name="x">172</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-space-hround0">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">55</property>
-            <property name="y">75</property>
+            <property name="x">220</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-space-vspace00">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">81</property>
+            <property name="x">200</property>
+            <property name="y">324</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-space-vspace10">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">87</property>
+            <property name="x">200</property>
+            <property name="y">348</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-space-hround1">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">55</property>
-            <property name="y">93</property>
+            <property name="x">220</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-space-vspace01">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">81</property>
+            <property name="x">272</property>
+            <property name="y">324</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-round-space-vspace11">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">87</property>
+            <property name="x">272</property>
+            <property name="y">348</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-space-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">75</property>
+            <property name="x">200</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-space-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">75</property>
+            <property name="x">272</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-space-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">50</property>
-            <property name="y">93</property>
+            <property name="x">200</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-round-space-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">68</property>
-            <property name="y">93</property>
+            <property name="x">272</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-space-hspace00">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">81</property>
-            <property name="y">75</property>
+            <property name="x">324</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-space-hspace10">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">87</property>
-            <property name="y">75</property>
+            <property name="x">348</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-space-vspace00">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">81</property>
+            <property name="x">300</property>
+            <property name="y">324</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-space-vspace10">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">87</property>
+            <property name="x">300</property>
+            <property name="y">348</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-space-hspace01">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">81</property>
-            <property name="y">93</property>
+            <property name="x">324</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-space-hspace11">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">87</property>
-            <property name="y">93</property>
+            <property name="x">348</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-space-vspace01">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">81</property>
+            <property name="x">372</property>
+            <property name="y">324</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-space-space-vspace11">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">87</property>
+            <property name="x">372</property>
+            <property name="y">348</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-space-00">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">75</property>
+            <property name="x">300</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-space-10">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">75</property>
+            <property name="x">372</property>
+            <property name="y">300</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-space-01">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">75</property>
-            <property name="y">93</property>
+            <property name="x">300</property>
+            <property name="y">372</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-corner-space-space-11">
             <property name="name">red</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">93</property>
-            <property name="y">93</property>
+            <property name="x">372</property>
+            <property name="y">372</property>
           </packing>
         </child>
       </object>
diff --git a/testsuite/reftests/border-image-repeat.sh b/testsuite/reftests/border-image-repeat.sh
index a8d0a0f78f..4be3907bce 100755
--- a/testsuite/reftests/border-image-repeat.sh
+++ b/testsuite/reftests/border-image-repeat.sh
@@ -26,15 +26,15 @@ cat << EOF
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-hstretch$side">
             <property name="name">yellow</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + 5`</property>
-            <property name="y">`expr $y \* 25 + $side \* 18`</property>
+            <property name="x">`expr $x \* 100 + 20`</property>
+            <property name="y">`expr $y \* 100 + $side \* 72`</property>
           </packing>
         </child>
 EOF
@@ -44,15 +44,15 @@ cat << EOF
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-hrepeat$side">
             <property name="name">yellow-3</property>
-            <property name="width_request">15</property>
-            <property name="height_request">5</property>
+            <property name="width_request">60</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + 4`</property>
-            <property name="y">`expr $y \* 25 + $side \* 18`</property>
+            <property name="x">`expr $x \* 100 + 16`</property>
+            <property name="y">`expr $y \* 100 + $side \* 72`</property>
           </packing>
         </child>
 EOF
@@ -62,15 +62,15 @@ cat << EOF
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-hround$side">
             <property name="name">yellow-3</property>
-            <property name="width_request">13</property>
-            <property name="height_request">5</property>
+            <property name="width_request">52</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + 5`</property>
-            <property name="y">`expr $y \* 25 + $side \* 18`</property>
+            <property name="x">`expr $x \* 100 + 20`</property>
+            <property name="y">`expr $y \* 100 + $side \* 72`</property>
           </packing>
         </child>
 EOF
@@ -80,29 +80,29 @@ cat << EOF
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-hspace0$side">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + 6`</property>
-            <property name="y">`expr $y \* 25 + $side \* 18`</property>
+            <property name="x">`expr $x \* 100 + 24`</property>
+            <property name="y">`expr $y \* 100 + $side \* 72`</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-hspace1$side">
             <property name="name">yellow</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + 12`</property>
-            <property name="y">`expr $y \* 25 + $side \* 18`</property>
+            <property name="x">`expr $x \* 100 + 48`</property>
+            <property name="y">`expr $y \* 100 + $side \* 72`</property>
           </packing>
         </child>
 EOF
@@ -114,15 +114,15 @@ cat << EOF
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-vstretch$side">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + $side \* 18`</property>
-            <property name="y">`expr $y \* 25 + 5`</property>
+            <property name="x">`expr $x \* 100 + $side \* 72`</property>
+            <property name="y">`expr $y \* 100 + 20`</property>
           </packing>
         </child>
 EOF
@@ -132,15 +132,15 @@ cat << EOF
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-vrepeat$side">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">15</property>
+            <property name="width_request">20</property>
+            <property name="height_request">60</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + $side \* 18`</property>
-            <property name="y">`expr $y \* 25 + 4`</property>
+            <property name="x">`expr $x \* 100 + $side \* 72`</property>
+            <property name="y">`expr $y \* 100 + 16`</property>
           </packing>
         </child>
 EOF
@@ -150,15 +150,15 @@ cat << EOF
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-vround$side">
             <property name="name">green-3</property>
-            <property name="width_request">5</property>
-            <property name="height_request">13</property>
+            <property name="width_request">20</property>
+            <property name="height_request">52</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + $side \* 18`</property>
-            <property name="y">`expr $y \* 25 + 5`</property>
+            <property name="x">`expr $x \* 100 + $side \* 72`</property>
+            <property name="y">`expr $y \* 100 + 20`</property>
           </packing>
         </child>
 EOF
@@ -168,29 +168,29 @@ cat << EOF
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-vspace0$side">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + $side \* 18`</property>
-            <property name="y">`expr $y \* 25 + 6`</property>
+            <property name="x">`expr $x \* 100 + $side \* 72`</property>
+            <property name="y">`expr $y \* 100 + 24`</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar-$hrepeat-$vrepeat-vspace1$side">
             <property name="name">green</property>
-            <property name="width_request">5</property>
-            <property name="height_request">5</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + $side \* 18`</property>
-            <property name="y">`expr $y \* 25 + 12`</property>
+            <property name="x">`expr $x \* 100 + $side \* 72`</property>
+            <property name="y">`expr $y \* 100 + 48`</property>
           </packing>
         </child>
 EOF
@@ -201,23 +201,17 @@ EOF
       for xcorner in 0 1; do
 cat << EOF
         <child>
-          <object class="GtkEventBox" id="eventbox-corner-$hrepeat-$vrepeat-$xcorner$ycorner">
+          <object class="GtkToolbar" id="toolbar-corner-$hrepeat-$vrepeat-$xcorner$ycorner">
+            <property name="name">red</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <child>
-              <object class="GtkToolbar" id="toolbar-corner-$hrepeat-$vrepeat-$xcorner$ycorner">
-                <property name="name">red</property>
-                <property name="width_request">5</property>
-                <property name="height_request">5</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="show_arrow">False</property>
-              </object>
-            </child>
+            <property name="show_arrow">False</property>
           </object>
           <packing>
-            <property name="x">`expr $x \* 25 + $xcorner \* 18`</property>
-            <property name="y">`expr $y \* 25 + $ycorner \* 18`</property>
+            <property name="x">`expr $x \* 100 + $xcorner \* 72`</property>
+            <property name="y">`expr $y \* 100 + $ycorner \* 72`</property>
           </packing>
         </child>
 EOF
diff --git a/testsuite/reftests/border-image-repeat.ui b/testsuite/reftests/border-image-repeat.ui
index 5ca78e2ec3..97d4dac893 100644
--- a/testsuite/reftests/border-image-repeat.ui
+++ b/testsuite/reftests/border-image-repeat.ui
@@ -8,12 +8,12 @@
       <object class="GtkGrid" id="grid2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="row_spacing">2</property>
-        <property name="column_spacing">2</property>
+        <property name="row_spacing">8</property>
+        <property name="column_spacing">8</property>
         <child>
           <object class="GtkButton" id="eventbox1">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -29,8 +29,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox2">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -46,8 +46,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox3">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -63,8 +63,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox4">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -80,8 +80,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox5">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -97,8 +97,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox6">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -114,8 +114,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox7">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -131,8 +131,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox8">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -148,8 +148,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox9">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -165,8 +165,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox10">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -182,8 +182,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox11">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -199,8 +199,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox12">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -216,8 +216,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox13">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -233,8 +233,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox14">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -250,8 +250,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox15">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>
@@ -267,8 +267,8 @@
         </child>
         <child>
           <object class="GtkButton" id="eventbox16">
-            <property name="width_request">23</property>
-            <property name="height_request">23</property>
+            <property name="width_request">92</property>
+            <property name="height_request">92</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <style>