From: Carlos Lopez <genetita@gmail.com>
Date: Fri, 17 Sep 2010 16:19:36 +0000 (+0200)
Subject: Merge branch 'nikitakit_master'
X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=commitdiff_plain;h=b603ea1c4a4bf9749ed922c5f79af37c91132edf;hp=6f2a0d4211feb1e075688ccd754bf35078c8cc3d

Merge branch 'nikitakit_master'
---

diff --git a/synfig-core/src/synfig/canvas.cpp b/synfig-core/src/synfig/canvas.cpp
index eeecdb0..417a1b5 100644
--- a/synfig-core/src/synfig/canvas.cpp
+++ b/synfig-core/src/synfig/canvas.cpp
@@ -774,7 +774,7 @@ Canvas::clone(const GUID& deriv_guid)const
 {
 	synfig::String name;
 	if(is_inline())
-		name="inline";
+		name=_("in line");
 	else
 	{
 		name=get_id()+"_CLONE";
@@ -839,7 +839,7 @@ Canvas::set_inline(LooseHandle parent)
 
 	}
 
-	id_="inline";
+	id_=_("in line");
 	is_inline_=true;
 	parent_=parent;
 
@@ -862,7 +862,7 @@ Canvas::create_inline(Handle parent)
 	//if(parent->is_inline())
 	//	return create_inline(parent->parent());
 
-	Handle canvas(new Canvas("inline"));
+	Handle canvas(new Canvas(_("in line")));
 	canvas->set_inline(parent);
 	return canvas;
 }
diff --git a/synfig-studio/images/circle_icon.sif b/synfig-studio/images/circle_icon.sif
index fcfb2d5..314193b 100644
--- a/synfig-studio/images/circle_icon.sif
+++ b/synfig-studio/images/circle_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.1" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Circle Icon</name>
-  <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek)</desc>
+  <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="radial_gradient" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,89 +18,95 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.021505">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="0.564516">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>0.731343</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.1808688790</x>
-        <y>-0.3216028810</y>
-      </vector>
-    </param>
-    <param name="radius">
-      <real value="1.7765365254"/>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
+    <param name="origin">
       <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.700000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.1364002228</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
     </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.7515196800</x>
-        <y>-1.2269309759</y>
-      </vector>
+    <param name="zoom">
+      <real value="0.0000000000"/>
     </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.7515196800</x>
-        <y>-1.2269309759</y>
-      </vector>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="dest_br">
-      <vector>
-        <x>2.7515196800</x>
-        <y>-2.7224798203</y>
-      </vector>
+    <param name="children_lock">
+      <bool value="false"/>
     </param>
-    <param name="dest_bl">
+    <param name="focus">
       <vector>
-        <x>-2.7515196800</x>
-        <y>-2.7079598904</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="false"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
-    </param>
   </layer>
-  <layer type="circle" active="true" version="0.1" desc="Black Circle">
+  <layer type="outline" active="true" version="0.2" desc="Circle">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -118,172 +124,129 @@
         <a>1.000000</a>
       </color>
     </param>
-    <param name="radius">
-      <real value="2.3365411882"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="pos">
-      <vector>
+    <param name="origin">
+      <vector guid="13327BA2A020564D45104E23F2EC3A34">
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="invert">
       <bool value="false"/>
     </param>
-    <param name="falloff">
-      <integer value="1"/>
+    <param name="antialias">
+      <bool value="true"/>
     </param>
-  </layer>
-  <layer type="circle" active="true" version="0.1" desc="White Circle">
-    <param name="z_depth">
+    <param name="feather">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
+    <param name="blurtype">
+      <integer value="1"/>
     </param>
-    <param name="blend_method">
+    <param name="winding_style">
       <integer value="0"/>
     </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="radius">
-      <real value="2.0769255006"/>
-    </param>
-    <param name="feather">
+    <param name="bline">
+      <bline type="bline_point" loop="true">
+        <entry>
+          <composite type="bline_point">
+            <point>
+              <vector>
+                <x>2.6559059620</x>
+                <y>0.0000000000</y>
+              </vector>
+            </point>
+            <width>
+              <real value="1.0000000000"/>
+            </width>
+            <origin>
+              <real value="0.5000000000"/>
+            </origin>
+            <split>
+              <bool value="false"/>
+            </split>
+            <t1>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="10.6236235287"/>
+                </radius>
+                <theta>
+                  <angle value="90.000000"/>
+                </theta>
+              </radial_composite>
+            </t1>
+            <t2>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="10.6236235287"/>
+                </radius>
+                <theta>
+                  <angle value="90.000000"/>
+                </theta>
+              </radial_composite>
+            </t2>
+          </composite>
+        </entry>
+        <entry>
+          <composite type="bline_point">
+            <point>
+              <vector>
+                <x>-2.6559059620</x>
+                <y>-0.0000002322</y>
+              </vector>
+            </point>
+            <width>
+              <real value="1.0000000000"/>
+            </width>
+            <origin>
+              <real value="0.5000000000"/>
+            </origin>
+            <split>
+              <bool value="false"/>
+            </split>
+            <t1>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="10.6236235287"/>
+                </radius>
+                <theta>
+                  <angle value="-89.999992"/>
+                </theta>
+              </radial_composite>
+            </t1>
+            <t2>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="10.6236235287"/>
+                </radius>
+                <theta>
+                  <angle value="-89.999992"/>
+                </theta>
+              </radial_composite>
+            </t2>
+          </composite>
+        </entry>
+      </bline>
+    </param>
+    <param name="width">
+      <real value="0.3042371339"/>
+    </param>
+    <param name="expand">
       <real value="0.0000000000"/>
     </param>
-    <param name="pos">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
+    <param name="sharp_cusps">
+      <bool value="true"/>
     </param>
-    <param name="invert">
-      <bool value="false"/>
+    <param name="round_tip[0]">
+      <bool value="true"/>
     </param>
-    <param name="falloff">
-      <integer value="1"/>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Circle gradient">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
+    <param name="round_tip[1]">
+      <bool value="true"/>
     </param>
-    <param name="amount">
+    <param name="loopyness">
       <real value="1.0000000000"/>
     </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-    <param name="canvas">
-      <canvas>
-        <layer type="circle" active="true" version="0.1">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>1.000000</r>
-              <g>1.000000</g>
-              <b>1.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="radius">
-            <real value="1.8173098130"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="pos">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="falloff">
-            <integer value="1"/>
-          </param>
-        </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="13"/>
-          </param>
-          <param name="p1">
-            <vector>
-              <x>1.6642030478</x>
-              <y>-1.9762411118</y>
-            </vector>
-          </param>
-          <param name="p2">
-            <vector>
-              <x>-0.6339452267</x>
-              <y>0.8150724769</y>
-            </vector>
-          </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
-          </param>
-          <param name="loop">
-            <bool value="false"/>
-          </param>
-          <param name="zigzag">
-            <bool value="false"/>
-          </param>
-        </layer>
-      </canvas>
-    </param>
-    <param name="zoom">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="time_offset">
-      <time value="0s"/>
-    </param>
-    <param name="children_lock">
-      <bool value="false"/>
+    <param name="homogeneous_width">
+      <bool value="true"/>
     </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/gradient_icon.sif b/synfig-studio/images/gradient_icon.sif
index 09c8956..f3bb405 100644
--- a/synfig-studio/images/gradient_icon.sif
+++ b/synfig-studio/images/gradient_icon.sif
@@ -4,18 +4,11 @@
   <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <defs>
-    <vector id="duck1_orig">
-      <x>-1.7043024302</x>
-      <y>1.6898298264</y>
-    </vector>
-    <real value="0.4218754923" id="duck_outline"/>
-  </defs>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -25,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.1153881550</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.5576940775</x>
-        <y>-3.1153881550</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7088961601</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.1896641254</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.3365411758</x>
-        <y>2.3365411758</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.0769255161</x>
-        <y>-2.0769255161</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.0769255161</x>
-        <y>2.0769255161</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="linear gradient">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -191,11 +146,11 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
-      <canvas width="200" height="200">
+      <canvas>
         <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
           <param name="z_depth">
             <real value="0.0000000000"/>
@@ -216,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.8173098564</x>
-              <y>-1.8173098564</y>
+              <x>-2.5961599350</x>
+              <y>2.4484515190</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.8173098564</x>
-              <y>1.8173098564</y>
+              <x>2.5961599350</x>
+              <y>-2.7376513481</y>
             </vector>
           </param>
           <param name="expand">
@@ -233,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -241,80 +196,117 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="p1">
+          <param name="origin">
             <vector>
-              <x>-1.6974871159</x>
-              <y>1.7141292095</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="p2">
-            <vector>
-              <x>1.7973393202</x>
-              <y>-1.7640552521</y>
-            </vector>
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1126711369</x>
+                    <y>-2.2395110130</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1019213200</x>
+                    <y>1.9798951149</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="p1">
+                  <vector>
+                    <x>-2.5414354801</x>
+                    <y>0.0909172446</y>
+                  </vector>
+                </param>
+                <param name="p2">
+                  <vector>
+                    <x>2.5787625313</x>
+                    <y>0.0909172446</y>
+                  </vector>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.047366</r>
+                      <g>0.047366</g>
+                      <b>0.047366</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.793110</r>
+                      <g>0.793110</g>
+                      <b>0.793110</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.055556">
-                <r>0.000000</r>
-                <g>0.000000</g>
-                <b>0.000000</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>0.893289</r>
-                <g>0.893289</g>
-                <b>0.893289</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="zoom">
+            <real value="0.0000000000"/>
           </param>
-          <param name="loop">
-            <bool value="false"/>
+          <param name="time_offset">
+            <time value="0s"/>
           </param>
-          <param name="zigzag">
+          <param name="children_lock">
             <bool value="false"/>
           </param>
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
         </layer>
-      </canvas>
-    </param>
-    <param name="zoom">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="time_offset">
-      <time value="0s"/>
-    </param>
-    <param name="children_lock">
-      <bool value="false"/>
-    </param>
-    <param name="focus">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="docks">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-    <param name="canvas">
-      <canvas width="200" height="200">
-        <layer type="outline" active="true" version="0.2" desc="line">
+        <layer type="outline" active="true" version="0.2" desc="Outline">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -335,7 +327,7 @@
           <param name="origin">
             <vector>
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>-0.1014123783</y>
             </vector>
           </param>
           <param name="invert">
@@ -354,13 +346,13 @@
             <integer value="0"/>
           </param>
           <param name="bline">
-            <bline type="bline_point" loop="false">
+            <bline type="bline_point" loop="true">
               <entry>
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-1.6475610733</x>
-                      <y>1.6142770052</y>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
                     </vector>
                   </point>
                   <width>
@@ -370,22 +362,22 @@
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="2.7395687250"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="-90.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="2.3365438879"/>
                       </radius>
                       <theta>
                         <angle value="0.000000"/>
@@ -398,8 +390,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>1.6309189796</x>
-                      <y>-1.6309189796</y>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
                     </vector>
                   </point>
                   <width>
@@ -409,12 +401,12 @@
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
                         <angle value="0.000000"/>
@@ -424,86 +416,21 @@
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="-270.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
                 </composite>
               </entry>
-            </bline>
-          </param>
-          <param name="width">
-            <real value="0.3245196095"/>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="sharp_cusps">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[0]">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[1]">
-            <bool value="true"/>
-          </param>
-          <param name="loopyness">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="homogeneous_width">
-            <bool value="true"/>
-          </param>
-        </layer>
-        <layer type="outline" active="true" version="0.2" desc="line">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.000000</r>
-              <g>0.973842</g>
-              <b>1.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="origin">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="antialias">
-            <bool value="true"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="blurtype">
-            <integer value="1"/>
-          </param>
-          <param name="winding_style">
-            <integer value="0"/>
-          </param>
-          <param name="bline">
-            <bline type="bline_point" loop="false">
               <entry>
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-1.6475610733</x>
-                      <y>1.6142770052</y>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
                     </vector>
                   </point>
                   <width>
@@ -513,25 +440,25 @@
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="90.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="180.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -541,8 +468,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>1.6309189796</x>
-                      <y>-1.6309189796</y>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
                     </vector>
                   </point>
                   <width>
@@ -552,25 +479,25 @@
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="0.7788479626"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="-180.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="0.7788479626"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="-90.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -579,7 +506,7 @@
             </bline>
           </param>
           <param name="width">
-            <real value="0.0649039219"/>
+            <real value="0.3042371402"/>
           </param>
           <param name="expand">
             <real value="0.0000000000"/>
@@ -600,212 +527,6 @@
             <bool value="true"/>
           </param>
         </layer>
-        <layer type="PasteCanvas" active="true" version="0.1" desc="duck">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="origin">
-            <vector>
-              <x>3.5780365467</x>
-              <y>-3.5613946915</y>
-            </vector>
-          </param>
-          <param name="canvas">
-            <canvas>
-              <layer type="circle" active="true" version="0.1" desc="Circle088">
-                <param name="z_depth">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="amount">
-                  <real value="1.0000000000"/>
-                </param>
-                <param name="blend_method">
-                  <integer value="0"/>
-                </param>
-                <param name="color">
-                  <color>
-                    <r>0.000000</r>
-                    <g>0.000000</g>
-                    <b>0.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                </param>
-                <param name="radius" use=":duck_outline"/>
-                <param name="feather">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="origin">
-                  <vector guid="BA3EFA40AB34DC6247EAEA2E6E580A0B">
-                    <x>-2.0532853603</x>
-                    <y>2.0602900982</y>
-                  </vector>
-                </param>
-                <param name="invert">
-                  <bool value="false"/>
-                </param>
-                <param name="falloff">
-                  <integer value="1"/>
-                </param>
-              </layer>
-              <layer type="circle" active="true" version="0.1" desc="Circle088">
-                <param name="z_depth">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="amount">
-                  <real value="1.0000000000"/>
-                </param>
-                <param name="blend_method">
-                  <integer value="0"/>
-                </param>
-                <param name="color">
-                  <color>
-                    <r>0.000000</r>
-                    <g>1.000000</g>
-                    <b>0.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                </param>
-                <param name="radius">
-                  <real value="0.2920676485" guid="A94C18C44B68946FF710331B031C83A9"/>
-                </param>
-                <param name="feather">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="origin">
-                  <vector guid="BA3EFA40AB34DC6247EAEA2E6E580A0B">
-                    <x>-2.0532853603</x>
-                    <y>2.0602900982</y>
-                  </vector>
-                </param>
-                <param name="invert">
-                  <bool value="false"/>
-                </param>
-                <param name="falloff">
-                  <integer value="1"/>
-                </param>
-              </layer>
-            </canvas>
-          </param>
-          <param name="zoom">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="time_offset">
-            <time value="0s"/>
-          </param>
-          <param name="children_lock">
-            <bool value="false"/>
-          </param>
-          <param name="focus">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-        </layer>
-        <layer type="PasteCanvas" active="true" version="0.1" desc="duck">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="origin">
-            <vector>
-              <x>0.1595997959</x>
-              <y>-0.1728997827</y>
-            </vector>
-          </param>
-          <param name="canvas">
-            <canvas>
-              <layer type="circle" active="true" version="0.1" desc="Circle088">
-                <param name="z_depth">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="amount">
-                  <real value="1.0000000000"/>
-                </param>
-                <param name="blend_method">
-                  <integer value="0"/>
-                </param>
-                <param name="color">
-                  <color>
-                    <r>0.000000</r>
-                    <g>0.000000</g>
-                    <b>0.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                </param>
-                <param name="radius" use=":duck_outline"/>
-                <param name="feather">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="origin" use=":duck1_orig"/>
-                <param name="invert">
-                  <bool value="false"/>
-                </param>
-                <param name="falloff">
-                  <integer value="1"/>
-                </param>
-              </layer>
-              <layer type="circle" active="true" version="0.1" desc="Circle088">
-                <param name="z_depth">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="amount">
-                  <real value="1.0000000000"/>
-                </param>
-                <param name="blend_method">
-                  <integer value="0"/>
-                </param>
-                <param name="color">
-                  <color>
-                    <r>0.000000</r>
-                    <g>1.000000</g>
-                    <b>0.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                </param>
-                <param name="radius">
-                  <real value="0.2920676485" guid="A94C18C44B68946FF710331B031C83A9"/>
-                </param>
-                <param name="feather">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="origin" use=":duck1_orig"/>
-                <param name="invert">
-                  <bool value="false"/>
-                </param>
-                <param name="falloff">
-                  <integer value="1"/>
-                </param>
-              </layer>
-            </canvas>
-          </param>
-          <param name="zoom">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="time_offset">
-            <time value="0s"/>
-          </param>
-          <param name="children_lock">
-            <bool value="false"/>
-          </param>
-          <param name="focus">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-        </layer>
       </canvas>
     </param>
     <param name="zoom">
diff --git a/synfig-studio/images/layer_distortion_curvewarp_icon.sif b/synfig-studio/images/layer_distortion_curvewarp_icon.sif
index 22a0391..1efe6e7 100644
--- a/synfig-studio/images/layer_distortion_curvewarp_icon.sif
+++ b/synfig-studio/images/layer_distortion_curvewarp_icon.sif
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<canvas version="0.7" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Curve Wrap Icon</name>
-  <desc>Placed in the Public Domain in 2010 by Bertrand Gr&#xE9;goire (berteh)</desc>
+  <desc>Placed in the Public Domain in 2010 by Bertrand Gr&#xE9;goire (berteh), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
   <meta name="grid_snap" content="0"/>
@@ -19,7 +19,7 @@
       </step>
     </duplicate>
   </defs>
-  <layer type="PasteCanvas" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -31,13 +31,111 @@
     </param>
     <param name="origin">
       <vector>
-        <x>1.9941018820</x>
-        <y>-0.2567747533</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
+    <param name="canvas">
+      <canvas width="200" height="200" view-box="-3.245196 3.245196 3.245196 -3.245196">
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.700000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.1364002228</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
+    </param>
+    <param name="zoom">
+      <real value="0.0000000000"/>
+    </param>
+    <param name="time_offset">
+      <time value="0s"/>
+    </param>
+    <param name="children_lock">
+      <bool value="false"/>
+    </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
+  </layer>
+  <layer type="PasteCanvas" active="true" version="0.1" desc="curvewarp">
+    <param name="z_depth">
+      <real value="0.0000000000"/>
+    </param>
+    <param name="amount">
+      <real value="1.0000000000"/>
+    </param>
+    <param name="blend_method">
+      <integer value="0"/>
+    </param>
+    <param name="origin">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
     <param name="canvas">
       <canvas>
-        <layer type="outline" active="true" version="0.2" desc="NewBLine020 Outline">
+        <layer type="outline" active="true" version="0.2" desc="wing">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -49,16 +147,16 @@
           </param>
           <param name="color">
             <color>
-              <r>0.000000</r>
-              <g>0.000000</g>
-              <b>0.000000</b>
+              <r>0.013061</r>
+              <g>0.013061</g>
+              <b>0.013061</b>
               <a>1.000000</a>
             </color>
           </param>
           <param name="origin">
             <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <x>-1.2980784178</x>
+              <y>-0.1298078448</y>
             </vector>
           </param>
           <param name="invert">
@@ -77,52 +175,13 @@
             <integer value="0"/>
           </param>
           <param name="bline">
-            <bline type="bline_point" loop="true" guid="E96155872AD3C4063FC99CBEFFB3CC24">
-              <entry>
-                <composite type="bline_point">
-                  <point>
-                    <vector>
-                      <x>-2.0193657875</x>
-                      <y>-0.0235736556</y>
-                    </vector>
-                  </point>
-                  <width>
-                    <real value="1.0000000000"/>
-                  </width>
-                  <origin>
-                    <real value="0.5756335855"/>
-                  </origin>
-                  <split>
-                    <bool value="false"/>
-                  </split>
-                  <t1>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="1.8823426591"/>
-                      </radius>
-                      <theta>
-                        <angle value="137.178131"/>
-                      </theta>
-                    </radial_composite>
-                  </t1>
-                  <t2>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="1.8823426591"/>
-                      </radius>
-                      <theta>
-                        <angle value="137.178131"/>
-                      </theta>
-                    </radial_composite>
-                  </t2>
-                </composite>
-              </entry>
+            <bline type="bline_point" loop="false">
               <entry>
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-2.5931022167</x>
-                      <y>2.2713716030</y>
+                      <x>-1.3156199455</x>
+                      <y>2.8812077045</y>
                     </vector>
                   </point>
                   <width>
@@ -137,59 +196,20 @@
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="3.0986099378"/>
-                      </radius>
-                      <theta>
-                        <angle value="43.726967"/>
-                      </theta>
-                    </radial_composite>
-                  </t1>
-                  <t2>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="3.0986099378"/>
-                      </radius>
-                      <theta>
-                        <angle value="43.726967"/>
-                      </theta>
-                    </radial_composite>
-                  </t2>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <point>
-                    <vector>
-                      <x>-1.2663369179</x>
-                      <y>1.0163234472</y>
-                    </vector>
-                  </point>
-                  <width>
-                    <real value="1.0000000000"/>
-                  </width>
-                  <origin>
-                    <real value="0.6088231206"/>
-                  </origin>
-                  <split>
-                    <bool value="false"/>
-                  </split>
-                  <t1>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="3.1271013856"/>
+                        <real value="9.7751856675"/>
                       </radius>
                       <theta>
-                        <angle value="-40.815083"/>
+                        <angle value="-87.271523"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="3.1271013856"/>
+                        <real value="9.7751856675"/>
                       </radius>
                       <theta>
-                        <angle value="-40.815083"/>
+                        <angle value="-87.271523"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -199,8 +219,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>0.0962867662</x>
-                      <y>-0.0235736556</y>
+                      <x>3.9249331951</x>
+                      <y>-2.1488459110</y>
                     </vector>
                   </point>
                   <width>
@@ -215,20 +235,20 @@
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="2.5113766885"/>
+                        <real value="13.0483219526"/>
                       </radius>
                       <theta>
-                        <angle value="-99.865814"/>
+                        <angle value="0.034663"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="2.5113766885"/>
+                        <real value="13.0483219526"/>
                       </radius>
                       <theta>
-                        <angle value="-99.865814"/>
+                        <angle value="0.034663"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -237,13 +257,13 @@
             </bline>
           </param>
           <param name="width">
-            <real value="0.9735588284"/>
+            <real value="0.3894235314"/>
           </param>
           <param name="expand">
             <real value="0.0000000000"/>
           </param>
           <param name="sharp_cusps">
-            <bool value="true"/>
+            <bool value="false"/>
           </param>
           <param name="round_tip[0]">
             <bool value="true"/>
@@ -258,7 +278,7 @@
             <bool value="true"/>
           </param>
         </layer>
-        <layer type="region" active="true" version="0.1" desc="NewBLine020 Region">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="shape">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -268,212 +288,469 @@
           <param name="blend_method">
             <integer value="0"/>
           </param>
-          <param name="color">
-            <gradientcolor type="color">
-              <gradient>
-                <gradient>
-                  <color pos="0.159763">
-                    <r>1.000000</r>
-                    <g>1.000000</g>
-                    <b>1.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                  <color pos="1.000000">
-                    <r>0.302085</r>
-                    <g>0.302085</g>
-                    <b>0.302086</b>
-                    <a>1.000000</a>
-                  </color>
-                </gradient>
-              </gradient>
-              <index>
-                <real value="0.6000000000"/>
-              </index>
-              <loop>
-                <bool value="false"/>
-              </loop>
-            </gradientcolor>
-          </param>
           <param name="origin">
             <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <x>1.9941018820</x>
+              <y>-0.2567747533</y>
             </vector>
           </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="antialias">
-            <bool value="true"/>
+          <param name="canvas">
+            <canvas>
+              <layer type="outline" active="true" version="0.2" desc="Outline">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>0.000000</r>
+                    <g>0.000000</g>
+                    <b>0.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+                <param name="antialias">
+                  <bool value="true"/>
+                </param>
+                <param name="feather">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="blurtype">
+                  <integer value="1"/>
+                </param>
+                <param name="winding_style">
+                  <integer value="0"/>
+                </param>
+                <param name="bline">
+                  <bline type="bline_point" loop="true" guid="E96155872AD3C4063FC99CBEFFB3CC24">
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-2.0842697620</x>
+                            <y>-0.0235736556</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5756335855"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="1.8823426591"/>
+                            </radius>
+                            <theta>
+                              <angle value="137.178131"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="1.8823426591"/>
+                            </radius>
+                            <theta>
+                              <angle value="137.178131"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-2.6106891632</x>
+                            <y>2.6582198143</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.0986099378"/>
+                            </radius>
+                            <theta>
+                              <angle value="43.726967"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.0986099378"/>
+                            </radius>
+                            <theta>
+                              <angle value="43.726967"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-1.2663369179</x>
+                            <y>1.0812274218</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.6088231206"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.1271013856"/>
+                            </radius>
+                            <theta>
+                              <angle value="-40.815083"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.1271013856"/>
+                            </radius>
+                            <theta>
+                              <angle value="-40.815083"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>0.6020548940</x>
+                            <y>-0.1326487660</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="2.5113766885"/>
+                            </radius>
+                            <theta>
+                              <angle value="-99.865814"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="2.5113766885"/>
+                            </radius>
+                            <theta>
+                              <angle value="-99.865814"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                  </bline>
+                </param>
+                <param name="width">
+                  <real value="1.1682705941"/>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="sharp_cusps">
+                  <bool value="true"/>
+                </param>
+                <param name="round_tip[0]">
+                  <bool value="true"/>
+                </param>
+                <param name="round_tip[1]">
+                  <bool value="true"/>
+                </param>
+                <param name="loopyness">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="homogeneous_width">
+                  <bool value="true"/>
+                </param>
+              </layer>
+              <layer type="region" active="true" version="0.1" desc="Region">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <gradientcolor type="color">
+                    <gradient>
+                      <gradient>
+                        <color pos="0.159763">
+                          <r>1.000000</r>
+                          <g>1.000000</g>
+                          <b>1.000000</b>
+                          <a>1.000000</a>
+                        </color>
+                        <color pos="1.000000">
+                          <r>0.302085</r>
+                          <g>0.302085</g>
+                          <b>0.302086</b>
+                          <a>1.000000</a>
+                        </color>
+                      </gradient>
+                    </gradient>
+                    <index>
+                      <real value="0.6000000000"/>
+                    </index>
+                    <loop>
+                      <bool value="false"/>
+                    </loop>
+                  </gradientcolor>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+                <param name="antialias">
+                  <bool value="true"/>
+                </param>
+                <param name="feather">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="blurtype">
+                  <integer value="1"/>
+                </param>
+                <param name="winding_style">
+                  <integer value="0"/>
+                </param>
+                <param name="bline">
+                  <bline type="bline_point" loop="true" guid="E96155872AD3C4063FC99CBEFFB3CC24">
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-2.0842697620</x>
+                            <y>-0.0235736556</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5756335855"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="1.8823426591"/>
+                            </radius>
+                            <theta>
+                              <angle value="137.178131"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="1.8823426591"/>
+                            </radius>
+                            <theta>
+                              <angle value="137.178131"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-2.6106891632</x>
+                            <y>2.6582198143</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.0986099378"/>
+                            </radius>
+                            <theta>
+                              <angle value="43.726967"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.0986099378"/>
+                            </radius>
+                            <theta>
+                              <angle value="43.726967"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-1.2663369179</x>
+                            <y>1.0812274218</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.6088231206"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.1271013856"/>
+                            </radius>
+                            <theta>
+                              <angle value="-40.815083"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.1271013856"/>
+                            </radius>
+                            <theta>
+                              <angle value="-40.815083"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>0.6020548940</x>
+                            <y>-0.1326487660</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="2.5113766885"/>
+                            </radius>
+                            <theta>
+                              <angle value="-99.865814"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="2.5113766885"/>
+                            </radius>
+                            <theta>
+                              <angle value="-99.865814"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                  </bline>
+                </param>
+              </layer>
+            </canvas>
           </param>
-          <param name="feather">
+          <param name="zoom">
             <real value="0.0000000000"/>
           </param>
-          <param name="blurtype">
-            <integer value="1"/>
+          <param name="time_offset">
+            <time value="0s"/>
           </param>
-          <param name="winding_style">
-            <integer value="0"/>
+          <param name="children_lock">
+            <bool value="false"/>
           </param>
-          <param name="bline">
-            <bline type="bline_point" loop="true" guid="E96155872AD3C4063FC99CBEFFB3CC24">
-              <entry>
-                <composite type="bline_point">
-                  <point>
-                    <vector>
-                      <x>-2.0193657875</x>
-                      <y>-0.0235736556</y>
-                    </vector>
-                  </point>
-                  <width>
-                    <real value="1.0000000000"/>
-                  </width>
-                  <origin>
-                    <real value="0.5756335855"/>
-                  </origin>
-                  <split>
-                    <bool value="false"/>
-                  </split>
-                  <t1>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="1.8823426591"/>
-                      </radius>
-                      <theta>
-                        <angle value="137.178131"/>
-                      </theta>
-                    </radial_composite>
-                  </t1>
-                  <t2>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="1.8823426591"/>
-                      </radius>
-                      <theta>
-                        <angle value="137.178131"/>
-                      </theta>
-                    </radial_composite>
-                  </t2>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <point>
-                    <vector>
-                      <x>-2.5931022167</x>
-                      <y>2.2713716030</y>
-                    </vector>
-                  </point>
-                  <width>
-                    <real value="1.0000000000"/>
-                  </width>
-                  <origin>
-                    <real value="0.5000000000"/>
-                  </origin>
-                  <split>
-                    <bool value="false"/>
-                  </split>
-                  <t1>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="3.0986099378"/>
-                      </radius>
-                      <theta>
-                        <angle value="43.726967"/>
-                      </theta>
-                    </radial_composite>
-                  </t1>
-                  <t2>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="3.0986099378"/>
-                      </radius>
-                      <theta>
-                        <angle value="43.726967"/>
-                      </theta>
-                    </radial_composite>
-                  </t2>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <point>
-                    <vector>
-                      <x>-1.2663369179</x>
-                      <y>1.0163234472</y>
-                    </vector>
-                  </point>
-                  <width>
-                    <real value="1.0000000000"/>
-                  </width>
-                  <origin>
-                    <real value="0.6088231206"/>
-                  </origin>
-                  <split>
-                    <bool value="false"/>
-                  </split>
-                  <t1>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="3.1271013856"/>
-                      </radius>
-                      <theta>
-                        <angle value="-40.815083"/>
-                      </theta>
-                    </radial_composite>
-                  </t1>
-                  <t2>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="3.1271013856"/>
-                      </radius>
-                      <theta>
-                        <angle value="-40.815083"/>
-                      </theta>
-                    </radial_composite>
-                  </t2>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <point>
-                    <vector>
-                      <x>0.0962867662</x>
-                      <y>-0.0235736556</y>
-                    </vector>
-                  </point>
-                  <width>
-                    <real value="1.0000000000"/>
-                  </width>
-                  <origin>
-                    <real value="0.5000000000"/>
-                  </origin>
-                  <split>
-                    <bool value="false"/>
-                  </split>
-                  <t1>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="2.5113766885"/>
-                      </radius>
-                      <theta>
-                        <angle value="-99.865814"/>
-                      </theta>
-                    </radial_composite>
-                  </t1>
-                  <t2>
-                    <radial_composite type="vector">
-                      <radius>
-                        <real value="2.5113766885"/>
-                      </radius>
-                      <theta>
-                        <angle value="-99.865814"/>
-                      </theta>
-                    </radial_composite>
-                  </t2>
-                </composite>
-              </entry>
-            </bline>
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
           </param>
         </layer>
       </canvas>
@@ -494,347 +771,4 @@
       </vector>
     </param>
   </layer>
-  <layer type="region" active="true" version="0.1" desc="Circle019 Region">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="0.4000000060"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>0.0000000000</x>
-        <y>-2.5847954750</y>
-      </vector>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="false"/>
-    </param>
-    <param name="feather">
-      <real value="0.4867794142"/>
-    </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="winding_style">
-      <integer value="0"/>
-    </param>
-    <param name="bline">
-      <bline type="bline_point" loop="true">
-        <entry>
-          <composite type="bline_point">
-            <point>
-              <vector>
-                <x>2.2337062359</x>
-                <y>0.0139259165</y>
-              </vector>
-            </point>
-            <width>
-              <real value="1.0000000000"/>
-            </width>
-            <origin>
-              <real value="0.5000000000"/>
-            </origin>
-            <split>
-              <bool value="true"/>
-            </split>
-            <t1>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="0.8542030127"/>
-                </radius>
-                <theta>
-                  <angle value="90.000000"/>
-                </theta>
-              </radial_composite>
-            </t1>
-            <t2>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="0.8542030127"/>
-                </radius>
-                <theta>
-                  <angle value="90.000000"/>
-                </theta>
-              </radial_composite>
-            </t2>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <point>
-              <vector>
-                <x>-0.0175705366</x>
-                <y>0.4894979596</y>
-              </vector>
-            </point>
-            <width>
-              <real value="1.0000000000"/>
-            </width>
-            <origin>
-              <real value="0.5000000000"/>
-            </origin>
-            <split>
-              <bool value="false"/>
-            </split>
-            <t1>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="4.7435666483"/>
-                </radius>
-                <theta>
-                  <angle value="-179.999985"/>
-                </theta>
-              </radial_composite>
-            </t1>
-            <t2>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="4.7435666483"/>
-                </radius>
-                <theta>
-                  <angle value="-179.999985"/>
-                </theta>
-              </radial_composite>
-            </t2>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <point>
-              <vector>
-                <x>-1.7015790939</x>
-                <y>0.0713365972</y>
-              </vector>
-            </point>
-            <width>
-              <real value="1.0000000000"/>
-            </width>
-            <origin>
-              <real value="0.5000000000"/>
-            </origin>
-            <split>
-              <bool value="false"/>
-            </split>
-            <t1>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="0.8542030127"/>
-                </radius>
-                <theta>
-                  <angle value="-89.999992"/>
-                </theta>
-              </radial_composite>
-            </t1>
-            <t2>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="0.8542030127"/>
-                </radius>
-                <theta>
-                  <angle value="-89.999992"/>
-                </theta>
-              </radial_composite>
-            </t2>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <point>
-              <vector>
-                <x>-0.0175703783</x>
-                <y>-0.5416163802</y>
-              </vector>
-            </point>
-            <width>
-              <real value="1.0000000000"/>
-            </width>
-            <origin>
-              <real value="0.5000000000"/>
-            </origin>
-            <split>
-              <bool value="false"/>
-            </split>
-            <t1>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="4.7435666483"/>
-                </radius>
-                <theta>
-                  <angle value="0.000001"/>
-                </theta>
-              </radial_composite>
-            </t1>
-            <t2>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="4.7435666483"/>
-                </radius>
-                <theta>
-                  <angle value="0.000001"/>
-                </theta>
-              </radial_composite>
-            </t2>
-          </composite>
-        </entry>
-      </bline>
-    </param>
-  </layer>
-  <layer type="outline" active="true" version="0.2" desc="wing002 Outline">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.013061</r>
-        <g>0.013061</g>
-        <b>0.013061</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>-0.6139559746</x>
-        <y>-0.0877079964</y>
-      </vector>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="true"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="winding_style">
-      <integer value="0"/>
-    </param>
-    <param name="bline">
-      <bline type="bline_point" loop="false">
-        <entry>
-          <composite type="bline_point">
-            <point>
-              <vector>
-                <x>-1.3156199455</x>
-                <y>2.7189478874</y>
-              </vector>
-            </point>
-            <width>
-              <real value="1.0000000000"/>
-            </width>
-            <origin>
-              <real value="0.5000000000"/>
-            </origin>
-            <split>
-              <bool value="false"/>
-            </split>
-            <t1>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="9.7751856675"/>
-                </radius>
-                <theta>
-                  <angle value="-87.271523"/>
-                </theta>
-              </radial_composite>
-            </t1>
-            <t2>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="9.7751856675"/>
-                </radius>
-                <theta>
-                  <angle value="-87.271523"/>
-                </theta>
-              </radial_composite>
-            </t2>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <point>
-              <vector>
-                <x>3.1136341095</x>
-                <y>-2.1488459110</y>
-              </vector>
-            </point>
-            <width>
-              <real value="1.0000000000"/>
-            </width>
-            <origin>
-              <real value="0.5000000000"/>
-            </origin>
-            <split>
-              <bool value="false"/>
-            </split>
-            <t1>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="9.8684313871"/>
-                </radius>
-                <theta>
-                  <angle value="-3.595816"/>
-                </theta>
-              </radial_composite>
-            </t1>
-            <t2>
-              <radial_composite type="vector">
-                <radius>
-                  <real value="9.8684313871"/>
-                </radius>
-                <theta>
-                  <angle value="-3.595816"/>
-                </theta>
-              </radial_composite>
-            </t2>
-          </composite>
-        </entry>
-      </bline>
-    </param>
-    <param name="width">
-      <real value="0.2920676485"/>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="sharp_cusps">
-      <bool value="false"/>
-    </param>
-    <param name="round_tip[0]">
-      <bool value="true"/>
-    </param>
-    <param name="round_tip[1]">
-      <bool value="true"/>
-    </param>
-    <param name="loopyness">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="homogeneous_width">
-      <bool value="true"/>
-    </param>
-  </layer>
 </canvas>
diff --git a/synfig-studio/images/layer_example_filledrectangle_icon.sif b/synfig-studio/images/layer_example_filledrectangle_icon.sif
index 68d4f85..83c894a 100644
--- a/synfig-studio/images/layer_example_filledrectangle_icon.sif
+++ b/synfig-studio/images/layer_example_filledrectangle_icon.sif
@@ -8,7 +8,7 @@
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.2776479721</x>
-        <y>-2.7908685207</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.7199538946</x>
-        <y>-2.7908685207</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7481141090</x>
+              <y>-2.5207901001</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.7473614216</x>
+              <y>-2.5212490559</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.2972397804</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.4988009930</x>
-        <y>2.1499423981</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.2391853333</x>
-        <y>-1.7524058819</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.2391853333</x>
-        <y>1.8903266191</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="rectangle">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -184,12 +146,12 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
-      <canvas width="200" height="200">
-        <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
+      <canvas>
+        <layer type="rectangle" active="true" version="0.2" desc="Rectangle White">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -209,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.9795696735</x>
-              <y>-1.4927902222</y>
+              <x>-2.7475929260</x>
+              <y>2.6462929249</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.9795696735</x>
-              <y>1.6307109594</y>
+              <x>2.7471959591</x>
+              <y>-2.8485701084</y>
             </vector>
           </param>
           <param name="expand">
@@ -226,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle Gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -234,42 +196,336 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="p1">
+          <param name="origin">
             <vector>
-              <x>3.1478400230</x>
-              <y>-2.7908685207</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="p2">
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1379981041</x>
+                    <y>2.0366981030</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1196720600</x>
+                    <y>-2.2031168938</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="linear_gradient" active="true" version="0.0">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="p1">
+                  <vector>
+                    <x>-2.2052989006</x>
+                    <y>-0.9588571191</y>
+                  </vector>
+                </param>
+                <param name="p2">
+                  <vector>
+                    <x>2.2052989006</x>
+                    <y>-0.9588571191</y>
+                  </vector>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.793110</r>
+                      <g>0.793110</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.612066</r>
+                      <g>0.612066</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
+          </param>
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
+            <bool value="false"/>
+          </param>
+          <param name="focus">
             <vector>
-              <x>-2.7908685207</x>
-              <y>2.5312528610</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+        </layer>
+        <layer type="outline" active="true" version="0.2" desc="Outline">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
           </param>
-          <param name="loop">
-            <bool value="false"/>
+          <param name="amount">
+            <real value="1.0000000000"/>
           </param>
-          <param name="zigzag">
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-0.1014123783</y>
+            </vector>
+          </param>
+          <param name="invert">
             <bool value="false"/>
           </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371402"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
         </layer>
       </canvas>
     </param>
diff --git a/synfig-studio/images/layer_example_simplecircle_icon.sif b/synfig-studio/images/layer_example_simplecircle_icon.sif
index fcfb2d5..14471bc 100644
--- a/synfig-studio/images/layer_example_simplecircle_icon.sif
+++ b/synfig-studio/images/layer_example_simplecircle_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.1" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Circle Icon</name>
-  <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek)</desc>
+  <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="radial_gradient" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,163 +18,95 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.021505">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="0.564516">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>0.731343</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.1808688790</x>
-        <y>-0.3216028810</y>
-      </vector>
-    </param>
-    <param name="radius">
-      <real value="1.7765365254"/>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.7515196800</x>
-        <y>-1.2269309759</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.7515196800</x>
-        <y>-1.2269309759</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>2.7515196800</x>
-        <y>-2.7224798203</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
-      <vector>
-        <x>-2.7515196800</x>
-        <y>-2.7079598904</y>
-      </vector>
-    </param>
-    <param name="clip">
-      <bool value="false"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
-    </param>
-  </layer>
-  <layer type="circle" active="true" version="0.1" desc="Black Circle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="radius">
-      <real value="2.3365411882"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="pos">
+    <param name="origin">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="falloff">
-      <integer value="1"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.700000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.1364002228</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="circle" active="true" version="0.1" desc="White Circle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="radius">
-      <real value="2.0769255006"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
+    <param name="children_lock">
+      <bool value="false"/>
     </param>
-    <param name="pos">
+    <param name="focus">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="falloff">
-      <integer value="1"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Circle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="circle">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -192,7 +124,7 @@
     </param>
     <param name="canvas">
       <canvas>
-        <layer type="circle" active="true" version="0.1">
+        <layer type="circle" active="true" version="0.1" desc="Circle White">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -211,15 +143,15 @@
             </color>
           </param>
           <param name="radius">
-            <real value="1.8173098130"/>
+            <real value="2.6559058822"/>
           </param>
           <param name="feather">
             <real value="0.0000000000"/>
           </param>
-          <param name="pos">
+          <param name="origin">
             <vector>
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>0.2596159875</y>
             </vector>
           </param>
           <param name="invert">
@@ -229,7 +161,7 @@
             <integer value="1"/>
           </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="outline" active="true" version="0.2" desc="Circle">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -237,41 +169,139 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="p1">
-            <vector>
-              <x>1.6642030478</x>
-              <y>-1.9762411118</y>
-            </vector>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
           </param>
-          <param name="p2">
+          <param name="origin">
             <vector>
-              <x>-0.6339452267</x>
-              <y>0.8150724769</y>
+              <x>0.0000000000</x>
+              <y>0.2596159875</y>
             </vector>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
-          </param>
-          <param name="loop">
+          <param name="invert">
             <bool value="false"/>
           </param>
-          <param name="zigzag">
-            <bool value="false"/>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.6559059620</x>
+                      <y>0.0000000000</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="10.6236235287"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="10.6236235287"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.6559059620</x>
+                      <y>-0.0000002322</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="10.6236235287"/>
+                      </radius>
+                      <theta>
+                        <angle value="-89.999992"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="10.6236235287"/>
+                      </radius>
+                      <theta>
+                        <angle value="-89.999992"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371339"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
           </param>
         </layer>
       </canvas>
@@ -285,5 +315,11 @@
     <param name="children_lock">
       <bool value="false"/>
     </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/layer_geometry_checkerboard_icon.sif b/synfig-studio/images/layer_geometry_checkerboard_icon.sif
index c3cf5ad..98d8ea4 100644
--- a/synfig-studio/images/layer_geometry_checkerboard_icon.sif
+++ b/synfig-studio/images/layer_geometry_checkerboard_icon.sif
@@ -1,140 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.7" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Checkerboard Layer Icon</name>
-  <desc>Placed in the Public Domain in 2010 by Carlos L&#xF3;pez (genete)</desc>
+  <desc>Placed in the Public Domain in 2010 by Carlos L&#xF3;pez (genete), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.454327 0.454327"/>
-  <meta name="grid_snap" content="1"/>
+  <meta name="grid_snap" content="0"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.1153881550</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
-      <vector>
-        <x>-1.5576940775</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
-    </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.3365411758</x>
-        <y>2.3365411758</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -147,12 +21,12 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>-0.0507061891</y>
       </vector>
     </param>
     <param name="canvas">
-      <canvas>
-        <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
+      <canvas width="200" height="200">
+        <layer type="linear_gradient" active="true" version="0.0">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -162,53 +36,16 @@
           <param name="blend_method">
             <integer value="0"/>
           </param>
-          <param name="color">
-            <color>
-              <r>1.000000</r>
-              <g>1.000000</g>
-              <b>1.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="point1">
-            <vector>
-              <x>-2.0769255161</x>
-              <y>-2.0769255161</y>
-            </vector>
-          </param>
-          <param name="point2">
-            <vector>
-              <x>2.0769255161</x>
-              <y>2.0769255161</y>
-            </vector>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-        </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="13"/>
-          </param>
           <param name="p1">
             <vector>
-              <x>2.1013975143</x>
-              <y>-2.0880973339</y>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
             </vector>
           </param>
           <param name="p2">
             <vector>
-              <x>-1.7954977751</x>
-              <y>1.7954977751</y>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
             </vector>
           </param>
           <param name="gradient">
@@ -223,7 +60,7 @@
                 <r>1.000000</r>
                 <g>1.000000</g>
                 <b>1.000000</b>
-                <a>1.000000</a>
+                <a>0.000000</a>
               </color>
             </gradient>
           </param>
@@ -234,6 +71,50 @@
             <bool value="false"/>
           </param>
         </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7088961601</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.1896641254</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
       </canvas>
     </param>
     <param name="zoom">
@@ -252,7 +133,7 @@
       </vector>
     </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="checkerboard">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -269,8 +150,8 @@
       </vector>
     </param>
     <param name="canvas">
-      <canvas>
-        <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
+      <canvas width="200" height="200">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -280,34 +161,219 @@
           <param name="blend_method">
             <integer value="0"/>
           </param>
-          <param name="color">
-            <color>
-              <r>1.000000</r>
-              <g>1.000000</g>
-              <b>1.000000</b>
-              <a>1.000000</a>
-            </color>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.5637049675</x>
+                    <y>-2.3365411758</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.5312528610</x>
+                    <y>2.7259647846</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="p1">
+                  <vector>
+                    <x>2.5312528610</x>
+                    <y>-2.3365411758</y>
+                  </vector>
+                </param>
+                <param name="p2">
+                  <vector>
+                    <x>-2.5961568356</x>
+                    <y>2.6610608101</y>
+                  </vector>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.064115</r>
+                      <g>0.064115</g>
+                      <b>0.064115</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>1.000000</r>
+                      <g>1.000000</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
+          </param>
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
           </param>
-          <param name="point1">
+          <param name="children_lock">
+            <bool value="false"/>
+          </param>
+          <param name="focus">
             <vector>
-              <x>-1.7963591814</x>
-              <y>-1.8173098564</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="point2">
+        </layer>
+        <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="origin">
             <vector>
-              <x>1.8152815104</x>
-              <y>1.7963591814</y>
+              <x>0.0000000000</x>
+              <y>0.2596159875</y>
             </vector>
           </param>
-          <param name="expand">
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1738083363</x>
+                    <y>-2.2583372593</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1705572605</x>
+                    <y>2.0811810493</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="checker_board" active="true" version="0.1">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>0.000000</r>
+                    <g>0.000000</g>
+                    <b>0.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>-0.0106399870</x>
+                    <y>-0.0893761963</y>
+                  </vector>
+                </param>
+                <param name="size">
+                  <vector>
+                    <x>1.0895347595</x>
+                    <y>1.0895347595</y>
+                  </vector>
+                </param>
+              </layer>
+            </canvas>
+          </param>
+          <param name="zoom">
             <real value="0.0000000000"/>
           </param>
-          <param name="invert">
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
             <bool value="false"/>
           </param>
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
         </layer>
-        <layer type="checker_board" active="true" version="0.1">
+        <layer type="outline" active="true" version="0.2" desc="Outline">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -315,7 +381,7 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
           <param name="color">
             <color>
@@ -328,14 +394,204 @@
           <param name="origin">
             <vector>
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>0.1315760463</y>
             </vector>
           </param>
-          <param name="size">
-            <vector>
-              <x>0.9086549282</x>
-              <y>0.9086549282</y>
-            </vector>
+          <param name="invert">
+            <bool value="false"/>
+          </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.7395687250"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.3365438879"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7193069002"/>
+                      </radius>
+                      <theta>
+                        <angle value="-180.424026"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371402"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
           </param>
         </layer>
       </canvas>
diff --git a/synfig-studio/images/layer_geometry_circle_icon.sif b/synfig-studio/images/layer_geometry_circle_icon.sif
index fcfb2d5..d8578d3 100644
--- a/synfig-studio/images/layer_geometry_circle_icon.sif
+++ b/synfig-studio/images/layer_geometry_circle_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.1" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Circle Icon</name>
-  <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek)</desc>
+  <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="radial_gradient" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,163 +18,95 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.021505">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="0.564516">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>0.731343</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.1808688790</x>
-        <y>-0.3216028810</y>
-      </vector>
-    </param>
-    <param name="radius">
-      <real value="1.7765365254"/>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.7515196800</x>
-        <y>-1.2269309759</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.7515196800</x>
-        <y>-1.2269309759</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>2.7515196800</x>
-        <y>-2.7224798203</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
-      <vector>
-        <x>-2.7515196800</x>
-        <y>-2.7079598904</y>
-      </vector>
-    </param>
-    <param name="clip">
-      <bool value="false"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
-    </param>
-  </layer>
-  <layer type="circle" active="true" version="0.1" desc="Black Circle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="radius">
-      <real value="2.3365411882"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="pos">
+    <param name="origin">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="falloff">
-      <integer value="1"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.700000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.1364002228</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="circle" active="true" version="0.1" desc="White Circle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="radius">
-      <real value="2.0769255006"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
+    <param name="children_lock">
+      <bool value="false"/>
     </param>
-    <param name="pos">
+    <param name="focus">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="falloff">
-      <integer value="1"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Circle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="circle">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -192,7 +124,7 @@
     </param>
     <param name="canvas">
       <canvas>
-        <layer type="circle" active="true" version="0.1">
+        <layer type="circle" active="true" version="0.1" desc="Circle White">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -211,15 +143,15 @@
             </color>
           </param>
           <param name="radius">
-            <real value="1.8173098130"/>
+            <real value="2.6559058822"/>
           </param>
           <param name="feather">
             <real value="0.0000000000"/>
           </param>
-          <param name="pos">
+          <param name="origin">
             <vector>
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>0.2596159875</y>
             </vector>
           </param>
           <param name="invert">
@@ -229,7 +161,7 @@
             <integer value="1"/>
           </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="Circle Gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -237,42 +169,258 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="p1">
+          <param name="origin">
             <vector>
-              <x>1.6642030478</x>
-              <y>-1.9762411118</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="p2">
+          <param name="canvas">
+            <canvas>
+              <layer type="circle" active="true" version="0.1" desc="Circle0">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="radius">
+                  <real value="2.2310723151"/>
+                </param>
+                <param name="feather">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.2596159875</y>
+                  </vector>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+                <param name="falloff">
+                  <integer value="1"/>
+                </param>
+              </layer>
+              <layer type="linear_gradient" active="true" version="0.0">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="p1">
+                  <vector>
+                    <x>2.5961599350</x>
+                    <y>0.1521185637</y>
+                  </vector>
+                </param>
+                <param name="p2">
+                  <vector>
+                    <x>-2.5961599350</x>
+                    <y>0.1521185637</y>
+                  </vector>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.612066</r>
+                      <g>0.612066</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.793110</r>
+                      <g>0.793110</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
+          </param>
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
+            <bool value="false"/>
+          </param>
+          <param name="focus">
             <vector>
-              <x>-0.6339452267</x>
-              <y>0.8150724769</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+        </layer>
+        <layer type="outline" active="true" version="0.2" desc="Circle">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
           </param>
-          <param name="loop">
-            <bool value="false"/>
+          <param name="amount">
+            <real value="1.0000000000"/>
           </param>
-          <param name="zigzag">
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.2596159875</y>
+            </vector>
+          </param>
+          <param name="invert">
             <bool value="false"/>
           </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.6559059620</x>
+                      <y>0.0000000000</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="10.6236235287"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="10.6236235287"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.6559059620</x>
+                      <y>-0.0000002322</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="10.6236235287"/>
+                      </radius>
+                      <theta>
+                        <angle value="-89.999992"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="10.6236235287"/>
+                      </radius>
+                      <theta>
+                        <angle value="-89.999992"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371339"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
         </layer>
       </canvas>
     </param>
@@ -285,5 +433,11 @@
     <param name="children_lock">
       <bool value="false"/>
     </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/layer_geometry_outline_icon.sif b/synfig-studio/images/layer_geometry_outline_icon.sif
index 7e2c382..b072944 100644
--- a/synfig-studio/images/layer_geometry_outline_icon.sif
+++ b/synfig-studio/images/layer_geometry_outline_icon.sif
@@ -1,7 +1,112 @@
 <?xml version="1.0"?>
-<canvas version="0.7" width="128" height="128" xres="2834.645691" yres="2834.645691" view-box="-1.000000 1.000000 1.000000 -1.000000" antialias="1" fps="30.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
-  <name>Untitled0</name>
-  <layer type="outline" active="true" version="0.2" desc="NewBLine003 Outline">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+  <name>Synfig Studio Outline Icon</name>
+  <desc>Placed in the Public Domain in 2010 by Yu Chen (jcome)</desc>
+  <meta name="grid_show" content="0"/>
+  <meta name="grid_size" content="0.259616 0.259616"/>
+  <meta name="grid_snap" content="1"/>
+  <meta name="guide_show" content="1"/>
+  <meta name="guide_snap" content="0"/>
+  <meta name="onion_skin" content="0"/>
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
+    <param name="z_depth">
+      <real value="0.0000000000"/>
+    </param>
+    <param name="amount">
+      <real value="1.0000000000"/>
+    </param>
+    <param name="blend_method">
+      <integer value="0"/>
+    </param>
+    <param name="origin">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.700000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.1364002228</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
+    </param>
+    <param name="zoom">
+      <real value="0.0000000000"/>
+    </param>
+    <param name="time_offset">
+      <time value="0s"/>
+    </param>
+    <param name="children_lock">
+      <bool value="false"/>
+    </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
+  </layer>
+  <layer type="outline" active="true" version="0.2" desc="outline">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -32,7 +137,7 @@
       <bool value="true"/>
     </param>
     <param name="feather">
-      <real value="0.1000000000"/>
+      <real value="0.0000000000"/>
     </param>
     <param name="blurtype">
       <integer value="1"/>
@@ -46,12 +151,12 @@
           <composite type="bline_point">
             <point>
               <vector>
-                <x>-0.8906250000</x>
-                <y>0.7656250000</y>
+                <x>-0.6774355769</x>
+                <y>3.0547001362</y>
               </vector>
             </point>
             <width>
-              <real value="0.0000000000"/>
+              <real value="0.6530418446"/>
             </width>
             <origin>
               <real value="0.5000000000"/>
@@ -60,16 +165,24 @@
               <bool value="false"/>
             </split>
             <t1>
-              <vector>
-                <x>1.0937500000</x>
-                <y>1.0000000000</y>
-              </vector>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="0.9054824814"/>
+                </radius>
+                <theta>
+                  <angle value="-120.666916"/>
+                </theta>
+              </radial_composite>
             </t1>
             <t2>
-              <vector>
-                <x>1.0937500000</x>
-                <y>1.0000000000</y>
-              </vector>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="0.9054824814"/>
+                </radius>
+                <theta>
+                  <angle value="-120.666916"/>
+                </theta>
+              </radial_composite>
             </t2>
           </composite>
         </entry>
@@ -77,30 +190,38 @@
           <composite type="bline_point">
             <point>
               <vector>
-                <x>-0.0000000000</x>
-                <y>0.0000000000</y>
+                <x>-2.4764924049</x>
+                <y>-1.0056726933</y>
               </vector>
             </point>
             <width>
-              <real value="9.4062940700"/>
+              <real value="3.5238409900"/>
             </width>
             <origin>
-              <real value="0.4728665650"/>
+              <real value="0.5000000000"/>
             </origin>
             <split>
               <bool value="false"/>
             </split>
             <t1>
-              <vector>
-                <x>0.2197851539</x>
-                <y>-0.9105731249</y>
-              </vector>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="5.7369136407"/>
+                </radius>
+                <theta>
+                  <angle value="-52.003551"/>
+                </theta>
+              </radial_composite>
             </t1>
             <t2>
-              <vector>
-                <x>0.2197851539</x>
-                <y>-0.9105731249</y>
-              </vector>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="5.7369136407"/>
+                </radius>
+                <theta>
+                  <angle value="-52.003551"/>
+                </theta>
+              </radial_composite>
             </t2>
           </composite>
         </entry>
@@ -108,37 +229,45 @@
           <composite type="bline_point">
             <point>
               <vector>
-                <x>0.8906250000</x>
-                <y>-0.8125000000</y>
+                <x>2.5393686295</x>
+                <y>0.0000000000</y>
               </vector>
             </point>
             <width>
-              <real value="0.0000000000"/>
+              <real value="6.7033688633"/>
             </width>
             <origin>
               <real value="0.5000000000"/>
             </origin>
             <split>
-              <bool value="false"/>
+              <bool value="true"/>
             </split>
             <t1>
-              <vector>
-                <x>1.6562500000</x>
-                <y>0.7656250000</y>
-              </vector>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="4.5414250034"/>
+                </radius>
+                <theta>
+                  <angle value="59.036251"/>
+                </theta>
+              </radial_composite>
             </t1>
             <t2>
-              <vector>
-                <x>1.6562500000</x>
-                <y>0.7656250000</y>
-              </vector>
+              <radial_composite type="vector">
+                <radius>
+                  <real value="4.9870604335"/>
+                </radius>
+                <theta>
+                  <angle value="51.340195"/>
+                </theta>
+              </radial_composite>
             </t2>
           </composite>
         </entry>
       </bline>
     </param>
     <param name="width">
-      <real value="0.1200000000"/>
+      <real value="0.1901482087"/>
     </param>
     <param name="expand">
       <real value="0.0000000000"/>
diff --git a/synfig-studio/images/layer_geometry_polygon_icon.sif b/synfig-studio/images/layer_geometry_polygon_icon.sif
index 03f2411..ee4f4a6 100644
--- a/synfig-studio/images/layer_geometry_polygon_icon.sif
+++ b/synfig-studio/images/layer_geometry_polygon_icon.sif
@@ -1,106 +1,252 @@
 <?xml version="1.0"?>
-<canvas version="0.1" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
-  <name>Synfig Studio Polygon Icon</name>
-  <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek)</desc>
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+  <name>Synfig Studio Polyline Icon</name>
+  <desc>Placed in the Public Domain in 2008 by Carlos L&#xF3;pez (Genete), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
-  <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_size" content="0.129808 0.129808"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="radial_gradient" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.021505">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="0.564516">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>0.731343</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.1808688790</x>
-        <y>-0.3216028810</y>
-      </vector>
-    </param>
-    <param name="radius">
-      <real value="1.7765365254"/>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.7515196800</x>
-        <y>-1.2269309759</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.7515196800</x>
-        <y>-1.2269309759</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>2.7515196800</x>
-        <y>-2.7224798203</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
-      <vector>
-        <x>-2.7515196800</x>
-        <y>-2.7079598904</y>
-      </vector>
-    </param>
-    <param name="clip">
-      <bool value="false"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
-    </param>
-  </layer>
-  <layer type="region" active="true" version="0.1" desc="black polygon">
+  <defs>
+    <bline type="bline_point" loop="true" id="a">
+      <entry>
+        <composite type="bline_point">
+          <point>
+            <vector>
+              <x>-3.1153917313</x>
+              <y>0.3894239664</y>
+            </vector>
+          </point>
+          <width>
+            <real value="1.0000000000"/>
+          </width>
+          <origin>
+            <real value="0.5000000000"/>
+          </origin>
+          <split>
+            <bool value="true"/>
+          </split>
+          <t1>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t1>
+          <t2>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t2>
+        </composite>
+      </entry>
+      <entry>
+        <composite type="bline_point">
+          <point>
+            <vector>
+              <x>-0.5192319751</x>
+              <y>2.9855837822</y>
+            </vector>
+          </point>
+          <width>
+            <real value="1.0000000000"/>
+          </width>
+          <origin>
+            <real value="0.5000000000"/>
+          </origin>
+          <split>
+            <bool value="true"/>
+          </split>
+          <t1>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t1>
+          <t2>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t2>
+        </composite>
+      </entry>
+      <entry>
+        <composite type="bline_point">
+          <point>
+            <vector>
+              <x>3.1153917313</x>
+              <y>-0.7788479328</y>
+            </vector>
+          </point>
+          <width>
+            <real value="1.0000000000"/>
+          </width>
+          <origin>
+            <real value="0.5000000000"/>
+          </origin>
+          <split>
+            <bool value="true"/>
+          </split>
+          <t1>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t1>
+          <t2>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t2>
+        </composite>
+      </entry>
+      <entry>
+        <composite type="bline_point">
+          <point>
+            <vector>
+              <x>1.6875039339</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </point>
+          <width>
+            <real value="1.0000000000"/>
+          </width>
+          <origin>
+            <real value="0.5000000000"/>
+          </origin>
+          <split>
+            <bool value="true"/>
+          </split>
+          <t1>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t1>
+          <t2>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t2>
+        </composite>
+      </entry>
+      <entry>
+        <composite type="bline_point">
+          <point>
+            <vector>
+              <x>-0.5192319751</x>
+              <y>-0.1298079938</y>
+            </vector>
+          </point>
+          <width>
+            <real value="1.0000000000"/>
+          </width>
+          <origin>
+            <real value="0.5000000000"/>
+          </origin>
+          <split>
+            <bool value="true"/>
+          </split>
+          <t1>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t1>
+          <t2>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t2>
+        </composite>
+      </entry>
+      <entry>
+        <composite type="bline_point">
+          <point>
+            <vector>
+              <x>-1.6875039339</x>
+              <y>-1.2980799675</y>
+            </vector>
+          </point>
+          <width>
+            <real value="1.0000000000"/>
+          </width>
+          <origin>
+            <real value="0.5000000000"/>
+          </origin>
+          <split>
+            <bool value="true"/>
+          </split>
+          <t1>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t1>
+          <t2>
+            <radial_composite type="vector">
+              <radius>
+                <real value="0.0000000000"/>
+              </radius>
+              <theta>
+                <angle value="0.000000"/>
+              </theta>
+            </radial_composite>
+          </t2>
+        </composite>
+      </entry>
+    </bline>
+  </defs>
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -110,469 +256,95 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="offset">
+    <param name="origin">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="true"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="bline">
-      <bline type="bline_point" loop="true" guid="B3AD0768095C15B9FF9CB17CFD225A50">
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>0.0000000000</x>
-                <y>2.5961568356</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0452818027"/>
-                </c0>
-                <c1>
-                  <angle value="90.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0452818027"/>
-                </c0>
-                <c1>
-                  <angle value="90.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>-2.3407971859</x>
-                <y>0.4787994027</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>-1.3033983707</x>
-                <y>-2.2077972889</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>1.4895981550</x>
-                <y>-2.2077972889</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>2.3008971214</x>
-                <y>0.4920994043</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-      </bline>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.800000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.1364002228</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="region" active="true" version="0.1" desc="White Polygon">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="1"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
+    <param name="children_lock">
+      <bool value="false"/>
     </param>
-    <param name="offset">
+    <param name="focus">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="true"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="bline">
-      <bline type="bline_point" loop="true">
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>0.0000000000</x>
-                <y>2.2875971794</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0452818027"/>
-                </c0>
-                <c1>
-                  <angle value="90.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0452818027"/>
-                </c0>
-                <c1>
-                  <angle value="90.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>-2.0747973919</x>
-                <y>0.4388994575</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>-1.1171985865</x>
-                <y>-1.9816975594</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>1.3432983160</x>
-                <y>-1.9550975561</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>2.0747973919</x>
-                <y>0.4388994575</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="0.0000000000"/>
-                </c0>
-                <c1>
-                  <angle value="0.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-      </bline>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Polygon gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="polyline">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -589,8 +361,8 @@
       </vector>
     </param>
     <param name="canvas">
-      <canvas>
-        <layer type="region" active="true" version="0.1" desc="Gradient Region">
+      <canvas width="200" height="200">
+        <layer type="outline" active="true" version="0.2" desc="white line">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -602,13 +374,13 @@
           </param>
           <param name="color">
             <color>
-              <r>0.428529</r>
-              <g>0.428529</g>
-              <b>0.428529</b>
+              <r>1.000000</r>
+              <g>1.000000</g>
+              <b>1.000000</b>
               <a>1.000000</a>
             </color>
           </param>
-          <param name="offset">
+          <param name="origin">
             <vector>
               <x>0.0000000000</x>
               <y>0.0000000000</y>
@@ -626,207 +398,270 @@
           <param name="blurtype">
             <integer value="1"/>
           </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
           <param name="bline">
             <bline type="bline_point" loop="true">
               <entry>
                 <composite type="bline_point">
-                  <c1>
+                  <point>
                     <vector>
-                      <x>0.0000000000</x>
-                      <y>2.0215976238</y>
+                      <x>-0.3882599771</x>
+                      <y>0.1446780860</y>
                     </vector>
-                  </c1>
-                  <c2>
+                  </point>
+                  <width>
                     <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
+                  </width>
+                  <origin>
                     <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
+                  </origin>
+                  <split>
                     <bool value="false"/>
-                  </c4>
-                  <c5>
+                  </split>
+                  <t1>
                     <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0452818027"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
                     </radial_composite>
-                  </c5>
-                  <c6>
+                  </t1>
+                  <t2>
                     <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0452818027"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
                     </radial_composite>
-                  </c6>
+                  </t2>
                 </composite>
               </entry>
               <entry>
                 <composite type="bline_point">
-                  <c1>
+                  <point>
                     <vector>
-                      <x>-1.8619977236</x>
-                      <y>0.3989995122</y>
+                      <x>1.5862575769</x>
+                      <y>-1.8290388584</y>
                     </vector>
-                  </c1>
-                  <c2>
+                  </point>
+                  <width>
                     <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
+                  </width>
+                  <origin>
                     <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
+                  </origin>
+                  <split>
                     <bool value="false"/>
-                  </c4>
-                  <c5>
+                  </split>
+                  <t1>
                     <radial_composite type="vector">
-                      <c0>
+                      <radius>
                         <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
+                      </radius>
+                      <theta>
                         <angle value="0.000000"/>
-                      </c1>
+                      </theta>
                     </radial_composite>
-                  </c5>
-                  <c6>
+                  </t1>
+                  <t2>
                     <radial_composite type="vector">
-                      <c0>
+                      <radius>
                         <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
+                      </radius>
+                      <theta>
                         <angle value="0.000000"/>
-                      </c1>
+                      </theta>
                     </radial_composite>
-                  </c6>
+                  </t2>
                 </composite>
               </entry>
               <entry>
                 <composite type="bline_point">
-                  <c1>
+                  <point>
                     <vector>
-                      <x>-0.9708988070</x>
-                      <y>-1.7821978331</y>
+                      <x>2.7473807335</x>
+                      <y>-0.6132830977</y>
                     </vector>
-                  </c1>
-                  <c2>
+                  </point>
+                  <width>
                     <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
+                  </width>
+                  <origin>
                     <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
+                  </origin>
+                  <split>
                     <bool value="false"/>
-                  </c4>
-                  <c5>
+                  </split>
+                  <t1>
                     <radial_composite type="vector">
-                      <c0>
+                      <radius>
                         <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
+                      </radius>
+                      <theta>
                         <angle value="0.000000"/>
-                      </c1>
+                      </theta>
                     </radial_composite>
-                  </c5>
-                  <c6>
+                  </t1>
+                  <t2>
                     <radial_composite type="vector">
-                      <c0>
+                      <radius>
                         <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
+                      </radius>
+                      <theta>
                         <angle value="0.000000"/>
-                      </c1>
+                      </theta>
                     </radial_composite>
-                  </c6>
+                  </t2>
                 </composite>
               </entry>
               <entry>
                 <composite type="bline_point">
-                  <c1>
+                  <point>
                     <vector>
-                      <x>1.1836985350</x>
-                      <y>-1.7821978331</y>
+                      <x>-0.6219982505</x>
+                      <y>2.7464330196</y>
                     </vector>
-                  </c1>
-                  <c2>
+                  </point>
+                  <width>
                     <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
+                  </width>
+                  <origin>
                     <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
+                  </origin>
+                  <split>
                     <bool value="false"/>
-                  </c4>
-                  <c5>
+                  </split>
+                  <t1>
                     <radial_composite type="vector">
-                      <c0>
+                      <radius>
                         <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
+                      </radius>
+                      <theta>
                         <angle value="0.000000"/>
-                      </c1>
+                      </theta>
                     </radial_composite>
-                  </c5>
-                  <c6>
+                  </t1>
+                  <t2>
                     <radial_composite type="vector">
-                      <c0>
+                      <radius>
                         <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
+                      </radius>
+                      <theta>
                         <angle value="0.000000"/>
-                      </c1>
+                      </theta>
                     </radial_composite>
-                  </c6>
+                  </t2>
                 </composite>
               </entry>
               <entry>
                 <composite type="bline_point">
-                  <c1>
+                  <point>
                     <vector>
-                      <x>1.8619977236</x>
-                      <y>0.3457995653</y>
+                      <x>-2.7577657700</x>
+                      <y>0.6465590596</y>
                     </vector>
-                  </c1>
-                  <c2>
+                  </point>
+                  <width>
                     <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
+                  </width>
+                  <origin>
                     <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
+                  </origin>
+                  <split>
                     <bool value="false"/>
-                  </c4>
-                  <c5>
+                  </split>
+                  <t1>
                     <radial_composite type="vector">
-                      <c0>
+                      <radius>
                         <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
+                      </radius>
+                      <theta>
                         <angle value="0.000000"/>
-                      </c1>
+                      </theta>
                     </radial_composite>
-                  </c5>
-                  <c6>
+                  </t1>
+                  <t2>
                     <radial_composite type="vector">
-                      <c0>
+                      <radius>
                         <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
+                      </radius>
+                      <theta>
                         <angle value="0.000000"/>
-                      </c1>
+                      </theta>
                     </radial_composite>
-                  </c6>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-1.3464418650</x>
+                      <y>-0.8009691834</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
                 </composite>
               </entry>
             </bline>
           </param>
+          <param name="width">
+            <real value="0.3894235314"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="outline" active="true" version="0.2" desc="Outline">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -834,42 +669,954 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="p1">
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
             <vector>
-              <x>2.5355694294</x>
-              <y>-3.3529567719</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="p2">
+          <param name="invert">
+            <bool value="false"/>
+          </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-3.0328524113</x>
+                      <y>0.6490399837</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-0.6215841770</x>
+                      <y>3.0211579800</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>3.0195577145</x>
+                      <y>-0.6100772619</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>1.5893906355</x>
+                      <y>-2.1072096825</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-0.3894239664</x>
+                      <y>-0.1298079938</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-1.3487370014</x>
+                      <y>-1.0772391558</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.1947117657"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
+        </layer>
+        <layer type="PasteCanvas" active="true" version="0.1" desc="polyline gradient">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="origin">
             <vector>
-              <x>-0.6339452267</x>
-              <y>0.8150724769</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="canvas">
+            <canvas>
+              <layer type="region" active="true" version="0.1" desc="NewBLine020&#x533A;&#x57DF;">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>0.000000</r>
+                    <g>0.333333</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="origin">
+                  <vector guid="895648AF64FF88E922C8600A55B74492">
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+                <param name="antialias">
+                  <bool value="true"/>
+                </param>
+                <param name="feather">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="blurtype">
+                  <integer value="1"/>
+                </param>
+                <param name="winding_style">
+                  <integer value="0"/>
+                </param>
+                <param name="bline">
+                  <bline type="bline_point" loop="true" guid="5A5ABC34EE7C8610AB14625649586B65">
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-0.3882599771</x>
+                            <y>0.1446780860</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>1.5862575769</x>
+                            <y>-1.8290388584</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>2.7473807335</x>
+                            <y>-0.6132830977</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-0.6219982505</x>
+                            <y>2.7464330196</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-2.7577657700</x>
+                            <y>0.6465590596</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-1.3464418650</x>
+                            <y>-0.8009691834</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                  </bline>
+                </param>
+              </layer>
+              <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="p1">
+                  <vector>
+                    <x>-1.9775413275</x>
+                    <y>0.3549433053</y>
+                  </vector>
+                </param>
+                <param name="p2">
+                  <vector>
+                    <x>2.0282475948</x>
+                    <y>0.3549433053</y>
+                  </vector>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.793110</r>
+                      <g>0.793110</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.612066</r>
+                      <g>0.612066</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="outline" active="true" version="0.2" desc="white line">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+                <param name="antialias">
+                  <bool value="true"/>
+                </param>
+                <param name="feather">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="blurtype">
+                  <integer value="1"/>
+                </param>
+                <param name="winding_style">
+                  <integer value="0"/>
+                </param>
+                <param name="bline">
+                  <bline type="bline_point" loop="true">
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-0.3882599771</x>
+                            <y>0.1446780860</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="true"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>1.5862575769</x>
+                            <y>-1.8290388584</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>2.7473807335</x>
+                            <y>-0.6132830977</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-0.6219982505</x>
+                            <y>2.7464330196</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-2.7577657700</x>
+                            <y>0.6465590596</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-1.3464418650</x>
+                            <y>-0.8009691834</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="1.0000000000"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="0.0000000000"/>
+                            </radius>
+                            <theta>
+                              <angle value="0.000000"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                  </bline>
+                </param>
+                <param name="width">
+                  <real value="0.1298078438"/>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="sharp_cusps">
+                  <bool value="true"/>
+                </param>
+                <param name="round_tip[0]">
+                  <bool value="true"/>
+                </param>
+                <param name="round_tip[1]">
+                  <bool value="true"/>
+                </param>
+                <param name="loopyness">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="homogeneous_width">
+                  <bool value="true"/>
+                </param>
+              </layer>
+            </canvas>
           </param>
-          <param name="loop">
-            <bool value="false"/>
+          <param name="zoom">
+            <real value="0.0000000000"/>
           </param>
-          <param name="zigzag">
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
             <bool value="false"/>
           </param>
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
         </layer>
       </canvas>
     </param>
@@ -882,5 +1629,11 @@
     <param name="children_lock">
       <bool value="false"/>
     </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/layer_geometry_rectangle_icon.sif b/synfig-studio/images/layer_geometry_rectangle_icon.sif
index 68d4f85..54e793a 100644
--- a/synfig-studio/images/layer_geometry_rectangle_icon.sif
+++ b/synfig-studio/images/layer_geometry_rectangle_icon.sif
@@ -8,7 +8,7 @@
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.2776479721</x>
-        <y>-2.7908685207</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.7199538946</x>
-        <y>-2.7908685207</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7481141090</x>
+              <y>-2.5207901001</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.7473614216</x>
+              <y>-2.5212490559</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.2972397804</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.4988009930</x>
-        <y>2.1499423981</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.2391853333</x>
-        <y>-1.7524058819</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.2391853333</x>
-        <y>1.8903266191</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="rectangle">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -184,12 +146,12 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
-      <canvas width="200" height="200">
-        <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
+      <canvas>
+        <layer type="rectangle" active="true" version="0.2" desc="Rectangle White">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -209,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.9795696735</x>
-              <y>-1.4927902222</y>
+              <x>-2.7475929260</x>
+              <y>2.6462929249</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.9795696735</x>
-              <y>1.6307109594</y>
+              <x>2.7471959591</x>
+              <y>-2.8485701084</y>
             </vector>
           </param>
           <param name="expand">
@@ -226,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="outline" active="true" version="0.2" desc="Outline">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -234,41 +196,217 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="p1">
-            <vector>
-              <x>3.1478400230</x>
-              <y>-2.7908685207</y>
-            </vector>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
           </param>
-          <param name="p2">
+          <param name="origin">
             <vector>
-              <x>-2.7908685207</x>
-              <y>2.5312528610</y>
+              <x>0.0000000000</x>
+              <y>-0.1014123783</y>
             </vector>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
-          </param>
-          <param name="loop">
+          <param name="invert">
             <bool value="false"/>
           </param>
-          <param name="zigzag">
-            <bool value="false"/>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371402"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
           </param>
         </layer>
       </canvas>
diff --git a/synfig-studio/images/layer_geometry_region_icon.sif b/synfig-studio/images/layer_geometry_region_icon.sif
index ceb7b63..1b30d4b 100644
--- a/synfig-studio/images/layer_geometry_region_icon.sif
+++ b/synfig-studio/images/layer_geometry_region_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.1" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
-  <name>Synfig Studio B-Line Icon</name>
-  <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek)</desc>
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+  <name>Synfig Studio Gradient Icon</name>
+  <desc>Placed in the Public Domain in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
-  <meta name="grid_size" content="0.081130 0.081130"/>
+  <meta name="grid_size" content="0.259616 0.259616"/>
   <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="outline" active="true" version="0.2" desc="Line">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,1292 +18,15 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="offset">
-      <vector>
-        <x>0.0377842039</x>
-        <y>-0.1834019721</y>
-      </vector>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="true"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="bline">
-      <bline type="bline_point" loop="false">
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>-2.9584641457</x>
-                <y>-1.9259779453</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="1.0884731428"/>
-                </c0>
-                <c1>
-                  <angle value="63.434952"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="1.0884731428"/>
-                </c0>
-                <c1>
-                  <angle value="63.434952"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>-1.9849041700</x>
-                <y>0.3456619680</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="3.4074599147"/>
-                </c0>
-                <c1>
-                  <angle value="90.000000"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="3.4074599147"/>
-                </c0>
-                <c1>
-                  <angle value="90.000000"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-        <entry>
-          <composite type="bline_point">
-            <c1>
-              <vector>
-                <x>1.4225540161</x>
-                <y>1.8059999943</y>
-              </vector>
-            </c1>
-            <c2>
-              <real value="1.0000000000"/>
-            </c2>
-            <c3>
-              <real value="0.5000000000"/>
-            </c3>
-            <c4>
-              <bool value="false"/>
-            </c4>
-            <c5>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="8.9476338830"/>
-                </c0>
-                <c1>
-                  <angle value="-62.035015"/>
-                </c1>
-              </radial_composite>
-            </c5>
-            <c6>
-              <radial_composite type="vector">
-                <c0>
-                  <real value="8.9476338830"/>
-                </c0>
-                <c1>
-                  <angle value="-62.035015"/>
-                </c1>
-              </radial_composite>
-            </c6>
-          </composite>
-        </entry>
-      </bline>
-    </param>
-    <param name="width">
-      <real value="0.5192313751"/>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="sharp_cusps">
-      <bool value="true"/>
-    </param>
-    <param name="round_tip[0]">
-      <bool value="true"/>
-    </param>
-    <param name="round_tip[1]">
-      <bool value="true"/>
-    </param>
-    <param name="loopyness">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="homogeneous_width">
-      <bool value="true"/>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Vertex and Tangents">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-    <param name="canvas">
-      <canvas>
-        <layer type="rectangle" active="true" version="0.2" desc="Rectangle003">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.000000</r>
-              <g>0.000000</g>
-              <b>0.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="point1">
-            <vector>
-              <x>-2.2716398239</x>
-              <y>-2.7584199905</y>
-            </vector>
-          </param>
-          <param name="point2">
-            <vector>
-              <x>-1.4603400230</x>
-              <y>2.9206800461</y>
-            </vector>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-        </layer>
-        <layer type="rectangle" active="true" version="0.2" desc="Rectangle005">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.039242</r>
-              <g>0.733975</g>
-              <b>0.703853</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="point1">
-            <vector>
-              <x>-2.1093800068</x>
-              <y>-2.5961599350</y>
-            </vector>
-          </param>
-          <param name="point2">
-            <vector>
-              <x>-1.6225999594</x>
-              <y>2.7584199905</y>
-            </vector>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-        </layer>
-        <layer type="circle" active="true" version="0.1" desc="Circle009">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.000000</r>
-              <g>0.000000</g>
-              <b>0.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="radius">
-            <real value="0.7347361115"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="pos">
-            <vector>
-              <x>-1.8659877777</x>
-              <y>2.4338970184</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="falloff">
-            <integer value="2"/>
-          </param>
-        </layer>
-        <layer type="circle" active="true" version="0.1" desc="Circle009">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.000000</r>
-              <g>0.000000</g>
-              <b>0.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="radius">
-            <real value="0.7301691213"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="pos">
-            <vector>
-              <x>-1.8659877777</x>
-              <y>0.0811299011</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="falloff">
-            <integer value="2"/>
-          </param>
-        </layer>
-        <layer type="circle" active="true" version="0.1" desc="Circle009">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.000000</r>
-              <g>0.000000</g>
-              <b>0.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="radius">
-            <real value="0.7302423120"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="pos">
-            <vector>
-              <x>-1.8659877777</x>
-              <y>-2.3527672291</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="falloff">
-            <integer value="2"/>
-          </param>
-        </layer>
-        <layer type="circle" active="true" version="0.1" desc="Circle008">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.537454</r>
-              <g>0.563494</g>
-              <b>0.016721</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="radius">
-            <real value="0.5679823160"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="pos">
-            <vector>
-              <x>-1.8659877777</x>
-              <y>-2.3527672291</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="falloff">
-            <integer value="2"/>
-          </param>
-        </layer>
-        <layer type="circle" active="true" version="0.1" desc="Circle010">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.428529</r>
-              <g>0.100841</g>
-              <b>0.016721</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="radius">
-            <real value="0.5679093166"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="pos">
-            <vector>
-              <x>-1.8659877777</x>
-              <y>0.0811299011</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="falloff">
-            <integer value="2"/>
-          </param>
-        </layer>
-        <layer type="circle" active="true" version="0.1" desc="Circle011">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.233646</r>
-              <g>0.000000</g>
-              <b>0.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="radius">
-            <real value="0.5679093166"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="pos">
-            <vector>
-              <x>-1.8659877777</x>
-              <y>2.4338970184</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="falloff">
-            <integer value="2"/>
-          </param>
-        </layer>
-      </canvas>
-    </param>
-    <param name="zoom">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="time_offset">
-      <time value="0s"/>
-    </param>
-    <param name="children_lock">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Pen Nib">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-    <param name="canvas">
-      <canvas>
-        <layer type="region" active="true" version="0.1" desc="NewBLine020 Region">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.844853</r>
-              <g>0.828491</g>
-              <b>0.118994</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="offset">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="antialias">
-            <bool value="true"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="blurtype">
-            <integer value="1"/>
-          </param>
-          <param name="bline">
-            <bline type="bline_point" loop="true" guid="27F5FA0763D12F55534AE6AED6D4CDCA">
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>0.3245196044</x>
-                      <y>-0.3245196044</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="1.9471176568"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="1.9471176568"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>0.9735588431</x>
-                      <y>1.1358186007</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>0.9735588431</x>
-                      <y>1.6225980520</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="true"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.6225980520</x>
-                      <y>1.6225980520</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="true"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.6225980520</x>
-                      <y>1.1358186007</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>2.2716372013</x>
-                      <y>-0.3245196044</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="1.9471176568"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="1.9471176568"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.7848578691</x>
-                      <y>-1.2980784178</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>0.8112990260</x>
-                      <y>-1.2980784178</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-            </bline>
-          </param>
-        </layer>
-        <layer type="linear_gradient" active="true" version="0.0">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="13"/>
-          </param>
-          <param name="p1">
-            <vector>
-              <x>1.9471199512</x>
-              <y>-1.2980799675</y>
-            </vector>
-          </param>
-          <param name="p2">
-            <vector>
-              <x>0.4867799878</x>
-              <y>1.4603400230</y>
-            </vector>
-          </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>1.000000</r>
-                <g>0.537059</g>
-                <b>0.001616</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="0.978495">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
-          </param>
-          <param name="loop">
-            <bool value="false"/>
-          </param>
-          <param name="zigzag">
-            <bool value="false"/>
-          </param>
-        </layer>
-        <layer type="outline" active="true" version="0.2" desc="NewBLine020 Outline">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.828491</r>
-              <g>0.537454</g>
-              <b>0.003862</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="offset">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="antialias">
-            <bool value="true"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="blurtype">
-            <integer value="1"/>
-          </param>
-          <param name="bline">
-            <bline type="bline_point" loop="true" guid="27F5FA0763D12F55534AE6AED6D4CDCA">
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>0.3245196044</x>
-                      <y>-0.3245196044</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="1.9471176568"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="1.9471176568"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>0.9735588431</x>
-                      <y>1.1358186007</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>0.9735588431</x>
-                      <y>1.6225980520</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="true"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.6225980520</x>
-                      <y>1.6225980520</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="true"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.6225980520</x>
-                      <y>1.1358186007</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.4867794142"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>2.2716372013</x>
-                      <y>-0.3245196044</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="1.9471176568"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="1.9471176568"/>
-                      </c0>
-                      <c1>
-                        <angle value="-90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.7848578691</x>
-                      <y>-1.2980784178</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>0.8112990260</x>
-                      <y>-1.2980784178</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-            </bline>
-          </param>
-          <param name="width">
-            <real value="0.3245196095"/>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="sharp_cusps">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[0]">
-            <bool value="false"/>
-          </param>
-          <param name="round_tip[1]">
-            <bool value="false"/>
-          </param>
-          <param name="loopyness">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="homogeneous_width">
-            <bool value="true"/>
-          </param>
-        </layer>
-        <layer type="outline" active="true" version="0.2" desc="NewBLine021 Outline">
+    <param name="origin">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -1313,171 +36,56 @@
           <param name="blend_method">
             <integer value="0"/>
           </param>
-          <param name="color">
-            <color>
-              <r>0.000000</r>
-              <g>0.000000</g>
-              <b>0.000000</b>
-              <a>1.000000</a>
-            </color>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.700000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
           </param>
-          <param name="offset">
+          <param name="center">
             <vector>
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>-1.1364002228</y>
             </vector>
           </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="antialias">
-            <bool value="true"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="blurtype">
-            <integer value="1"/>
-          </param>
-          <param name="bline">
-            <bline type="bline_point" loop="false">
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.2980784178</x>
-                      <y>0.0000000000</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="6.3281323846"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="6.3281323846"/>
-                      </c0>
-                      <c1>
-                        <angle value="90.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-              <entry>
-                <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.2980784178</x>
-                      <y>1.7848578691</y>
-                    </vector>
-                  </c1>
-                  <c2>
-                    <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
-                    <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
-                    <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.0000000000"/>
-                      </c0>
-                      <c1>
-                        <angle value="0.000000"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
-                </composite>
-              </entry>
-            </bline>
-          </param>
-          <param name="width">
-            <real value="0.3245196095"/>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="sharp_cusps">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[0]">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[1]">
-            <bool value="true"/>
+          <param name="radius">
+            <real value="1.8879068686"/>
           </param>
-          <param name="loopyness">
-            <real value="1.0000000000"/>
+          <param name="loop">
+            <bool value="false"/>
           </param>
-          <param name="homogeneous_width">
-            <bool value="true"/>
+          <param name="zigzag">
+            <bool value="false"/>
           </param>
         </layer>
-        <layer type="circle" active="true" version="0.1" desc="Circle012">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
+        <layer type="stretch" active="true" version="0.1">
           <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.000000</r>
-              <g>0.000000</g>
-              <b>0.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="radius">
-            <real value="0.3628239534"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="pos">
             <vector>
-              <x>1.2980784178</x>
-              <y>-0.1622598022</y>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
             </vector>
           </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="falloff">
-            <integer value="2"/>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
           </param>
         </layer>
       </canvas>
@@ -1491,8 +99,14 @@
     <param name="children_lock">
       <bool value="false"/>
     </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Pen handle">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="region">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -1510,7 +124,7 @@
     </param>
     <param name="canvas">
       <canvas>
-        <layer type="rectangle" active="true" version="0.2" desc="Rectangle006">
+        <layer type="region" active="true" version="0.1">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -1522,66 +136,153 @@
           </param>
           <param name="color">
             <color>
-              <r>0.011238</r>
-              <g>0.065656</g>
-              <b>0.247404</b>
+              <r>0.531049</r>
+              <g>0.531049</g>
+              <b>0.531049</b>
               <a>1.000000</a>
             </color>
           </param>
-          <param name="point1">
-            <vector>
-              <x>0.6490392089</x>
-              <y>-1.4603382349</y>
-            </vector>
-          </param>
-          <param name="point2">
+          <param name="origin">
             <vector>
-              <x>1.9471176863</x>
-              <y>-3.0829362869</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
           <param name="invert">
             <bool value="false"/>
           </param>
-        </layer>
-        <layer type="rectangle" active="true" version="0.2" desc="Rectangle007">
-          <param name="z_depth">
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
             <real value="0.0000000000"/>
           </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
+          <param name="blurtype">
+            <integer value="1"/>
           </param>
-          <param name="blend_method">
+          <param name="winding_style">
             <integer value="0"/>
           </param>
-          <param name="color">
-            <color>
-              <r>0.172611</r>
-              <g>0.349351</g>
-              <b>0.629024</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="point1">
-            <vector>
-              <x>0.9735588431</x>
-              <y>-1.7848578691</y>
-            </vector>
-          </param>
-          <param name="point2">
-            <vector>
-              <x>1.6225980520</x>
-              <y>-3.0829362869</y>
-            </vector>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
+          <param name="bline">
+            <bline type="bline_point" loop="false">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector guid="6015081E8F863E1963EAAD0A17A9CEE7">
+                      <x>-0.9317516685</x>
+                      <y>3.1153917313</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector" guid="28978E83862C6E6A871E7D6144BCC139">
+                      <radius>
+                        <real value="8.2885836692"/>
+                      </radius>
+                      <theta>
+                        <angle value="-142.218674"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="8.2885836692"/>
+                      </radius>
+                      <theta>
+                        <angle value="-142.218674"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector guid="184B2D7468FC259543FF7E2882B13CA1">
+                      <x>-2.3365437984</x>
+                      <y>-2.1337192059</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector" guid="BAE4EB6E71672877EF1B67F6B4C4AF6B">
+                      <radius>
+                        <real value="4.4920659065"/>
+                      </radius>
+                      <theta>
+                        <angle value="-20.289635"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="4.4920659065"/>
+                      </radius>
+                      <theta>
+                        <angle value="-20.289635"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector guid="5BD6271D5C61854F888054C813260923">
+                      <x>3.1153917313</x>
+                      <y>0.5440223813</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector" guid="5A85B589C0F83A7149E4458D6A65297D">
+                      <radius>
+                        <real value="6.6590191215"/>
+                      </radius>
+                      <theta>
+                        <angle value="62.105476"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="6.6590191215"/>
+                      </radius>
+                      <theta>
+                        <angle value="62.105476"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
           </param>
         </layer>
         <layer type="outline" active="true" version="0.2">
@@ -1592,17 +293,17 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="0"/>
+            <integer value="13"/>
           </param>
           <param name="color">
             <color>
-              <r>0.011238</r>
-              <g>0.065656</g>
-              <b>0.247404</b>
+              <r>0.325037</r>
+              <g>0.325037</g>
+              <b>0.325037</b>
               <a>1.000000</a>
             </color>
           </param>
-          <param name="offset">
+          <param name="origin">
             <vector>
               <x>0.0000000000</x>
               <y>0.0000000000</y>
@@ -1615,95 +316,137 @@
             <bool value="true"/>
           </param>
           <param name="feather">
-            <real value="0.0000000000"/>
+            <real value="0.1014123780"/>
           </param>
           <param name="blurtype">
             <integer value="1"/>
           </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
           <param name="bline">
             <bline type="bline_point" loop="false">
               <entry>
                 <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.3067390919</x>
-                      <y>-3.0541522503</y>
+                  <point>
+                    <vector guid="6015081E8F863E1963EAAD0A17A9CEE7">
+                      <x>-0.9317516685</x>
+                      <y>3.1153917313</y>
                     </vector>
-                  </c1>
-                  <c2>
+                  </point>
+                  <width>
                     <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
+                  </width>
+                  <origin>
                     <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
+                  </origin>
+                  <split>
                     <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.8970700634"/>
-                      </c0>
-                      <c1>
-                        <angle value="89.961716"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.8970700634"/>
-                      </c0>
-                      <c1>
-                        <angle value="89.961716"/>
-                      </c1>
-                    </radial_composite>
-                  </c6>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector" guid="28978E83862C6E6A871E7D6144BCC139">
+                      <radius>
+                        <real value="8.2885836692"/>
+                      </radius>
+                      <theta>
+                        <angle value="-142.218674"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="7.5222092293"/>
+                      </radius>
+                      <theta>
+                        <angle value="-124.073631"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
                 </composite>
               </entry>
               <entry>
                 <composite type="bline_point">
-                  <c1>
-                    <vector>
-                      <x>1.3275415897</x>
-                      <y>-2.1596431732</y>
+                  <point>
+                    <vector guid="184B2D7468FC259543FF7E2882B13CA1">
+                      <x>-2.3365437984</x>
+                      <y>-2.1337192059</y>
                     </vector>
-                  </c1>
-                  <c2>
+                  </point>
+                  <width>
                     <real value="1.0000000000"/>
-                  </c2>
-                  <c3>
+                  </width>
+                  <origin>
                     <real value="0.5000000000"/>
-                  </c3>
-                  <c4>
+                  </origin>
+                  <split>
                     <bool value="false"/>
-                  </c4>
-                  <c5>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.8970700634"/>
-                      </c0>
-                      <c1>
-                        <angle value="88.331123"/>
-                      </c1>
-                    </radial_composite>
-                  </c5>
-                  <c6>
-                    <radial_composite type="vector">
-                      <c0>
-                        <real value="0.8970700634"/>
-                      </c0>
-                      <c1>
-                        <angle value="88.331123"/>
-                      </c1>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector" guid="BAE4EB6E71672877EF1B67F6B4C4AF6B">
+                      <radius>
+                        <real value="4.4920659065"/>
+                      </radius>
+                      <theta>
+                        <angle value="-20.289635"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="4.2870497244"/>
+                      </radius>
+                      <theta>
+                        <angle value="-43.389694"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector guid="5BD6271D5C61854F888054C813260923">
+                      <x>3.1153917313</x>
+                      <y>0.5440223813</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector" guid="5A85B589C0F83A7149E4458D6A65297D">
+                      <radius>
+                        <real value="6.6590191215"/>
+                      </radius>
+                      <theta>
+                        <angle value="62.105476"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.4109151065"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
                     </radial_composite>
-                  </c6>
+                  </t2>
                 </composite>
               </entry>
             </bline>
           </param>
           <param name="width">
-            <real value="0.3245196095"/>
+            <real value="0.1521185669"/>
           </param>
           <param name="expand">
             <real value="0.0000000000"/>
@@ -1712,7 +455,7 @@
             <bool value="true"/>
           </param>
           <param name="round_tip[0]">
-            <bool value="false"/>
+            <bool value="true"/>
           </param>
           <param name="round_tip[1]">
             <bool value="true"/>
@@ -1735,79 +478,11 @@
     <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="shade" active="true" version="0.2">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="12"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.111449</r>
-        <g>0.112213</g>
-        <b>0.111449</b>
-        <a>0.111111</a>
-      </color>
-    </param>
-    <param name="offset">
-      <vector>
-        <x>0.2000000030</x>
-        <y>-0.2000000030</y>
-      </vector>
-    </param>
-    <param name="size">
-      <vector>
-        <x>0.1649046391</x>
-        <y>0.1649046391</y>
-      </vector>
-    </param>
-    <param name="type">
-      <integer value="1"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Clip shading">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="19"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>0.4867794216</x>
-        <y>-3.0829362869</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.5961568356</x>
-        <y>-3.2451961040</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/layer_geometry_solidcolor_icon.sif b/synfig-studio/images/layer_geometry_solidcolor_icon.sif
index 73c8b73..b6b5bb8 100644
--- a/synfig-studio/images/layer_geometry_solidcolor_icon.sif
+++ b/synfig-studio/images/layer_geometry_solidcolor_icon.sif
@@ -1,226 +1,24 @@
 <?xml version="1.0"?>
-<canvas version="0.3" width="128" height="128" xres="2952.755900" yres="2952.755900" view-box="-1.000000 1.000000 1.000000 -1.000000" antialias="1" fps="30.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
-  <name>Untitled0</name>
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245189 3.245189 3.245189 -3.245189" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+  <name>Synfig Studio SolidColor Icon</name>
+  <desc>Placed in the Public Domain in 2010 by Yu Chen (jcome)</desc>
+  <meta name="grid_show" content="0"/>
+  <meta name="grid_size" content="0.250000 0.250000"/>
+  <meta name="grid_snap" content="0"/>
+  <meta name="guide_show" content="1"/>
+  <meta name="guide_snap" content="0"/>
+  <meta name="onion_skin" content="0"/>
   <defs>
-    <canvas id="Layer" bgcolor="0.500000 0.500000 0.500000 1.000000">
-      <layer type="polygon" active="true" version="0.1">
-        <param name="z_depth">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="amount">
-          <real value="0.5000000000"/>
-        </param>
-        <param name="blend_method">
-          <integer value="0"/>
-        </param>
-        <param name="color">
-          <color>
-            <r>0.000000</r>
-            <g>0.000000</g>
-            <b>0.000000</b>
-            <a>1.000000</a>
-          </color>
-        </param>
-        <param name="offset">
-          <vector>
-            <x>0.1000000015</x>
-            <y>-0.1000000015</y>
-          </vector>
-        </param>
-        <param name="invert">
-          <bool value="false"/>
-        </param>
-        <param name="antialias">
-          <bool value="true"/>
-        </param>
-        <param name="feather">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="blurtype">
-          <integer value="1"/>
-        </param>
-        <param name="vector_list">
-          <dynamic_list type="vector">
-            <entry>
-              <vector>
-                <x>-0.8000000119</x>
-                <y>0.8000000119</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>-0.8000000119</x>
-                <y>-0.2000000030</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.2000000030</x>
-                <y>-0.2000000030</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.2000000030</x>
-                <y>0.8000000119</y>
-              </vector>
-            </entry>
-          </dynamic_list>
-        </param>
-      </layer>
-      <layer type="blur" active="true" version="0.2">
-        <param name="z_depth">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="amount">
-          <real value="1.0000000000"/>
-        </param>
-        <param name="blend_method">
-          <integer value="1"/>
-        </param>
-        <param name="size">
-          <vector>
-            <x>0.2000000030</x>
-            <y>0.2000000030</y>
-          </vector>
-        </param>
-        <param name="type">
-          <integer value="1"/>
-        </param>
-      </layer>
-      <layer type="polygon" active="true" version="0.1">
-        <param name="z_depth">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="amount">
-          <real value="1.0000000000"/>
-        </param>
-        <param name="blend_method">
-          <integer value="0"/>
-        </param>
-        <param name="color">
-          <color>
-            <r>0.000000</r>
-            <g>0.000000</g>
-            <b>0.000000</b>
-            <a>1.000000</a>
-          </color>
-        </param>
-        <param name="offset">
-          <vector>
-            <x>0.0000000000</x>
-            <y>0.0000000000</y>
-          </vector>
-        </param>
-        <param name="invert">
-          <bool value="false"/>
-        </param>
-        <param name="antialias">
-          <bool value="true"/>
-        </param>
-        <param name="feather">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="blurtype">
-          <integer value="1"/>
-        </param>
-        <param name="vector_list">
-          <dynamic_list type="vector">
-            <entry>
-              <vector>
-                <x>-0.8000000119</x>
-                <y>0.8000000119</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>-0.8000000119</x>
-                <y>-0.2000000030</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.2000000030</x>
-                <y>-0.2000000030</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.2000000030</x>
-                <y>0.8000000119</y>
-              </vector>
-            </entry>
-          </dynamic_list>
-        </param>
-      </layer>
-      <layer type="polygon" active="true" version="0.1">
-        <param name="z_depth">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="amount">
-          <real value="1.0000000000"/>
-        </param>
-        <param name="blend_method">
-          <integer value="0"/>
-        </param>
-        <param name="color">
-          <color>
-            <r>1.000000</r>
-            <g>0.900000</g>
-            <b>0.600000</b>
-            <a>1.000000</a>
-          </color>
-        </param>
-        <param name="offset">
-          <vector>
-            <x>0.0000000000</x>
-            <y>0.0000000000</y>
-          </vector>
-        </param>
-        <param name="invert">
-          <bool value="false"/>
-        </param>
-        <param name="antialias">
-          <bool value="true"/>
-        </param>
-        <param name="feather">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="blurtype">
-          <integer value="1"/>
-        </param>
-        <param name="vector_list">
-          <dynamic_list type="vector">
-            <entry>
-              <vector>
-                <x>-0.6999999881</x>
-                <y>0.6999999881</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>-0.6999999881</x>
-                <y>-0.1000000015</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.1000000015</x>
-                <y>-0.1000000015</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.1000000015</x>
-                <y>0.6999999881</y>
-              </vector>
-            </entry>
-          </dynamic_list>
-        </param>
-      </layer>
-    </canvas>
+    <color id="outline1-color">
+      <r>0.000000</r>
+      <g>0.000000</g>
+      <b>0.000000</b>
+      <a>1.000000</a>
+    </color>
+    <real value="0.1600000000" id="outline1-width"/>
+    <real value="5.7427342595" id="character-outlinewidth"/>
   </defs>
-  <layer type="PasteCanvas" active="true" version="0.1">
+  <layer type="SolidColor" active="true" version="0.1">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -230,103 +28,13 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="origin">
-      <vector>
-        <x>0.5000000000</x>
-        <y>-0.5000000000</y>
-      </vector>
-    </param>
-    <param name="canvas" use="Layer"/>
-    <param name="zoom">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="time_offset">
-      <time value="0f"/>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>0.2000000030</x>
-        <y>-0.2000000030</y>
-      </vector>
-    </param>
-    <param name="canvas" use="Layer"/>
-    <param name="zoom">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="time_offset">
-      <time value="0f"/>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>-0.1000000015</x>
-        <y>0.1000000015</y>
-      </vector>
-    </param>
-    <param name="canvas" use="Layer"/>
-    <param name="zoom">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="time_offset">
-      <time value="0f"/>
-    </param>
-  </layer>
-  <layer type="circle" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="13"/>
-    </param>
     <param name="color">
       <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
+        <r>0.456263</r>
+        <g>0.456263</g>
+        <b>0.456263</b>
         <a>1.000000</a>
       </color>
     </param>
-    <param name="radius">
-      <real value="1.5000000000"/>
-    </param>
-    <param name="feather">
-      <real value="1.5000000075"/>
-    </param>
-    <param name="pos">
-      <vector>
-        <x>-0.6999999881</x>
-        <y>0.6999999881</y>
-      </vector>
-    </param>
-    <param name="invert">
-      <bool value="true"/>
-    </param>
-    <param name="falloff">
-      <integer value="2"/>
-    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/layer_geometry_star_icon.sif b/synfig-studio/images/layer_geometry_star_icon.sif
index b933e42..f2f4830 100644
--- a/synfig-studio/images/layer_geometry_star_icon.sif
+++ b/synfig-studio/images/layer_geometry_star_icon.sif
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<canvas version="0.5" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Star Icon</name>
-  <desc>Placed in the Public Domain in 2008 by Carlos L&#xF3;pez (Genete)</desc>
+  <desc>Placed in the Public Domain in 2008 by Carlos L&#xF3;pez (Genete), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.129808 0.129808"/>
   <meta name="grid_snap" content="0"/>
@@ -246,7 +246,7 @@
       </entry>
     </bline>
   </defs>
-  <layer type="radial_gradient" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -256,169 +256,95 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.021505">
-          <r>0.036189</r>
-          <g>0.036189</g>
-          <b>0.036189</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="0.564516">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>0.731343</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-    <param name="radius">
-      <real value="1.7765365254"/>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="stretch" active="true" version="0.1">
-    <param name="amount">
-      <vector>
-        <x>1.6070324183</x>
-        <y>0.3102017045</y>
-      </vector>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.0000000000</x>
-        <y>-3.4489021301</y>
-      </vector>
-    </param>
-  </layer>
-  <layer type="star" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="offset">
+    <param name="origin">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="true"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.500000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.3727831841</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
     </param>
-    <param name="feather">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="winding_style">
-      <integer value="0"/>
-    </param>
-    <param name="radius1">
-      <real value="2.9855804071"/>
-    </param>
-    <param name="radius2">
-      <real value="1.4927902036"/>
-    </param>
-    <param name="angle">
-      <angle value="90.000000"/>
-    </param>
-    <param name="points">
-      <integer value="5"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="regular_polygon">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="star" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="offset">
+    <param name="focus">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="true"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="winding_style">
-      <integer value="0"/>
-    </param>
-    <param name="radius1">
-      <real value="2.4663490320"/>
-    </param>
-    <param name="radius2">
-      <real value="1.2331745160"/>
-    </param>
-    <param name="angle">
-      <angle value="90.000000"/>
-    </param>
-    <param name="points">
-      <integer value="5"/>
-    </param>
-    <param name="regular_polygon">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="star">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -436,7 +362,7 @@
     </param>
     <param name="canvas">
       <canvas>
-        <layer type="star" active="true" version="0.1">
+        <layer type="star" active="true" version="0.1" desc="Star Black">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -454,10 +380,10 @@
               <a>1.000000</a>
             </color>
           </param>
-          <param name="offset">
-            <vector>
+          <param name="origin">
+            <vector guid="FE13484A5322D77FE94E6E52EC4AE9CC">
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>-0.1658886075</y>
             </vector>
           </param>
           <param name="invert">
@@ -476,10 +402,10 @@
             <integer value="0"/>
           </param>
           <param name="radius1">
-            <real value="1.9471176568"/>
+            <real value="3.3466084726"/>
           </param>
           <param name="radius2">
-            <real value="0.9735588284"/>
+            <real value="1.6733042363"/>
           </param>
           <param name="angle">
             <angle value="90.000000"/>
@@ -491,7 +417,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="star" active="true" version="0.1" desc="Star White">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -499,42 +425,188 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="p1">
-            <vector>
-              <x>2.4688332081</x>
-              <y>-3.3694140911</y>
+          <param name="color">
+            <color>
+              <r>1.000000</r>
+              <g>1.000000</g>
+              <b>1.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
+            <vector guid="FE13484A5322D77FE94E6E52EC4AE9CC">
+              <x>0.0000000000</x>
+              <y>-0.1658886075</y>
             </vector>
           </param>
-          <param name="p2">
+          <param name="invert">
+            <bool value="false"/>
+          </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="radius1">
+            <real value="2.6874280159"/>
+          </param>
+          <param name="radius2">
+            <real value="1.3437140080"/>
+          </param>
+          <param name="angle">
+            <angle value="90.000000"/>
+          </param>
+          <param name="points">
+            <integer value="5"/>
+          </param>
+          <param name="regular_polygon">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="PasteCanvas" active="true" version="0.1" desc="Star Gradient">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="origin">
             <vector>
-              <x>-0.5900356174</x>
-              <y>0.8074172139</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="canvas">
+            <canvas>
+              <layer type="star" active="true" version="0.1" desc="Star White">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>0.893289</r>
+                    <g>0.893289</g>
+                    <b>0.893289</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>-0.1658886075</y>
+                  </vector>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+                <param name="antialias">
+                  <bool value="true"/>
+                </param>
+                <param name="feather">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="blurtype">
+                  <integer value="1"/>
+                </param>
+                <param name="winding_style">
+                  <integer value="0"/>
+                </param>
+                <param name="radius1">
+                  <real value="2.0282475592"/>
+                </param>
+                <param name="radius2">
+                  <real value="1.0141237796"/>
+                </param>
+                <param name="angle">
+                  <angle value="90.000000"/>
+                </param>
+                <param name="points">
+                  <integer value="5"/>
+                </param>
+                <param name="regular_polygon">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="p1">
+                  <vector>
+                    <x>-1.9775413275</x>
+                    <y>0.3549433053</y>
+                  </vector>
+                </param>
+                <param name="p2">
+                  <vector>
+                    <x>2.0282475948</x>
+                    <y>0.3549433053</y>
+                  </vector>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.793110</r>
+                      <g>0.793110</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.612066</r>
+                      <g>0.612066</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
           </param>
-          <param name="loop">
-            <bool value="false"/>
+          <param name="zoom">
+            <real value="0.0000000000"/>
           </param>
-          <param name="zigzag">
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
             <bool value="false"/>
           </param>
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
         </layer>
       </canvas>
     </param>
@@ -547,5 +619,11 @@
     <param name="children_lock">
       <bool value="false"/>
     </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/layer_gradient_conical_icon.sif b/synfig-studio/images/layer_gradient_conical_icon.sif
index 3e02ddc..1ec62c9 100644
--- a/synfig-studio/images/layer_gradient_conical_icon.sif
+++ b/synfig-studio/images/layer_gradient_conical_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.7" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Conical Gradient Icon</name>
-  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman</desc>
+  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.1153881550</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.5576940775</x>
-        <y>-3.1153881550</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7088961601</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.1896641254</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.3365411758</x>
-        <y>2.3365411758</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.0769255161</x>
-        <y>-2.0769255161</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.0769255161</x>
-        <y>2.0769255161</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="conical gradient">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -184,7 +146,7 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
@@ -209,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.8173098564</x>
-              <y>-1.8173098564</y>
+              <x>-2.5961599350</x>
+              <y>2.4484515190</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.8173098564</x>
-              <y>1.8173098564</y>
+              <x>2.5961599350</x>
+              <y>-2.7376513481</y>
             </vector>
           </param>
           <param name="expand">
@@ -226,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="conical_gradient" active="true" version="0.1">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -234,36 +196,330 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>0.000000</r>
-                <g>0.000000</g>
-                <b>0.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1126711369</x>
+                    <y>-2.2395110130</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1019213200</x>
+                    <y>1.9798951149</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="conical_gradient" active="true" version="0.1">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.893289</r>
+                      <g>0.893289</g>
+                      <b>0.893289</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.000000</r>
+                      <g>0.000000</g>
+                      <b>0.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="center">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="angle">
+                  <angle value="-225.000000"/>
+                </param>
+                <param name="symmetric">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
+          </param>
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
+            <bool value="false"/>
           </param>
-          <param name="center">
+          <param name="focus">
             <vector>
               <x>0.0000000000</x>
               <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="angle">
-            <angle value="-225.000000"/>
+        </layer>
+        <layer type="outline" active="true" version="0.2" desc="Outline">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-0.1014123783</y>
+            </vector>
           </param>
-          <param name="symmetric">
+          <param name="invert">
             <bool value="false"/>
           </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.7395687250"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.3365438879"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371402"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
         </layer>
       </canvas>
     </param>
diff --git a/synfig-studio/images/layer_gradient_curve_icon.sif b/synfig-studio/images/layer_gradient_curve_icon.sif
index b7f7323..ed69c8d 100644
--- a/synfig-studio/images/layer_gradient_curve_icon.sif
+++ b/synfig-studio/images/layer_gradient_curve_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.7" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Curve Gradient Icon</name>
-  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman</desc>
+  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.1153881550</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.5576940775</x>
-        <y>-3.1153881550</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7088961601</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.1896641254</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.3365411758</x>
-        <y>2.3365411758</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.0769255161</x>
-        <y>-2.0769255161</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.0769255161</x>
-        <y>2.0769255161</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="curve gradient">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -184,7 +146,7 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
@@ -209,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.8173098564</x>
-              <y>-1.8173098564</y>
+              <x>-2.5961599350</x>
+              <y>2.4484515190</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.8173098564</x>
-              <y>1.8173098564</y>
+              <x>2.5961599350</x>
+              <y>-2.7376513481</y>
             </vector>
           </param>
           <param name="expand">
@@ -226,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="curve_gradient" active="true" version="0.0">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -234,7 +196,7 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
           <param name="origin">
             <vector>
@@ -242,45 +204,346 @@
               <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="width">
-            <real value="0.0486779414"/>
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1126711369</x>
+                    <y>-2.2395110130</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1019213200</x>
+                    <y>1.9798951149</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="curve_gradient" active="true" version="0.0">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="width">
+                  <real value="0.0486779414"/>
+                </param>
+                <param name="bline">
+                  <bline type="bline_point" loop="false">
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-0.4803912044</x>
+                            <y>2.8805587292</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="27.0814124101"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="5.1701882017"/>
+                            </radius>
+                            <theta>
+                              <angle value="-118.054489"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="5.1701882017"/>
+                            </radius>
+                            <theta>
+                              <angle value="-118.054489"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>-1.1140987873</x>
+                            <y>-0.3411288857</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="26.4754331979"/>
+                        </width>
+                        <origin>
+                          <real value="0.4823928177"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="1.8779869414"/>
+                            </radius>
+                            <theta>
+                              <angle value="-37.637039"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="1.8779869414"/>
+                            </radius>
+                            <theta>
+                              <angle value="-37.637039"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>0.9168317318</x>
+                            <y>-0.0733363181</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="26.9595989088"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.2236897445"/>
+                            </radius>
+                            <theta>
+                              <angle value="-29.832756"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="3.2236897445"/>
+                            </radius>
+                            <theta>
+                              <angle value="-29.832756"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                    <entry>
+                      <composite type="bline_point">
+                        <point>
+                          <vector>
+                            <x>0.0827908292</x>
+                            <y>-3.3328418732</y>
+                          </vector>
+                        </point>
+                        <width>
+                          <real value="27.1030889090"/>
+                        </width>
+                        <origin>
+                          <real value="0.5000000000"/>
+                        </origin>
+                        <split>
+                          <bool value="false"/>
+                        </split>
+                        <t1>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="2.3007110706"/>
+                            </radius>
+                            <theta>
+                              <angle value="-128.530167"/>
+                            </theta>
+                          </radial_composite>
+                        </t1>
+                        <t2>
+                          <radial_composite type="vector">
+                            <radius>
+                              <real value="2.3007110706"/>
+                            </radius>
+                            <theta>
+                              <angle value="-128.530167"/>
+                            </theta>
+                          </radial_composite>
+                        </t2>
+                      </composite>
+                    </entry>
+                  </bline>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.893289</r>
+                      <g>0.893289</g>
+                      <b>0.893289</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.000000</r>
+                      <g>0.000000</g>
+                      <b>0.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+                <param name="perpendicular">
+                  <bool value="false"/>
+                </param>
+                <param name="fast">
+                  <bool value="true"/>
+                </param>
+              </layer>
+            </canvas>
+          </param>
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
+            <bool value="false"/>
+          </param>
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+        </layer>
+        <layer type="outline" active="true" version="0.2" desc="Outline">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-0.1014123783</y>
+            </vector>
+          </param>
+          <param name="invert">
+            <bool value="false"/>
+          </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
           </param>
           <param name="bline">
-            <bline type="bline_point" loop="false">
+            <bline type="bline_point" loop="true">
               <entry>
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-0.4803912044</x>
-                      <y>2.8805587292</y>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
                     </vector>
                   </point>
                   <width>
-                    <real value="27.0814124101"/>
+                    <real value="1.0000000000"/>
                   </width>
                   <origin>
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="5.1701882017"/>
+                        <real value="2.7395687250"/>
                       </radius>
                       <theta>
-                        <angle value="-118.054489"/>
+                        <angle value="-90.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="5.1701882017"/>
+                        <real value="2.3365438879"/>
                       </radius>
                       <theta>
-                        <angle value="-118.054489"/>
+                        <angle value="0.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -290,36 +553,36 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-1.1140987873</x>
-                      <y>-0.3411288857</y>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
                     </vector>
                   </point>
                   <width>
-                    <real value="26.4754331979"/>
+                    <real value="1.0000000000"/>
                   </width>
                   <origin>
-                    <real value="0.4823928177"/>
+                    <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="1.8779869414"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="-37.637039"/>
+                        <angle value="0.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="1.8779869414"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="-37.637039"/>
+                        <angle value="-270.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -329,36 +592,36 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>0.9168317318</x>
-                      <y>-0.0733363181</y>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
                     </vector>
                   </point>
                   <width>
-                    <real value="26.9595989088"/>
+                    <real value="1.0000000000"/>
                   </width>
                   <origin>
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="3.2236897445"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="-29.832756"/>
+                        <angle value="90.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="3.2236897445"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="-29.832756"/>
+                        <angle value="180.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -368,36 +631,36 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>0.0827908292</x>
-                      <y>-3.3328418732</y>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
                     </vector>
                   </point>
                   <width>
-                    <real value="27.1030889090"/>
+                    <real value="1.0000000000"/>
                   </width>
                   <origin>
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="2.3007110706"/>
+                        <real value="0.7788479626"/>
                       </radius>
                       <theta>
-                        <angle value="-128.530167"/>
+                        <angle value="-180.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="2.3007110706"/>
+                        <real value="0.7788479626"/>
                       </radius>
                       <theta>
-                        <angle value="-128.530167"/>
+                        <angle value="-90.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -405,32 +668,25 @@
               </entry>
             </bline>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>0.000000</r>
-                <g>0.000000</g>
-                <b>0.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="width">
+            <real value="0.3042371402"/>
           </param>
-          <param name="loop">
-            <bool value="false"/>
+          <param name="expand">
+            <real value="0.0000000000"/>
           </param>
-          <param name="zigzag">
-            <bool value="false"/>
+          <param name="sharp_cusps">
+            <bool value="true"/>
           </param>
-          <param name="perpendicular">
-            <bool value="false"/>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
           </param>
-          <param name="fast">
+          <param name="homogeneous_width">
             <bool value="true"/>
           </param>
         </layer>
diff --git a/synfig-studio/images/layer_gradient_lineal_icon.sif b/synfig-studio/images/layer_gradient_lineal_icon.sif
index e5e8ab6..4335dfa 100644
--- a/synfig-studio/images/layer_gradient_lineal_icon.sif
+++ b/synfig-studio/images/layer_gradient_lineal_icon.sif
@@ -1,21 +1,14 @@
 <?xml version="1.0"?>
 <canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
-  <name>Synfig Studio Gradient Icon</name>
+  <name>Synfig Studio Linear Gradient Icon</name>
   <desc>Placed in the Public Domain in 2007 by Chris Norman (pixelgeek), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <defs>
-    <vector id="duck1_orig">
-      <x>-1.6735321283</x>
-      <y>1.6797120571</y>
-    </vector>
-    <real value="0.4218754923" id="duck_outline"/>
-  </defs>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -25,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.1153881550</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.5576940775</x>
-        <y>-3.1153881550</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7088961601</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.1896641254</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.3365411758</x>
-        <y>2.3365411758</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.0769255161</x>
-        <y>-2.0769255161</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.0769255161</x>
-        <y>2.0769255161</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="linear gradient">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -191,11 +146,11 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
-      <canvas width="200" height="200">
+      <canvas>
         <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
           <param name="z_depth">
             <real value="0.0000000000"/>
@@ -216,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.8173098564</x>
-              <y>-1.8173098564</y>
+              <x>-2.5961599350</x>
+              <y>2.4484515190</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.8173098564</x>
-              <y>1.8173098564</y>
+              <x>2.5961599350</x>
+              <y>-2.7376513481</y>
             </vector>
           </param>
           <param name="expand">
@@ -233,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -241,80 +196,117 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="p1">
+          <param name="origin">
             <vector>
-              <x>-1.6974871159</x>
-              <y>1.7141292095</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="p2">
-            <vector>
-              <x>1.7973393202</x>
-              <y>-1.7640552521</y>
-            </vector>
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1126711369</x>
+                    <y>-2.2395110130</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1019213200</x>
+                    <y>1.9798951149</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="p1">
+                  <vector>
+                    <x>-2.5414354801</x>
+                    <y>0.0909172446</y>
+                  </vector>
+                </param>
+                <param name="p2">
+                  <vector>
+                    <x>2.5787625313</x>
+                    <y>0.0909172446</y>
+                  </vector>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.047366</r>
+                      <g>0.047366</g>
+                      <b>0.047366</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.793110</r>
+                      <g>0.793110</g>
+                      <b>0.793110</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.000000</r>
-                <g>0.793110</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="0.992593">
-                <r>1.000000</r>
-                <g>0.010309</g>
-                <b>0.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="zoom">
+            <real value="0.0000000000"/>
           </param>
-          <param name="loop">
-            <bool value="false"/>
+          <param name="time_offset">
+            <time value="0s"/>
           </param>
-          <param name="zigzag">
+          <param name="children_lock">
             <bool value="false"/>
           </param>
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
         </layer>
-      </canvas>
-    </param>
-    <param name="zoom">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="time_offset">
-      <time value="0s"/>
-    </param>
-    <param name="children_lock">
-      <bool value="false"/>
-    </param>
-    <param name="focus">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="docks">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="origin">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-    <param name="canvas">
-      <canvas width="200" height="200">
-        <layer type="outline" active="true" version="0.2" desc="line">
+        <layer type="outline" active="true" version="0.2" desc="Outline">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -335,7 +327,7 @@
           <param name="origin">
             <vector>
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>-0.1014123783</y>
             </vector>
           </param>
           <param name="invert">
@@ -354,13 +346,13 @@
             <integer value="0"/>
           </param>
           <param name="bline">
-            <bline type="bline_point" loop="false">
+            <bline type="bline_point" loop="true">
               <entry>
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-1.6475610733</x>
-                      <y>1.6142770052</y>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
                     </vector>
                   </point>
                   <width>
@@ -370,22 +362,22 @@
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="2.7395687250"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="-90.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="2.3365438879"/>
                       </radius>
                       <theta>
                         <angle value="0.000000"/>
@@ -398,8 +390,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>1.6309189796</x>
-                      <y>-1.6309189796</y>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
                     </vector>
                   </point>
                   <width>
@@ -409,12 +401,12 @@
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
                         <angle value="0.000000"/>
@@ -424,86 +416,21 @@
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="-270.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
                 </composite>
               </entry>
-            </bline>
-          </param>
-          <param name="width">
-            <real value="0.3245196095"/>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="sharp_cusps">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[0]">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[1]">
-            <bool value="true"/>
-          </param>
-          <param name="loopyness">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="homogeneous_width">
-            <bool value="true"/>
-          </param>
-        </layer>
-        <layer type="outline" active="true" version="0.2" desc="line">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>0.000000</r>
-              <g>0.973842</g>
-              <b>1.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="origin">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="antialias">
-            <bool value="true"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="blurtype">
-            <integer value="1"/>
-          </param>
-          <param name="winding_style">
-            <integer value="0"/>
-          </param>
-          <param name="bline">
-            <bline type="bline_point" loop="false">
               <entry>
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-1.6475610733</x>
-                      <y>1.6142770052</y>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
                     </vector>
                   </point>
                   <width>
@@ -513,25 +440,25 @@
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="90.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="1.5576959252"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="180.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -541,8 +468,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>1.6309189796</x>
-                      <y>-1.6309189796</y>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
                     </vector>
                   </point>
                   <width>
@@ -552,25 +479,25 @@
                     <real value="0.5000000000"/>
                   </origin>
                   <split>
-                    <bool value="false"/>
+                    <bool value="true"/>
                   </split>
                   <t1>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="0.7788479626"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="-180.000000"/>
                       </theta>
                     </radial_composite>
                   </t1>
                   <t2>
                     <radial_composite type="vector">
                       <radius>
-                        <real value="0.0000000000"/>
+                        <real value="0.7788479626"/>
                       </radius>
                       <theta>
-                        <angle value="0.000000"/>
+                        <angle value="-90.000000"/>
                       </theta>
                     </radial_composite>
                   </t2>
@@ -579,7 +506,7 @@
             </bline>
           </param>
           <param name="width">
-            <real value="0.0649039219"/>
+            <real value="0.3042371402"/>
           </param>
           <param name="expand">
             <real value="0.0000000000"/>
@@ -600,212 +527,6 @@
             <bool value="true"/>
           </param>
         </layer>
-        <layer type="PasteCanvas" active="true" version="0.1" desc="duck">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="origin">
-            <vector>
-              <x>3.5780365467</x>
-              <y>-3.5613946915</y>
-            </vector>
-          </param>
-          <param name="canvas">
-            <canvas>
-              <layer type="circle" active="true" version="0.1" desc="Circle088">
-                <param name="z_depth">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="amount">
-                  <real value="1.0000000000"/>
-                </param>
-                <param name="blend_method">
-                  <integer value="0"/>
-                </param>
-                <param name="color">
-                  <color>
-                    <r>0.000000</r>
-                    <g>0.000000</g>
-                    <b>0.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                </param>
-                <param name="radius" use=":duck_outline"/>
-                <param name="feather">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="origin">
-                  <vector guid="BA3EFA40AB34DC6247EAEA2E6E580A0B">
-                    <x>-2.0767474174</x>
-                    <y>2.0529854298</y>
-                  </vector>
-                </param>
-                <param name="invert">
-                  <bool value="false"/>
-                </param>
-                <param name="falloff">
-                  <integer value="1"/>
-                </param>
-              </layer>
-              <layer type="circle" active="true" version="0.1" desc="Circle088">
-                <param name="z_depth">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="amount">
-                  <real value="1.0000000000"/>
-                </param>
-                <param name="blend_method">
-                  <integer value="0"/>
-                </param>
-                <param name="color">
-                  <color>
-                    <r>0.000000</r>
-                    <g>1.000000</g>
-                    <b>0.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                </param>
-                <param name="radius">
-                  <real value="0.2920676485" guid="A94C18C44B68946FF710331B031C83A9"/>
-                </param>
-                <param name="feather">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="origin">
-                  <vector guid="BA3EFA40AB34DC6247EAEA2E6E580A0B">
-                    <x>-2.0767474174</x>
-                    <y>2.0529854298</y>
-                  </vector>
-                </param>
-                <param name="invert">
-                  <bool value="false"/>
-                </param>
-                <param name="falloff">
-                  <integer value="1"/>
-                </param>
-              </layer>
-            </canvas>
-          </param>
-          <param name="zoom">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="time_offset">
-            <time value="0s"/>
-          </param>
-          <param name="children_lock">
-            <bool value="false"/>
-          </param>
-          <param name="focus">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-        </layer>
-        <layer type="PasteCanvas" active="true" version="0.1" desc="duck">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="origin">
-            <vector>
-              <x>0.1595997959</x>
-              <y>-0.1728997827</y>
-            </vector>
-          </param>
-          <param name="canvas">
-            <canvas>
-              <layer type="circle" active="true" version="0.1" desc="Circle088">
-                <param name="z_depth">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="amount">
-                  <real value="1.0000000000"/>
-                </param>
-                <param name="blend_method">
-                  <integer value="0"/>
-                </param>
-                <param name="color">
-                  <color>
-                    <r>0.000000</r>
-                    <g>0.000000</g>
-                    <b>0.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                </param>
-                <param name="radius" use=":duck_outline"/>
-                <param name="feather">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="origin" use=":duck1_orig"/>
-                <param name="invert">
-                  <bool value="false"/>
-                </param>
-                <param name="falloff">
-                  <integer value="1"/>
-                </param>
-              </layer>
-              <layer type="circle" active="true" version="0.1" desc="Circle088">
-                <param name="z_depth">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="amount">
-                  <real value="1.0000000000"/>
-                </param>
-                <param name="blend_method">
-                  <integer value="0"/>
-                </param>
-                <param name="color">
-                  <color>
-                    <r>0.000000</r>
-                    <g>1.000000</g>
-                    <b>0.000000</b>
-                    <a>1.000000</a>
-                  </color>
-                </param>
-                <param name="radius">
-                  <real value="0.2920676485" guid="A94C18C44B68946FF710331B031C83A9"/>
-                </param>
-                <param name="feather">
-                  <real value="0.0000000000"/>
-                </param>
-                <param name="origin" use=":duck1_orig"/>
-                <param name="invert">
-                  <bool value="false"/>
-                </param>
-                <param name="falloff">
-                  <integer value="1"/>
-                </param>
-              </layer>
-            </canvas>
-          </param>
-          <param name="zoom">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="time_offset">
-            <time value="0s"/>
-          </param>
-          <param name="children_lock">
-            <bool value="false"/>
-          </param>
-          <param name="focus">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-        </layer>
       </canvas>
     </param>
     <param name="zoom">
diff --git a/synfig-studio/images/layer_gradient_noise_icon.sif b/synfig-studio/images/layer_gradient_noise_icon.sif
index 53b6b96..fe08fbb 100644
--- a/synfig-studio/images/layer_gradient_noise_icon.sif
+++ b/synfig-studio/images/layer_gradient_noise_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.7" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Noise Gradient Icon</name>
-  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman</desc>
+  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.1153881550</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.5576940775</x>
-        <y>-3.1153881550</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7088961601</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.1896641254</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.3365411758</x>
-        <y>2.3365411758</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.0769255161</x>
-        <y>-2.0769255161</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.0769255161</x>
-        <y>2.0769255161</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="noise gradient">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -184,7 +146,7 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
@@ -209,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.8173098564</x>
-              <y>-1.8173098564</y>
+              <x>-2.5961599350</x>
+              <y>2.4484515190</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.8173098564</x>
-              <y>1.8173098564</y>
+              <x>2.5961599350</x>
+              <y>-2.7376513481</y>
             </vector>
           </param>
           <param name="expand">
@@ -226,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="noise" active="true" version="0.0">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -234,51 +196,345 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>0.000000</r>
-                <g>0.000000</g>
-                <b>0.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
           </param>
-          <param name="seed">
-            <integer value="1262706733"/>
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1126711369</x>
+                    <y>-2.2395110130</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1019213200</x>
+                    <y>1.9798951149</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="noise" active="true" version="0.0">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.893289</r>
+                      <g>0.893289</g>
+                      <b>0.893289</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.000000</r>
+                      <g>0.000000</g>
+                      <b>0.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="seed">
+                  <integer value="1262706733"/>
+                </param>
+                <param name="size">
+                  <vector>
+                    <x>-0.5785136819</x>
+                    <y>0.5432509184</y>
+                  </vector>
+                </param>
+                <param name="smooth">
+                  <integer value="2"/>
+                </param>
+                <param name="detail">
+                  <integer value="4"/>
+                </param>
+                <param name="speed">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="turbulent">
+                  <bool value="false"/>
+                </param>
+                <param name="do_alpha">
+                  <bool value="false"/>
+                </param>
+                <param name="super_sample">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
           </param>
-          <param name="size">
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
+            <bool value="false"/>
+          </param>
+          <param name="focus">
             <vector>
-              <x>-0.5785136819</x>
-              <y>0.5432509184</y>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="smooth">
-            <integer value="2"/>
+        </layer>
+        <layer type="outline" active="true" version="0.2" desc="Outline">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
           </param>
-          <param name="detail">
-            <integer value="4"/>
+          <param name="amount">
+            <real value="1.0000000000"/>
           </param>
-          <param name="speed">
-            <real value="0.0000000000"/>
+          <param name="blend_method">
+            <integer value="0"/>
           </param>
-          <param name="turbulent">
-            <bool value="false"/>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
           </param>
-          <param name="do_alpha">
-            <bool value="false"/>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-0.1014123783</y>
+            </vector>
           </param>
-          <param name="super_sample">
+          <param name="invert">
             <bool value="false"/>
           </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.7395687250"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.3365438879"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371402"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
         </layer>
       </canvas>
     </param>
diff --git a/synfig-studio/images/layer_gradient_radial_icon.sif b/synfig-studio/images/layer_gradient_radial_icon.sif
index 3bb21b2..ef16880 100644
--- a/synfig-studio/images/layer_gradient_radial_icon.sif
+++ b/synfig-studio/images/layer_gradient_radial_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.7" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Radial Gradient Icon</name>
-  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman</desc>
+  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.1153881550</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.5576940775</x>
-        <y>-3.1153881550</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7088961601</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.1896641254</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.3365411758</x>
-        <y>2.3365411758</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.0769255161</x>
-        <y>-2.0769255161</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.0769255161</x>
-        <y>2.0769255161</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="radial gradient">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -184,7 +146,7 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
@@ -209,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.8173098564</x>
-              <y>-1.8173098564</y>
+              <x>-2.5961599350</x>
+              <y>2.4484515190</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.8173098564</x>
-              <y>1.8173098564</y>
+              <x>2.5961599350</x>
+              <y>-2.7376513481</y>
             </vector>
           </param>
           <param name="expand">
@@ -226,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="radial_gradient" active="true" version="0.1">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -234,39 +196,333 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
-          </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>0.000000</r>
-                <g>0.000000</g>
-                <b>0.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+            <integer value="0"/>
           </param>
-          <param name="center">
+          <param name="origin">
             <vector>
               <x>0.0000000000</x>
               <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="radius">
-            <real value="2.4176965922"/>
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1126711369</x>
+                    <y>-2.2395110130</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1019213200</x>
+                    <y>1.9798951149</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="radial_gradient" active="true" version="0.1">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>1.000000</r>
+                      <g>1.000000</g>
+                      <b>1.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.000000</r>
+                      <g>0.000000</g>
+                      <b>0.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="center">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="radius">
+                  <real value="2.1803660625"/>
+                </param>
+                <param name="loop">
+                  <bool value="false"/>
+                </param>
+                <param name="zigzag">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
           </param>
-          <param name="loop">
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
             <bool value="false"/>
           </param>
-          <param name="zigzag">
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+        </layer>
+        <layer type="outline" active="true" version="0.2" desc="Outline">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-0.1014123783</y>
+            </vector>
+          </param>
+          <param name="invert">
             <bool value="false"/>
           </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.7395687250"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.3365438879"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371402"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
         </layer>
       </canvas>
     </param>
diff --git a/synfig-studio/images/layer_gradient_spiral_icon.sif b/synfig-studio/images/layer_gradient_spiral_icon.sif
index d94f407..3c3833d 100644
--- a/synfig-studio/images/layer_gradient_spiral_icon.sif
+++ b/synfig-studio/images/layer_gradient_spiral_icon.sif
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<canvas version="0.7" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Spiral Gradient Icon</name>
-  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman</desc>
+  <desc>Timothee Giet 2010 GPL2 Based on linear gradient icon by Chris Norman, in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.259616 0.259616"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.1153881550</x>
-        <y>-3.1153881550</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.5576940775</x>
-        <y>-3.1153881550</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7088961601</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.5454537868</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.1896641254</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.3365411758</x>
-        <y>-2.3365411758</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.3365411758</x>
-        <y>2.3365411758</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.0769255161</x>
-        <y>-2.0769255161</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.0769255161</x>
-        <y>2.0769255161</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="spiral gradient">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -184,7 +146,7 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
@@ -209,14 +171,14 @@
           </param>
           <param name="point1">
             <vector>
-              <x>-1.8173098564</x>
-              <y>-1.8173098564</y>
+              <x>-2.5961599350</x>
+              <y>2.4484515190</y>
             </vector>
           </param>
           <param name="point2">
             <vector>
-              <x>1.8173098564</x>
-              <y>1.8173098564</y>
+              <x>2.5961599350</x>
+              <y>-2.7376513481</y>
             </vector>
           </param>
           <param name="expand">
@@ -226,7 +188,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="spiral_gradient" active="true" version="0.1">
+        <layer type="PasteCanvas" active="true" version="0.1" desc="gradient">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -234,39 +196,333 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="0"/>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>0.000000</r>
-                <g>0.000000</g>
-                <b>0.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+          <param name="canvas">
+            <canvas>
+              <layer type="rectangle" active="true" version="0.2" desc="Rectangle">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="color">
+                  <color>
+                    <r>1.000000</r>
+                    <g>1.000000</g>
+                    <b>1.000000</b>
+                    <a>1.000000</a>
+                  </color>
+                </param>
+                <param name="point1">
+                  <vector>
+                    <x>-2.1126711369</x>
+                    <y>-2.2395110130</y>
+                  </vector>
+                </param>
+                <param name="point2">
+                  <vector>
+                    <x>2.1019213200</x>
+                    <y>1.9798951149</y>
+                  </vector>
+                </param>
+                <param name="expand">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="invert">
+                  <bool value="false"/>
+                </param>
+              </layer>
+              <layer type="spiral_gradient" active="true" version="0.1">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="13"/>
+                </param>
+                <param name="gradient">
+                  <gradient>
+                    <color pos="0.000000">
+                      <r>0.893289</r>
+                      <g>0.893289</g>
+                      <b>0.893289</b>
+                      <a>1.000000</a>
+                    </color>
+                    <color pos="1.000000">
+                      <r>0.000000</r>
+                      <g>0.000000</g>
+                      <b>0.000000</b>
+                      <a>1.000000</a>
+                    </color>
+                  </gradient>
+                </param>
+                <param name="center">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="radius">
+                  <real value="1.1905813128"/>
+                </param>
+                <param name="angle">
+                  <angle value="0.779032"/>
+                </param>
+                <param name="clockwise">
+                  <bool value="false"/>
+                </param>
+              </layer>
+            </canvas>
           </param>
-          <param name="center">
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
+            <bool value="false"/>
+          </param>
+          <param name="focus">
             <vector>
               <x>0.0000000000</x>
               <y>0.0000000000</y>
             </vector>
           </param>
-          <param name="radius">
-            <real value="1.0384627503"/>
+        </layer>
+        <layer type="outline" active="true" version="0.2" desc="Outline">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
           </param>
-          <param name="angle">
-            <angle value="0.779032"/>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-0.1014123783</y>
+            </vector>
           </param>
-          <param name="clockwise">
+          <param name="invert">
             <bool value="false"/>
           </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.7395687250"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.3365438879"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.5576959252"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7788479626"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.3042371402"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
         </layer>
       </canvas>
     </param>
diff --git a/synfig-studio/images/layer_other_importimage_icon.sif b/synfig-studio/images/layer_other_importimage_icon.sif
index 73c8b73..5be7fa2 100644
--- a/synfig-studio/images/layer_other_importimage_icon.sif
+++ b/synfig-studio/images/layer_other_importimage_icon.sif
@@ -1,226 +1,24 @@
 <?xml version="1.0"?>
-<canvas version="0.3" width="128" height="128" xres="2952.755900" yres="2952.755900" view-box="-1.000000 1.000000 1.000000 -1.000000" antialias="1" fps="30.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
-  <name>Untitled0</name>
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245189 3.245189 3.245189 -3.245189" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+  <name>Synfig Studio Import Image Icon</name>
+  <desc>Placed in the Public Domain in 2010 by Yu Chen (jcome)</desc>
+  <meta name="grid_show" content="0"/>
+  <meta name="grid_size" content="0.250000 0.250000"/>
+  <meta name="grid_snap" content="0"/>
+  <meta name="guide_show" content="1"/>
+  <meta name="guide_snap" content="0"/>
+  <meta name="onion_skin" content="0"/>
   <defs>
-    <canvas id="Layer" bgcolor="0.500000 0.500000 0.500000 1.000000">
-      <layer type="polygon" active="true" version="0.1">
-        <param name="z_depth">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="amount">
-          <real value="0.5000000000"/>
-        </param>
-        <param name="blend_method">
-          <integer value="0"/>
-        </param>
-        <param name="color">
-          <color>
-            <r>0.000000</r>
-            <g>0.000000</g>
-            <b>0.000000</b>
-            <a>1.000000</a>
-          </color>
-        </param>
-        <param name="offset">
-          <vector>
-            <x>0.1000000015</x>
-            <y>-0.1000000015</y>
-          </vector>
-        </param>
-        <param name="invert">
-          <bool value="false"/>
-        </param>
-        <param name="antialias">
-          <bool value="true"/>
-        </param>
-        <param name="feather">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="blurtype">
-          <integer value="1"/>
-        </param>
-        <param name="vector_list">
-          <dynamic_list type="vector">
-            <entry>
-              <vector>
-                <x>-0.8000000119</x>
-                <y>0.8000000119</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>-0.8000000119</x>
-                <y>-0.2000000030</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.2000000030</x>
-                <y>-0.2000000030</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.2000000030</x>
-                <y>0.8000000119</y>
-              </vector>
-            </entry>
-          </dynamic_list>
-        </param>
-      </layer>
-      <layer type="blur" active="true" version="0.2">
-        <param name="z_depth">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="amount">
-          <real value="1.0000000000"/>
-        </param>
-        <param name="blend_method">
-          <integer value="1"/>
-        </param>
-        <param name="size">
-          <vector>
-            <x>0.2000000030</x>
-            <y>0.2000000030</y>
-          </vector>
-        </param>
-        <param name="type">
-          <integer value="1"/>
-        </param>
-      </layer>
-      <layer type="polygon" active="true" version="0.1">
-        <param name="z_depth">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="amount">
-          <real value="1.0000000000"/>
-        </param>
-        <param name="blend_method">
-          <integer value="0"/>
-        </param>
-        <param name="color">
-          <color>
-            <r>0.000000</r>
-            <g>0.000000</g>
-            <b>0.000000</b>
-            <a>1.000000</a>
-          </color>
-        </param>
-        <param name="offset">
-          <vector>
-            <x>0.0000000000</x>
-            <y>0.0000000000</y>
-          </vector>
-        </param>
-        <param name="invert">
-          <bool value="false"/>
-        </param>
-        <param name="antialias">
-          <bool value="true"/>
-        </param>
-        <param name="feather">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="blurtype">
-          <integer value="1"/>
-        </param>
-        <param name="vector_list">
-          <dynamic_list type="vector">
-            <entry>
-              <vector>
-                <x>-0.8000000119</x>
-                <y>0.8000000119</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>-0.8000000119</x>
-                <y>-0.2000000030</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.2000000030</x>
-                <y>-0.2000000030</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.2000000030</x>
-                <y>0.8000000119</y>
-              </vector>
-            </entry>
-          </dynamic_list>
-        </param>
-      </layer>
-      <layer type="polygon" active="true" version="0.1">
-        <param name="z_depth">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="amount">
-          <real value="1.0000000000"/>
-        </param>
-        <param name="blend_method">
-          <integer value="0"/>
-        </param>
-        <param name="color">
-          <color>
-            <r>1.000000</r>
-            <g>0.900000</g>
-            <b>0.600000</b>
-            <a>1.000000</a>
-          </color>
-        </param>
-        <param name="offset">
-          <vector>
-            <x>0.0000000000</x>
-            <y>0.0000000000</y>
-          </vector>
-        </param>
-        <param name="invert">
-          <bool value="false"/>
-        </param>
-        <param name="antialias">
-          <bool value="true"/>
-        </param>
-        <param name="feather">
-          <real value="0.0000000000"/>
-        </param>
-        <param name="blurtype">
-          <integer value="1"/>
-        </param>
-        <param name="vector_list">
-          <dynamic_list type="vector">
-            <entry>
-              <vector>
-                <x>-0.6999999881</x>
-                <y>0.6999999881</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>-0.6999999881</x>
-                <y>-0.1000000015</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.1000000015</x>
-                <y>-0.1000000015</y>
-              </vector>
-            </entry>
-            <entry>
-              <vector>
-                <x>0.1000000015</x>
-                <y>0.6999999881</y>
-              </vector>
-            </entry>
-          </dynamic_list>
-        </param>
-      </layer>
-    </canvas>
+    <color id="outline1-color">
+      <r>0.000000</r>
+      <g>0.000000</g>
+      <b>0.000000</b>
+      <a>1.000000</a>
+    </color>
+    <real value="0.1600000000" id="outline1-width"/>
+    <real value="5.7427342595" id="character-outlinewidth"/>
   </defs>
-  <layer type="PasteCanvas" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -232,43 +30,93 @@
     </param>
     <param name="origin">
       <vector>
-        <x>0.5000000000</x>
-        <y>-0.5000000000</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="canvas" use="Layer"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.700000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.1364002228</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
+    </param>
     <param name="zoom">
       <real value="0.0000000000"/>
     </param>
     <param name="time_offset">
-      <time value="0f"/>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
+      <time value="0s"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
+    <param name="children_lock">
+      <bool value="false"/>
     </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="origin">
+    <param name="focus">
       <vector>
-        <x>0.2000000030</x>
-        <y>-0.2000000030</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="canvas" use="Layer"/>
-    <param name="zoom">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="time_offset">
-      <time value="0f"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="sheet">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -280,53 +128,2831 @@
     </param>
     <param name="origin">
       <vector>
-        <x>-0.1000000015</x>
-        <y>0.1000000015</y>
+        <x>0.0000000000</x>
+        <y>0.3042364717</y>
       </vector>
     </param>
-    <param name="canvas" use="Layer"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="outline" active="true" version="0.2" desc="outline">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+          <param name="invert">
+            <bool value="false"/>
+          </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.3807091713</x>
+                      <y>1.9864042997</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0241646127"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0213952921"/>
+                      </radius>
+                      <theta>
+                        <angle value="-1.060912"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.4081976414</x>
+                      <y>1.9864042997</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.4081976414</x>
+                      <y>-0.4474872351</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.2127992207"/>
+                      </radius>
+                      <theta>
+                        <angle value="-82.779137"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.5984558734"/>
+                      </radius>
+                      <theta>
+                        <angle value="-93.132820"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>1.0655186176</x>
+                      <y>-1.7208422422</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="2.7432541706"/>
+                      </radius>
+                      <theta>
+                        <angle value="-170.076294"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.1831416952"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.3664343357</x>
+                      <y>-1.7373532057</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.5070607960"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
+          </param>
+        </layer>
+        <layer type="PasteCanvas" active="true" version="0.1" desc="sheet">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+          <param name="canvas">
+            <canvas>
+              <layer type="PasteCanvas" active="true" version="0.1" desc="cell">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="canvas">
+                  <canvas>
+                    <layer type="region" active="true" version="0.1" desc="Region">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="0"/>
+                      </param>
+                      <param name="color">
+                        <color>
+                          <r>1.000000</r>
+                          <g>1.000000</g>
+                          <b>1.000000</b>
+                          <a>1.000000</a>
+                        </color>
+                      </param>
+                      <param name="origin">
+                        <vector>
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-2.3672661781</x>
+                                  <y>-1.7393362522</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.9380773306</x>
+                                  <y>-1.7393362522</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.6858575344"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.9369884514"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.2954844682"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-0.392455"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector guid="909EE88B3E25B1724A0D4AD136E5F050">
+                                  <x>1.1744242907</x>
+                                  <y>-0.7615970373</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.0358607367"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="105.642242"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.2774189554"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-14.470296"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>2.4024064541</x>
+                                  <y>-0.4137853384</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.3029636145"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.0755903984"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="89.653732"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.3905940807"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>2.4024064541</x>
+                                  <y>1.9793536663</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-2.3672661781</x>
+                                  <y>1.9793536663</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                    </layer>
+                    <layer type="linear_gradient" active="true" version="0.0" desc="Gradient027">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="13"/>
+                      </param>
+                      <param name="p1">
+                        <vector>
+                          <x>1.9216941595</x>
+                          <y>-1.3407168388</y>
+                        </vector>
+                      </param>
+                      <param name="p2">
+                        <vector>
+                          <x>-2.3909449577</x>
+                          <y>2.0110752583</y>
+                        </vector>
+                      </param>
+                      <param name="gradient">
+                        <gradient>
+                          <color pos="0.000000">
+                            <r>0.268410</r>
+                            <g>0.268410</g>
+                            <b>0.268410</b>
+                            <a>1.000000</a>
+                          </color>
+                          <color pos="0.001980">
+                            <r>0.428075</r>
+                            <g>0.414347</g>
+                            <b>0.400864</b>
+                            <a>1.000000</a>
+                          </color>
+                          <color pos="0.457426">
+                            <r>1.000000</r>
+                            <g>0.956527</g>
+                            <b>0.717623</b>
+                            <a>1.000000</a>
+                          </color>
+                        </gradient>
+                      </param>
+                      <param name="loop">
+                        <bool value="false"/>
+                      </param>
+                      <param name="zigzag">
+                        <bool value="false"/>
+                      </param>
+                    </layer>
+                    <layer type="region" active="true" version="0.1" desc="Rectangle057 Region">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="19"/>
+                      </param>
+                      <param name="color">
+                        <color>
+                          <r>1.000000</r>
+                          <g>1.000000</g>
+                          <b>1.000000</b>
+                          <a>1.000000</a>
+                        </color>
+                      </param>
+                      <param name="origin">
+                        <vector guid="3AF0AC41BC1502CDCD87A272443AB914">
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true" guid="8581F1130605236ABDA12D37BD37C232">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-2.0313861370</x>
+                                  <y>1.1595760584</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5066257119"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5766927778"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5766927778"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-1.9711728096</x>
+                                  <y>0.8057304621</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0990264058"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-1.520702"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-0.9039406180</x>
+                                  <y>0.8057304621</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0464498465"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="1.420920"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1720766377"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.809156"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-0.8247123957</x>
+                                  <y>1.1660419703</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5089119077"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5752319404"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5752319404"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-0.9039406180</x>
+                                  <y>1.5070955753</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1290790631"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-179.664261"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-1.9711728096</x>
+                                  <y>1.5070955753</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0592533453"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-178.215302"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1271322350"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="179.168304"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                    </layer>
+                    <layer type="region" active="true" version="0.1" desc="Rectangle057 Region">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="19"/>
+                      </param>
+                      <param name="color">
+                        <color>
+                          <r>1.000000</r>
+                          <g>1.000000</g>
+                          <b>1.000000</b>
+                          <a>1.000000</a>
+                        </color>
+                      </param>
+                      <param name="origin">
+                        <vector guid="32D5F5D0FEAE2981BDEC9C5F3D520B69">
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true" guid="8DA4A88244BE0826CDCA131AC45F704F">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.7932230830</x>
+                                  <y>1.1595760584</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5066257119"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5766927778"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5766927778"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.8534365296</x>
+                                  <y>0.8057304621</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0990264058"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-1.520702"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>1.9206687212</x>
+                                  <y>0.8057304621</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0464498465"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="1.420920"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1720766377"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.809156"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>1.9998968840</x>
+                                  <y>1.1660419703</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5089119077"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5752319404"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5752319404"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>1.9206687212</x>
+                                  <y>1.5070955753</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1290790631"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-179.664261"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.8534365296</x>
+                                  <y>1.5070955753</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0592533453"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-178.215302"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1271322350"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="179.168304"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                    </layer>
+                    <layer type="region" active="true" version="0.1" desc="Circle091 Region">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="19"/>
+                      </param>
+                      <param name="color">
+                        <color>
+                          <r>1.000000</r>
+                          <g>1.000000</g>
+                          <b>1.000000</b>
+                          <a>1.000000</a>
+                        </color>
+                      </param>
+                      <param name="origin">
+                        <vector>
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true" guid="367F23255656CB1BE8A2FED8695A9D12">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.3753311634</x>
+                                  <y>1.1614180803</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.5490872426"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.5490872426"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-0.4165869951</x>
+                                  <y>1.1614180803</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.5490872426"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-89.999992"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.5490872426"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-89.999992"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                    </layer>
+                    <layer type="outline" active="true" version="0.2" desc="Rectangle057 Outline">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="0"/>
+                      </param>
+                      <param name="color" use=":outline1-color"/>
+                      <param name="origin">
+                        <vector guid="3AF0AC41BC1502CDCD87A272443AB914">
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true" guid="8581F1130605236ABDA12D37BD37C232">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-2.0313861370</x>
+                                  <y>1.1595760584</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5066257119"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5766927778"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5766927778"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-1.9711728096</x>
+                                  <y>0.8057304621</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0990264058"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-1.520702"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-0.9039406180</x>
+                                  <y>0.8057304621</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0464498465"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="1.420920"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1720766377"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.809156"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-0.8247123957</x>
+                                  <y>1.1660419703</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5089119077"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5752319404"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5752319404"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-0.9039406180</x>
+                                  <y>1.5070955753</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1290790631"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-179.664261"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-1.9711728096</x>
+                                  <y>1.5070955753</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0592533453"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-178.215302"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1271322350"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="179.168304"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                      <param name="width" use=":outline1-width"/>
+                      <param name="expand">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="sharp_cusps">
+                        <bool value="true"/>
+                      </param>
+                      <param name="round_tip[0]">
+                        <bool value="true"/>
+                      </param>
+                      <param name="round_tip[1]">
+                        <bool value="true"/>
+                      </param>
+                      <param name="loopyness">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="homogeneous_width">
+                        <bool value="true"/>
+                      </param>
+                    </layer>
+                    <layer type="outline" active="true" version="0.2" desc="Rectangle057 Outline">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="0"/>
+                      </param>
+                      <param name="color" use=":outline1-color"/>
+                      <param name="origin">
+                        <vector guid="32D5F5D0FEAE2981BDEC9C5F3D520B69">
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true" guid="8DA4A88244BE0826CDCA131AC45F704F">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.7932230830</x>
+                                  <y>1.1595760584</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5066257119"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5766927778"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5766927778"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.8534365296</x>
+                                  <y>0.8057304621</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0990264058"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-1.520702"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>1.9206687212</x>
+                                  <y>0.8057304621</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0464498465"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="1.420920"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1720766377"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.809156"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>1.9998968840</x>
+                                  <y>1.1660419703</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5089119077"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5752319404"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.5752319404"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>1.9206687212</x>
+                                  <y>1.5070955753</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1290790631"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-179.664261"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.8534365296</x>
+                                  <y>1.5070955753</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0592533453"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-178.215302"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.1271322350"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="179.168304"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                      <param name="width" use=":outline1-width"/>
+                      <param name="expand">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="sharp_cusps">
+                        <bool value="true"/>
+                      </param>
+                      <param name="round_tip[0]">
+                        <bool value="true"/>
+                      </param>
+                      <param name="round_tip[1]">
+                        <bool value="true"/>
+                      </param>
+                      <param name="loopyness">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="homogeneous_width">
+                        <bool value="true"/>
+                      </param>
+                    </layer>
+                    <layer type="outline" active="true" version="0.2" desc="Circle091 Outline">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="0"/>
+                      </param>
+                      <param name="color" use=":outline1-color"/>
+                      <param name="origin">
+                        <vector>
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true" guid="367F23255656CB1BE8A2FED8695A9D12">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>0.3753311634</x>
+                                  <y>1.1614180803</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.5490872426"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.5490872426"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="90.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-0.4165869951</x>
+                                  <y>1.1614180803</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.5490872426"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-89.999992"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.5490872426"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-89.999992"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                      <param name="width" use=":outline1-width"/>
+                      <param name="expand">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="sharp_cusps">
+                        <bool value="true"/>
+                      </param>
+                      <param name="round_tip[0]">
+                        <bool value="true"/>
+                      </param>
+                      <param name="round_tip[1]">
+                        <bool value="true"/>
+                      </param>
+                      <param name="loopyness">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="homogeneous_width">
+                        <bool value="true"/>
+                      </param>
+                    </layer>
+                  </canvas>
+                </param>
+                <param name="zoom">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="time_offset">
+                  <time value="0s"/>
+                </param>
+                <param name="children_lock">
+                  <bool value="false"/>
+                </param>
+                <param name="focus">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+              </layer>
+              <layer type="PasteCanvas" active="false" version="0.1">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="canvas">
+                  <canvas>
+                    <layer type="region" active="true" version="0.1" desc="  tem033 Region">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="0"/>
+                      </param>
+                      <param name="color">
+                        <color>
+                          <r>1.000000</r>
+                          <g>1.000000</g>
+                          <b>1.000000</b>
+                          <a>1.000000</a>
+                        </color>
+                      </param>
+                      <param name="origin">
+                        <vector>
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-2.3730041981</x>
+                                  <y>-1.0495742559</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0241646127"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-270.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="9.6302487614"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="8.377746"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>2.4102540016</x>
+                                  <y>0.7526010871</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="5.4684024544"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="11.318956"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>2.4081976414</x>
+                                  <y>-0.4474872351</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="false"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>1.0673037767</x>
+                                  <y>-1.7207731009</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="3.3155551125"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-159.717438"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.1831416952"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="180.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>-2.3587293625</x>
+                                  <y>-1.7373532057</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.0000000000"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="0.000000"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                    </layer>
+                    <layer type="linear_gradient" active="true" version="0.0">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="0.5000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="13"/>
+                      </param>
+                      <param name="p1">
+                        <vector>
+                          <x>2.0159785748</x>
+                          <y>1.6624671221</y>
+                        </vector>
+                      </param>
+                      <param name="p2">
+                        <vector>
+                          <x>0.7348399758</x>
+                          <y>-1.6617667675</y>
+                        </vector>
+                      </param>
+                      <param name="gradient">
+                        <gradient>
+                          <color pos="0.000000">
+                            <r>1.000000</r>
+                            <g>1.000000</g>
+                            <b>0.000000</b>
+                            <a>1.000000</a>
+                          </color>
+                          <color pos="1.000000">
+                            <r>0.000000</r>
+                            <g>0.000013</g>
+                            <b>0.000000</b>
+                            <a>1.000000</a>
+                          </color>
+                        </gradient>
+                      </param>
+                      <param name="loop">
+                        <bool value="false"/>
+                      </param>
+                      <param name="zigzag">
+                        <bool value="false"/>
+                      </param>
+                    </layer>
+                  </canvas>
+                </param>
+                <param name="zoom">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="time_offset">
+                  <time value="0s"/>
+                </param>
+                <param name="children_lock">
+                  <bool value="false"/>
+                </param>
+                <param name="focus">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+              </layer>
+              <layer type="PasteCanvas" active="true" version="0.1" desc="coner">
+                <param name="z_depth">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="amount">
+                  <real value="1.0000000000"/>
+                </param>
+                <param name="blend_method">
+                  <integer value="0"/>
+                </param>
+                <param name="origin">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+                <param name="canvas">
+                  <canvas>
+                    <layer type="region" active="true" version="0.1" desc="Rectangle055 Region">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="0"/>
+                      </param>
+                      <param name="color">
+                        <color>
+                          <r>1.000000</r>
+                          <g>1.000000</g>
+                          <b>1.000000</b>
+                          <a>1.000000</a>
+                        </color>
+                      </param>
+                      <param name="origin">
+                        <vector>
+                          <x>0.0000000000</x>
+                          <y>0.0000000000</y>
+                        </vector>
+                      </param>
+                      <param name="invert">
+                        <bool value="false"/>
+                      </param>
+                      <param name="antialias">
+                        <bool value="true"/>
+                      </param>
+                      <param name="feather">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="blurtype">
+                        <integer value="1"/>
+                      </param>
+                      <param name="winding_style">
+                        <integer value="0"/>
+                      </param>
+                      <param name="bline">
+                        <bline type="bline_point" loop="true">
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector>
+                                  <x>1.0655186176</x>
+                                  <y>-1.7208422422</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.6858575344"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.9649832983"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-172.724625"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.8893096270"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="44.326153"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector guid="909EE88B3E25B1724A0D4AD136E5F050">
+                                  <x>1.1744242907</x>
+                                  <y>-0.7615970373</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.5000000000"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="1.1175431386"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="102.927689"/>
+                                  </theta>
+                                </radial_composite>
+                              </t1>
+                              <t2>
+                                <radial_composite type="vector">
+                                  <radius>
+                                    <real value="0.2618727801"/>
+                                  </radius>
+                                  <theta>
+                                    <angle value="-19.189526"/>
+                                  </theta>
+                                </radial_composite>
+                              </t2>
+                            </composite>
+                          </entry>
+                          <entry>
+                            <composite type="bline_point">
+                              <point>
+                                <vector guid="6BDF5B4142EA1CA794C654D71DB05A87">
+                                  <x>2.5019521713</x>
+                                  <y>-0.4387928247</y>
+                                </vector>
+                              </point>
+                              <width>
+                                <real value="1.0000000000"/>
+                              </width>
+                              <origin>
+                                <real value="0.3029636145"/>
+                              </origin>
+                              <split>
+                                <bool value="true"/>
+                              </split>
+                              <t1>
+                                <vector>
+                                  <x>0.4637465179</x>
+                                  <y>0.7907865047</y>
+                                </vector>
+                              </t1>
+                              <t2>
+                                <vector>
+                                  <x>-0.6123811007</x>
+                                  <y>-1.2812807560</y>
+                                </vector>
+                              </t2>
+                            </composite>
+                          </entry>
+                        </bline>
+                      </param>
+                    </layer>
+                    <layer type="radial_gradient" active="true" version="0.1">
+                      <param name="z_depth">
+                        <real value="0.0000000000"/>
+                      </param>
+                      <param name="amount">
+                        <real value="1.0000000000"/>
+                      </param>
+                      <param name="blend_method">
+                        <integer value="13"/>
+                      </param>
+                      <param name="gradient">
+                        <gradient>
+                          <color pos="0.000000">
+                            <r>1.000000</r>
+                            <g>0.978132</g>
+                            <b>0.699394</b>
+                            <a>1.000000</a>
+                          </color>
+                          <color pos="1.000000">
+                            <r>0.428075</r>
+                            <g>0.414347</g>
+                            <b>0.400864</b>
+                            <a>1.000000</a>
+                          </color>
+                          <color pos="1.000000">
+                            <r>0.268410</r>
+                            <g>0.268410</g>
+                            <b>0.268410</b>
+                            <a>1.000000</a>
+                          </color>
+                        </gradient>
+                      </param>
+                      <param name="center">
+                        <vector>
+                          <x>1.3925434351</x>
+                          <y>-0.7023499608</y>
+                        </vector>
+                      </param>
+                      <param name="radius">
+                        <real value="1.4402412902"/>
+                      </param>
+                      <param name="loop">
+                        <bool value="false"/>
+                      </param>
+                      <param name="zigzag">
+                        <bool value="false"/>
+                      </param>
+                    </layer>
+                  </canvas>
+                </param>
+                <param name="zoom">
+                  <real value="0.0000000000"/>
+                </param>
+                <param name="time_offset">
+                  <time value="0s"/>
+                </param>
+                <param name="children_lock">
+                  <bool value="false"/>
+                </param>
+                <param name="focus">
+                  <vector>
+                    <x>0.0000000000</x>
+                    <y>0.0000000000</y>
+                  </vector>
+                </param>
+              </layer>
+            </canvas>
+          </param>
+          <param name="zoom">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="time_offset">
+            <time value="0s"/>
+          </param>
+          <param name="children_lock">
+            <bool value="false"/>
+          </param>
+          <param name="focus">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+        </layer>
+        <layer type="outline" active="true" version="0.2" desc="Outline">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="color">
+            <color>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
+              <a>1.000000</a>
+            </color>
+          </param>
+          <param name="origin">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+          <param name="invert">
+            <bool value="false"/>
+          </param>
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="bline">
+            <bline type="bline_point" loop="false">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector guid="6BDF5B4142EA1CA794C654D71DB05A87">
+                      <x>2.5019521713</x>
+                      <y>-0.4387928247</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="false"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.9963017503"/>
+                      </radius>
+                      <theta>
+                        <angle value="-96.581940"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.9963017503"/>
+                      </radius>
+                      <theta>
+                        <angle value="-96.581940"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector guid="909EE88B3E25B1724A0D4AD136E5F050">
+                      <x>1.1744242907</x>
+                      <y>-0.7615970373</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.4329969103"/>
+                      </radius>
+                      <theta>
+                        <angle value="177.986862"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.6640959476"/>
+                      </radius>
+                      <theta>
+                        <angle value="-74.639771"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>1.0655186176</x>
+                      <y>-1.8199018240</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.7277914352"/>
+                      </radius>
+                      <theta>
+                        <angle value="-162.202408"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="1.4475165579"/>
+                      </radius>
+                      <theta>
+                        <angle value="-167.300430"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
+          </param>
+          <param name="width">
+            <real value="0.2028243184"/>
+          </param>
+          <param name="expand">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="sharp_cusps">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="zoom" active="true" version="0.1">
+          <param name="amount">
+            <real value="0.1500000000"/>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>0.0000000000</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
+    </param>
     <param name="zoom">
       <real value="0.0000000000"/>
     </param>
     <param name="time_offset">
-      <time value="0f"/>
-    </param>
-  </layer>
-  <layer type="circle" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
+      <time value="0s"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
+    <param name="children_lock">
+      <bool value="false"/>
     </param>
-    <param name="blend_method">
-      <integer value="13"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="radius">
-      <real value="1.5000000000"/>
-    </param>
-    <param name="feather">
-      <real value="1.5000000075"/>
-    </param>
-    <param name="pos">
+    <param name="focus">
       <vector>
-        <x>-0.6999999881</x>
-        <y>0.6999999881</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="true"/>
-    </param>
-    <param name="falloff">
-      <integer value="2"/>
-    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/polyline_icon.sif b/synfig-studio/images/polyline_icon.sif
index 8b5e593..2b6f793 100644
--- a/synfig-studio/images/polyline_icon.sif
+++ b/synfig-studio/images/polyline_icon.sif
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
-<canvas version="0.5" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Polyline Icon</name>
-  <desc>Placed in the Public Domain in 2008 by Carlos L&#xF3;pez (Genete)</desc>
+  <desc>Placed in the Public Domain in 2008 by Carlos L&#xF3;pez (Genete), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.129808 0.129808"/>
-  <meta name="grid_snap" content="0"/>
+  <meta name="grid_snap" content="1"/>
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
   <defs>
-    <bline type="bline_point" loop="true" id="a" guid="FF107635E435E3D6AD3BB52EFD478547">
+    <bline type="bline_point" loop="true" id="a">
       <entry>
         <composite type="bline_point">
           <point>
             <vector>
-              <x>-2.3637278080</x>
-              <y>0.2062759846</y>
+              <x>-3.1153917313</x>
+              <y>0.3894239664</y>
             </vector>
           </point>
           <width>
@@ -53,8 +53,8 @@
         <composite type="bline_point">
           <point>
             <vector>
-              <x>-0.5688224435</x>
-              <y>2.1194937229</y>
+              <x>-0.5192319751</x>
+              <y>2.9855837822</y>
             </vector>
           </point>
           <width>
@@ -92,8 +92,8 @@
         <composite type="bline_point">
           <point>
             <vector>
-              <x>2.4810948372</x>
-              <y>-0.9839330316</y>
+              <x>3.1153917313</x>
+              <y>-0.7788479328</y>
             </vector>
           </point>
           <width>
@@ -131,8 +131,8 @@
         <composite type="bline_point">
           <point>
             <vector>
-              <x>1.5429599285</x>
-              <y>-2.0844035149</y>
+              <x>1.6875039339</x>
+              <y>-2.3365437984</y>
             </vector>
           </point>
           <width>
@@ -170,8 +170,8 @@
         <composite type="bline_point">
           <point>
             <vector>
-              <x>-0.6772783995</x>
-              <y>0.3616140485</y>
+              <x>-0.5192319751</x>
+              <y>-0.1298079938</y>
             </vector>
           </point>
           <width>
@@ -209,8 +209,8 @@
         <composite type="bline_point">
           <point>
             <vector>
-              <x>-1.6594920158</x>
-              <y>-0.6549533606</y>
+              <x>-1.6875039339</x>
+              <y>-1.2980799675</y>
             </vector>
           </point>
           <width>
@@ -246,69 +246,7 @@
       </entry>
     </bline>
   </defs>
-  <layer type="radial_gradient" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.021505">
-          <r>0.036189</r>
-          <g>0.036189</g>
-          <b>0.036189</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="0.564516">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>0.731343</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-    <param name="radius">
-      <real value="1.7765365254"/>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="stretch" active="true" version="0.1">
-    <param name="amount">
-      <vector>
-        <x>1.6070324183</x>
-        <y>0.3102017045</y>
-      </vector>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.0000000000</x>
-        <y>-3.4489021301</y>
-      </vector>
-    </param>
-  </layer>
-  <layer type="PasteCanvas" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -326,7 +264,7 @@
     </param>
     <param name="canvas">
       <canvas>
-        <layer type="region" active="true" version="0.1" desc="Bline031Region">
+        <layer type="radial_gradient" active="true" version="0.1">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -336,75 +274,37 @@
           <param name="blend_method">
             <integer value="0"/>
           </param>
-          <param name="color">
-            <color>
-              <r>1.000000</r>
-              <g>1.000000</g>
-              <b>1.000000</b>
-              <a>1.000000</a>
-            </color>
-          </param>
-          <param name="offset">
-            <vector>
-              <x>0.0000000000</x>
-              <y>0.0000000000</y>
-            </vector>
-          </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="antialias">
-            <bool value="true"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="blurtype">
-            <integer value="1"/>
-          </param>
-          <param name="winding_style">
-            <integer value="0"/>
-          </param>
-          <param name="bline" use=":a"/>
-        </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="13"/>
-          </param>
-          <param name="p1">
-            <vector>
-              <x>2.9432895184</x>
-              <y>-3.7802658081</y>
-            </vector>
-          </param>
-          <param name="p2">
-            <vector>
-              <x>-1.0177584887</x>
-              <y>0.9443578720</y>
-            </vector>
-          </param>
           <param name="gradient">
             <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.800000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
               </color>
               <color pos="1.000000">
                 <r>1.000000</r>
                 <g>1.000000</g>
                 <b>1.000000</b>
-                <a>1.000000</a>
+                <a>0.000000</a>
               </color>
             </gradient>
           </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.1364002228</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
           <param name="loop">
             <bool value="false"/>
           </param>
@@ -412,68 +312,56 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="outline" active="true" version="0.2" desc="Outline">
-          <param name="z_depth">
-            <real value="0.0000000000"/>
-          </param>
+        <layer type="stretch" active="true" version="0.1">
           <param name="amount">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="blend_method">
-            <integer value="0"/>
-          </param>
-          <param name="color">
-            <color>
-              <r>1.000000</r>
-              <g>1.000000</g>
-              <b>1.000000</b>
-              <a>1.000000</a>
-            </color>
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
           </param>
-          <param name="offset">
+          <param name="center">
             <vector>
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>-3.1892864704</y>
             </vector>
           </param>
-          <param name="invert">
-            <bool value="false"/>
-          </param>
-          <param name="antialias">
-            <bool value="true"/>
-          </param>
-          <param name="feather">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="blurtype">
-            <integer value="1"/>
-          </param>
-          <param name="winding_style">
-            <integer value="0"/>
-          </param>
-          <param name="bline" use=":a"/>
-          <param name="width">
-            <real value="0.1947117657"/>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
-          <param name="sharp_cusps">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[0]">
-            <bool value="true"/>
-          </param>
-          <param name="round_tip[1]">
-            <bool value="true"/>
-          </param>
-          <param name="loopyness">
-            <real value="1.0000000000"/>
-          </param>
-          <param name="homogeneous_width">
-            <bool value="true"/>
-          </param>
         </layer>
+      </canvas>
+    </param>
+    <param name="zoom">
+      <real value="0.0000000000"/>
+    </param>
+    <param name="time_offset">
+      <time value="0s"/>
+    </param>
+    <param name="children_lock">
+      <bool value="false"/>
+    </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
+  </layer>
+  <layer type="PasteCanvas" active="true" version="0.1" desc="polyline">
+    <param name="z_depth">
+      <real value="0.0000000000"/>
+    </param>
+    <param name="amount">
+      <real value="1.0000000000"/>
+    </param>
+    <param name="blend_method">
+      <integer value="0"/>
+    </param>
+    <param name="origin">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
+    <param name="canvas">
+      <canvas width="200" height="200">
         <layer type="outline" active="true" version="0.2" desc="Outline">
           <param name="z_depth">
             <real value="0.0000000000"/>
@@ -492,7 +380,7 @@
               <a>1.000000</a>
             </color>
           </param>
-          <param name="offset">
+          <param name="origin">
             <vector>
               <x>0.0000000000</x>
               <y>0.0000000000</y>
@@ -519,8 +407,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-2.6194977760</x>
-                      <y>0.2062759846</y>
+                      <x>-3.0328524113</x>
+                      <y>0.6490399837</y>
                     </vector>
                   </point>
                   <width>
@@ -558,8 +446,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-0.5688224435</x>
-                      <y>2.3933870792</y>
+                      <x>-0.6215841770</x>
+                      <y>3.0211579800</y>
                     </vector>
                   </point>
                   <width>
@@ -597,8 +485,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>2.7468631268</x>
-                      <y>-0.9839330316</y>
+                      <x>3.0195577145</x>
+                      <y>-0.6100772619</y>
                     </vector>
                   </point>
                   <width>
@@ -636,8 +524,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>1.5429599285</x>
-                      <y>-2.3679156303</y>
+                      <x>1.5893906355</x>
+                      <y>-2.1072096825</y>
                     </vector>
                   </point>
                   <width>
@@ -675,8 +563,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-0.6772783995</x>
-                      <y>0.1130477637</y>
+                      <x>-0.3894239664</x>
+                      <y>-0.1298079938</y>
                     </vector>
                   </point>
                   <width>
@@ -714,8 +602,8 @@
                 <composite type="bline_point">
                   <point>
                     <vector>
-                      <x>-1.6594920158</x>
-                      <y>-0.9259382486</y>
+                      <x>-1.3487370014</x>
+                      <y>-1.0772391558</y>
                     </vector>
                   </point>
                   <width>
@@ -784,5 +672,11 @@
     <param name="children_lock">
       <bool value="false"/>
     </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/images/rectangle_icon.sif b/synfig-studio/images/rectangle_icon.sif
index 68d4f85..3e2e271 100644
--- a/synfig-studio/images/rectangle_icon.sif
+++ b/synfig-studio/images/rectangle_icon.sif
@@ -8,7 +8,7 @@
   <meta name="guide_show" content="1"/>
   <meta name="guide_snap" content="0"/>
   <meta name="onion_skin" content="0"/>
-  <layer type="linear_gradient" active="true" version="0.0">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -18,160 +18,122 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="p1">
-      <vector>
-        <x>-0.6717824340</x>
-        <y>8.4043684006</y>
-      </vector>
-    </param>
-    <param name="p2">
-      <vector>
-        <x>-0.4427109957</x>
-        <y>-1.6098945141</y>
-      </vector>
-    </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.000000">
-          <r>0.064115</r>
-          <g>0.064115</g>
-          <b>0.064115</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="warp" active="true" version="0.1">
-    <param name="src_tl">
-      <vector>
-        <x>-1.8803261518</x>
-        <y>2.0255250931</y>
-      </vector>
-    </param>
-    <param name="src_br">
-      <vector>
-        <x>1.9384056330</x>
-        <y>-1.9093658924</y>
-      </vector>
-    </param>
-    <param name="dest_tl">
-      <vector>
-        <x>-2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="dest_tr">
-      <vector>
-        <x>2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="dest_br">
-      <vector>
-        <x>3.2776479721</x>
-        <y>-2.7908685207</y>
-      </vector>
-    </param>
-    <param name="dest_bl">
+    <param name="origin">
       <vector>
-        <x>-1.7199538946</x>
-        <y>-2.7908685207</y>
+        <x>0.0000000000</x>
+        <y>-0.0507061891</y>
       </vector>
     </param>
-    <param name="clip">
-      <bool value="true"/>
-    </param>
-    <param name="horizon">
-      <real value="2.0000000000"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="linear_gradient" active="true" version="0.0">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="p1">
+            <vector>
+              <x>-0.6323263645</x>
+              <y>7.7884917259</y>
+            </vector>
+          </param>
+          <param name="p2">
+            <vector>
+              <x>-0.3517891169</x>
+              <y>-2.5961844921</y>
+            </vector>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.000000">
+                <r>0.064115</r>
+                <g>0.064115</g>
+                <b>0.064115</b>
+                <a>1.000000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="warp" active="true" version="0.1">
+          <param name="src_tl">
+            <vector>
+              <x>-2.6927909851</x>
+              <y>2.8879861832</y>
+            </vector>
+          </param>
+          <param name="src_br">
+            <vector>
+              <x>2.6927909851</x>
+              <y>-2.3365437984</y>
+            </vector>
+          </param>
+          <param name="dest_tl">
+            <vector>
+              <x>-2.7481141090</x>
+              <y>-2.5207901001</y>
+            </vector>
+          </param>
+          <param name="dest_tr">
+            <vector>
+              <x>2.7473614216</x>
+              <y>-2.5212490559</y>
+            </vector>
+          </param>
+          <param name="dest_br">
+            <vector>
+              <x>3.2120192051</x>
+              <y>-3.1153881550</y>
+            </vector>
+          </param>
+          <param name="dest_bl">
+            <vector>
+              <x>-2.2972397804</x>
+              <y>-3.1153917313</y>
+            </vector>
+          </param>
+          <param name="clip">
+            <bool value="true"/>
+          </param>
+          <param name="horizon">
+            <real value="2.0000000000"/>
+          </param>
+        </layer>
+      </canvas>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="Black Rectangle">
-    <param name="z_depth">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.4988009930</x>
-        <y>-2.0120215416</y>
-      </vector>
-    </param>
-    <param name="point2">
-      <vector>
-        <x>2.4988009930</x>
-        <y>2.1499423981</y>
-      </vector>
-    </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="invert">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="point1">
-      <vector>
-        <x>-2.2391853333</x>
-        <y>-1.7524058819</y>
-      </vector>
-    </param>
-    <param name="point2">
+    <param name="focus">
       <vector>
-        <x>2.2391853333</x>
-        <y>1.8903266191</y>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="expand">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1" desc="Rectangle gradient">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="rectangle">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -184,12 +146,12 @@
     <param name="origin">
       <vector>
         <x>0.0000000000</x>
-        <y>0.0000000000</y>
+        <y>0.2596159875</y>
       </vector>
     </param>
     <param name="canvas">
-      <canvas width="200" height="200">
-        <layer type="rectangle" active="true" version="0.2" desc="White Rectangle">
+      <canvas>
+        <layer type="outline" active="true" version="0.2" desc="Outline">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -201,74 +163,213 @@
           </param>
           <param name="color">
             <color>
-              <r>1.000000</r>
-              <g>1.000000</g>
-              <b>1.000000</b>
+              <r>0.000000</r>
+              <g>0.000000</g>
+              <b>0.000000</b>
               <a>1.000000</a>
             </color>
           </param>
-          <param name="point1">
+          <param name="origin">
             <vector>
-              <x>-1.9795696735</x>
-              <y>-1.4927902222</y>
+              <x>0.0000000000</x>
+              <y>-0.1014123783</y>
             </vector>
           </param>
-          <param name="point2">
-            <vector>
-              <x>1.9795696735</x>
-              <y>1.6307109594</y>
-            </vector>
-          </param>
-          <param name="expand">
-            <real value="0.0000000000"/>
-          </param>
           <param name="invert">
             <bool value="false"/>
           </param>
-        </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
-          <param name="z_depth">
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
             <real value="0.0000000000"/>
           </param>
-          <param name="amount">
-            <real value="1.0000000000"/>
+          <param name="blurtype">
+            <integer value="1"/>
           </param>
-          <param name="blend_method">
-            <integer value="13"/>
+          <param name="winding_style">
+            <integer value="0"/>
           </param>
-          <param name="p1">
-            <vector>
-              <x>3.1478400230</x>
-              <y>-2.7908685207</y>
-            </vector>
+          <param name="bline">
+            <bline type="bline_point" loop="true">
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>-2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="0.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-270.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+              <entry>
+                <composite type="bline_point">
+                  <point>
+                    <vector>
+                      <x>-2.5961599350</x>
+                      <y>2.5961599350</y>
+                    </vector>
+                  </point>
+                  <width>
+                    <real value="1.0000000000"/>
+                  </width>
+                  <origin>
+                    <real value="0.5000000000"/>
+                  </origin>
+                  <split>
+                    <bool value="true"/>
+                  </split>
+                  <t1>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-180.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t1>
+                  <t2>
+                    <radial_composite type="vector">
+                      <radius>
+                        <real value="0.0000000000"/>
+                      </radius>
+                      <theta>
+                        <angle value="-90.000000"/>
+                      </theta>
+                    </radial_composite>
+                  </t2>
+                </composite>
+              </entry>
+            </bline>
           </param>
-          <param name="p2">
-            <vector>
-              <x>-2.7908685207</x>
-              <y>2.5312528610</y>
-            </vector>
+          <param name="width">
+            <real value="0.3042371402"/>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
+          <param name="expand">
+            <real value="0.0000000000"/>
           </param>
-          <param name="loop">
-            <bool value="false"/>
+          <param name="sharp_cusps">
+            <bool value="true"/>
           </param>
-          <param name="zigzag">
-            <bool value="false"/>
+          <param name="round_tip[0]">
+            <bool value="true"/>
+          </param>
+          <param name="round_tip[1]">
+            <bool value="true"/>
+          </param>
+          <param name="loopyness">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="homogeneous_width">
+            <bool value="true"/>
           </param>
         </layer>
       </canvas>
diff --git a/synfig-studio/images/star_icon.sif b/synfig-studio/images/star_icon.sif
index b933e42..fced919 100644
--- a/synfig-studio/images/star_icon.sif
+++ b/synfig-studio/images/star_icon.sif
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<canvas version="0.5" width="200" height="200" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+<canvas version="0.7" width="128" height="128" xres="2834.645752" yres="2834.645752" view-box="-3.245196 3.245196 3.245196 -3.245196" antialias="1" fps="24.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
   <name>Synfig Studio Star Icon</name>
-  <desc>Placed in the Public Domain in 2008 by Carlos L&#xF3;pez (Genete)</desc>
+  <desc>Placed in the Public Domain in 2008 by Carlos L&#xF3;pez (Genete), in 2010 by Yu Chen (jcome)</desc>
   <meta name="grid_show" content="0"/>
   <meta name="grid_size" content="0.129808 0.129808"/>
   <meta name="grid_snap" content="0"/>
@@ -246,7 +246,7 @@
       </entry>
     </bline>
   </defs>
-  <layer type="radial_gradient" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="dropshadow">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -256,169 +256,95 @@
     <param name="blend_method">
       <integer value="0"/>
     </param>
-    <param name="gradient">
-      <gradient>
-        <color pos="0.021505">
-          <r>0.036189</r>
-          <g>0.036189</g>
-          <b>0.036189</b>
-          <a>1.000000</a>
-        </color>
-        <color pos="0.564516">
-          <r>0.012910</r>
-          <g>0.012910</g>
-          <b>0.012910</b>
-          <a>0.731343</a>
-        </color>
-        <color pos="1.000000">
-          <r>1.000000</r>
-          <g>1.000000</g>
-          <b>1.000000</b>
-          <a>0.000000</a>
-        </color>
-      </gradient>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.0000000000</x>
-        <y>0.0000000000</y>
-      </vector>
-    </param>
-    <param name="radius">
-      <real value="1.7765365254"/>
-    </param>
-    <param name="loop">
-      <bool value="false"/>
-    </param>
-    <param name="zigzag">
-      <bool value="false"/>
-    </param>
-  </layer>
-  <layer type="stretch" active="true" version="0.1">
-    <param name="amount">
-      <vector>
-        <x>1.6070324183</x>
-        <y>0.3102017045</y>
-      </vector>
-    </param>
-    <param name="center">
-      <vector>
-        <x>0.0000000000</x>
-        <y>-3.4489021301</y>
-      </vector>
-    </param>
-  </layer>
-  <layer type="star" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>0.000000</r>
-        <g>0.000000</g>
-        <b>0.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="offset">
+    <param name="origin">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="true"/>
+    <param name="canvas">
+      <canvas>
+        <layer type="radial_gradient" active="true" version="0.1">
+          <param name="z_depth">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="amount">
+            <real value="1.0000000000"/>
+          </param>
+          <param name="blend_method">
+            <integer value="0"/>
+          </param>
+          <param name="gradient">
+            <gradient>
+              <color pos="0.021505">
+                <r>0.036113</r>
+                <g>0.036189</g>
+                <b>0.036189</b>
+                <a>0.500000</a>
+              </color>
+              <color pos="0.564516">
+                <r>0.012815</r>
+                <g>0.012910</g>
+                <b>0.012910</b>
+                <a>0.300000</a>
+              </color>
+              <color pos="1.000000">
+                <r>1.000000</r>
+                <g>1.000000</g>
+                <b>1.000000</b>
+                <a>0.000000</a>
+              </color>
+            </gradient>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-1.3727831841</y>
+            </vector>
+          </param>
+          <param name="radius">
+            <real value="1.8879068686"/>
+          </param>
+          <param name="loop">
+            <bool value="false"/>
+          </param>
+          <param name="zigzag">
+            <bool value="false"/>
+          </param>
+        </layer>
+        <layer type="stretch" active="true" version="0.1">
+          <param name="amount">
+            <vector>
+              <x>1.6070324183</x>
+              <y>0.2128458172</y>
+            </vector>
+          </param>
+          <param name="center">
+            <vector>
+              <x>0.0000000000</x>
+              <y>-3.1892864704</y>
+            </vector>
+          </param>
+        </layer>
+      </canvas>
     </param>
-    <param name="feather">
+    <param name="zoom">
       <real value="0.0000000000"/>
     </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="winding_style">
-      <integer value="0"/>
-    </param>
-    <param name="radius1">
-      <real value="2.9855804071"/>
-    </param>
-    <param name="radius2">
-      <real value="1.4927902036"/>
-    </param>
-    <param name="angle">
-      <angle value="90.000000"/>
-    </param>
-    <param name="points">
-      <integer value="5"/>
+    <param name="time_offset">
+      <time value="0s"/>
     </param>
-    <param name="regular_polygon">
+    <param name="children_lock">
       <bool value="false"/>
     </param>
-  </layer>
-  <layer type="star" active="true" version="0.1">
-    <param name="z_depth">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="amount">
-      <real value="1.0000000000"/>
-    </param>
-    <param name="blend_method">
-      <integer value="0"/>
-    </param>
-    <param name="color">
-      <color>
-        <r>1.000000</r>
-        <g>1.000000</g>
-        <b>1.000000</b>
-        <a>1.000000</a>
-      </color>
-    </param>
-    <param name="offset">
+    <param name="focus">
       <vector>
         <x>0.0000000000</x>
         <y>0.0000000000</y>
       </vector>
     </param>
-    <param name="invert">
-      <bool value="false"/>
-    </param>
-    <param name="antialias">
-      <bool value="true"/>
-    </param>
-    <param name="feather">
-      <real value="0.0000000000"/>
-    </param>
-    <param name="blurtype">
-      <integer value="1"/>
-    </param>
-    <param name="winding_style">
-      <integer value="0"/>
-    </param>
-    <param name="radius1">
-      <real value="2.4663490320"/>
-    </param>
-    <param name="radius2">
-      <real value="1.2331745160"/>
-    </param>
-    <param name="angle">
-      <angle value="90.000000"/>
-    </param>
-    <param name="points">
-      <integer value="5"/>
-    </param>
-    <param name="regular_polygon">
-      <bool value="false"/>
-    </param>
   </layer>
-  <layer type="PasteCanvas" active="true" version="0.1">
+  <layer type="PasteCanvas" active="true" version="0.1" desc="star">
     <param name="z_depth">
       <real value="0.0000000000"/>
     </param>
@@ -436,7 +362,7 @@
     </param>
     <param name="canvas">
       <canvas>
-        <layer type="star" active="true" version="0.1">
+        <layer type="star" active="true" version="0.1" desc="Star Black">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -454,10 +380,10 @@
               <a>1.000000</a>
             </color>
           </param>
-          <param name="offset">
-            <vector>
+          <param name="origin">
+            <vector guid="FE13484A5322D77FE94E6E52EC4AE9CC">
               <x>0.0000000000</x>
-              <y>0.0000000000</y>
+              <y>-0.1658886075</y>
             </vector>
           </param>
           <param name="invert">
@@ -476,10 +402,10 @@
             <integer value="0"/>
           </param>
           <param name="radius1">
-            <real value="1.9471176568"/>
+            <real value="3.3466084726"/>
           </param>
           <param name="radius2">
-            <real value="0.9735588284"/>
+            <real value="1.6733042363"/>
           </param>
           <param name="angle">
             <angle value="90.000000"/>
@@ -491,7 +417,7 @@
             <bool value="false"/>
           </param>
         </layer>
-        <layer type="linear_gradient" active="true" version="0.0" desc="Gradient">
+        <layer type="star" active="true" version="0.1" desc="Star White">
           <param name="z_depth">
             <real value="0.0000000000"/>
           </param>
@@ -499,40 +425,50 @@
             <real value="1.0000000000"/>
           </param>
           <param name="blend_method">
-            <integer value="13"/>
+            <integer value="19"/>
           </param>
-          <param name="p1">
-            <vector>
-              <x>2.4688332081</x>
-              <y>-3.3694140911</y>
-            </vector>
+          <param name="color">
+            <color>
+              <r>1.000000</r>
+              <g>1.000000</g>
+              <b>1.000000</b>
+              <a>1.000000</a>
+            </color>
           </param>
-          <param name="p2">
-            <vector>
-              <x>-0.5900356174</x>
-              <y>0.8074172139</y>
+          <param name="origin">
+            <vector guid="FE13484A5322D77FE94E6E52EC4AE9CC">
+              <x>0.0000000000</x>
+              <y>-0.1658886075</y>
             </vector>
           </param>
-          <param name="gradient">
-            <gradient>
-              <color pos="0.000000">
-                <r>0.064115</r>
-                <g>0.064115</g>
-                <b>0.064115</b>
-                <a>1.000000</a>
-              </color>
-              <color pos="1.000000">
-                <r>1.000000</r>
-                <g>1.000000</g>
-                <b>1.000000</b>
-                <a>1.000000</a>
-              </color>
-            </gradient>
-          </param>
-          <param name="loop">
+          <param name="invert">
             <bool value="false"/>
           </param>
-          <param name="zigzag">
+          <param name="antialias">
+            <bool value="true"/>
+          </param>
+          <param name="feather">
+            <real value="0.0000000000"/>
+          </param>
+          <param name="blurtype">
+            <integer value="1"/>
+          </param>
+          <param name="winding_style">
+            <integer value="0"/>
+          </param>
+          <param name="radius1">
+            <real value="2.6874280159"/>
+          </param>
+          <param name="radius2">
+            <real value="1.3437140080"/>
+          </param>
+          <param name="angle">
+            <angle value="90.000000"/>
+          </param>
+          <param name="points">
+            <integer value="5"/>
+          </param>
+          <param name="regular_polygon">
             <bool value="false"/>
           </param>
         </layer>
@@ -547,5 +483,11 @@
     <param name="children_lock">
       <bool value="false"/>
     </param>
+    <param name="focus">
+      <vector>
+        <x>0.0000000000</x>
+        <y>0.0000000000</y>
+      </vector>
+    </param>
   </layer>
 </canvas>
diff --git a/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp b/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp
index 25345ea..553a517 100644
--- a/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp
+++ b/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp
@@ -356,7 +356,7 @@ CellRenderer_ValueBase::render_vfunc(
 		property_text()=(Glib::ustring)data.get(Time()).get_string(get_canvas()->rend_desc().get_frame_rate(),App::get_time_format());
 		break;
 	case ValueBase::TYPE_ANGLE:
-		property_text()=(Glib::ustring)strprintf("%.2f DEG",(Real)Angle::deg(data.get(Angle())).get());
+		property_text()=(Glib::ustring)strprintf("%.2fᵒ",(Real)Angle::deg(data.get(Angle())).get());
 		break;
 	case ValueBase::TYPE_INTEGER:
 		if(((synfig::ParamDesc)property_param_desc_).get_hint()!="enum")
@@ -413,7 +413,7 @@ CellRenderer_ValueBase::render_vfunc(
 				property_text()=(Glib::ustring)data.get(etl::handle<synfig::Canvas>())->get_id();
 		}
 		else
-			property_text()="<No Image Selected>";
+			property_text()=_("<No Image Selected>");
 		break;
 	case ValueBase::TYPE_COLOR:
 		{
diff --git a/synfig-studio/src/gui/duckmatic.cpp b/synfig-studio/src/gui/duckmatic.cpp
index cece9fb..adf95f6 100644
--- a/synfig-studio/src/gui/duckmatic.cpp
+++ b/synfig-studio/src/gui/duckmatic.cpp
@@ -1488,7 +1488,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 				return false;
 			etl::handle<Duck> vertex_duck(last_duck());
 			vertex_duck->set_type(Duck::TYPE_VERTEX);
-			if(!add_to_ducks(synfigapp::ValueDesc(value_node,4),canvas_view,transform_stack))
+			if(!add_to_ducks(synfigapp::ValueDesc(value_node,4,-TANGENT_HANDLE_SCALE),canvas_view,transform_stack))
 				return false;
 			etl::handle<Duck> t1_duck(last_duck());
 
@@ -1501,7 +1501,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 			// If the tangents are split
 			if((*value_node->get_link("split"))(get_time()).get(bool()))
 			{
-				if(!add_to_ducks(synfigapp::ValueDesc(value_node,5),canvas_view,transform_stack))
+				if(!add_to_ducks(synfigapp::ValueDesc(value_node,5,TANGENT_HANDLE_SCALE),canvas_view,transform_stack))
 					return false;
 				t2_duck=last_duck();
 				t2_duck->set_origin(vertex_duck);
@@ -1510,7 +1510,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 			}
 			else
 			{
-				if(!add_to_ducks(synfigapp::ValueDesc(value_node,4),canvas_view,transform_stack))
+				if(!add_to_ducks(synfigapp::ValueDesc(value_node,4,TANGENT_HANDLE_SCALE),canvas_view,transform_stack))
 					return false;
 				t2_duck=last_duck();
 				t2_duck->set_origin(vertex_duck);
@@ -1665,7 +1665,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 					// Add the tangent1 duck
 					if(composite_vertex_value_node)
 					{
-						if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,4),canvas_view,transform_stack))
+						if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,4,-TANGENT_BEZIER_SCALE),canvas_view,transform_stack))
 							return false;
 						tduck=last_duck();
 					}
@@ -1722,7 +1722,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 				if(composite_vertex_value_node)
 				{
 					int i=bline_point.get_split_tangent_flag()?5:4;
-					if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,i),canvas_view,transform_stack,0,2))
+					if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,i,TANGENT_BEZIER_SCALE),canvas_view,transform_stack,0,2))
 						return false;
 					tduck=last_duck();
 				}
diff --git a/synfig-studio/src/gui/iconcontroller.cpp b/synfig-studio/src/gui/iconcontroller.cpp
index ff48707..7022de0 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -154,7 +154,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas"));
 	INIT_STOCK_ICON(saveall,"saveall_icon."IMAGE_EXT,_("Save All"));
 
-		// Layers
+	// Layers
 	INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
 	// Blur Layers
 	INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon."IMAGE_EXT,_("Blur Layer"));
@@ -530,7 +530,7 @@ studio::layer_icon(const synfig::String &layer)
 		return Gtk::StockID("synfig-layer_geometry_rectangle");
 	else if(layer=="region")
 		return Gtk::StockID("synfig-layer_geometry_region");
-	else if(layer=="solid_color")
+	else if(layer=="solid_color" || layer=="SolidColor")
 		return Gtk::StockID("synfig-layer_geometry_solidcolor");
 	else if(layer=="star")
 		return Gtk::StockID("synfig-layer_geometry_star");
@@ -550,7 +550,7 @@ studio::layer_icon(const synfig::String &layer)
 	// Other Layers
 	else if(layer=="duplicate")
 		return Gtk::StockID("synfig-layer_other_duplicate");
-	else if(layer=="importimage")
+	else if(layer=="importimage" || layer=="import")
 		return Gtk::StockID("synfig-layer_other_importimage");
 	else if(layer=="PasteCanvas" || layer=="pastecanvas" || layer=="paste_canvas")
 		return Gtk::StockID("synfig-layer_other_pastecanvas");
diff --git a/synfig-studio/src/gui/workarearenderer/renderer_ducks.cpp b/synfig-studio/src/gui/workarearenderer/renderer_ducks.cpp
index 5ad88cb..8760b79 100644
--- a/synfig-studio/src/gui/workarearenderer/renderer_ducks.cpp
+++ b/synfig-studio/src/gui/workarearenderer/renderer_ducks.cpp
@@ -304,7 +304,34 @@ Renderer_Ducks::render_vfunc(
 		if(!(*iter)->get_editable())
 			screen_duck.color=(DUCK_COLOR_NOT_EDITABLE);
 		else if((*iter)->get_tangent())
-			screen_duck.color=((*iter)->get_scalar()<0 ? DUCK_COLOR_TANGENT_1 : DUCK_COLOR_TANGENT_2);
+		{
+			// Check if we can reach the canvas and set the time to
+			// evaluate the split value accordingly
+			synfig::Canvas::Handle canvas_h(get_work_area()->get_canvas());
+			synfig::Time time(canvas_h?canvas_h->get_time():synfig::Time(0));
+			// Retrieve the split value of the bline point.
+			synfigapp::ValueDesc& v_d((*iter)->get_value_desc());
+			synfig::LinkableValueNode::Handle parent;
+			if(v_d.parent_is_linkable_value_node())
+			{
+				parent=v_d.get_parent_value_node();
+				bool split;
+				synfig::ValueNode::Handle child(parent->get_link("split"));
+				if(synfig::ValueNode_Animated::Handle::cast_dynamic(child))
+				{
+					synfig::ValueNode_Animated::Handle animated_child(synfig::ValueNode_Animated::Handle::cast_dynamic(child));
+					split=animated_child->new_waypoint_at_time(time).get_value(time).get(split);
+				}
+				else if(synfig::ValueNode_Const::Handle::cast_dynamic(child))
+				{
+					synfig::ValueNode_Const::Handle const_child(synfig::ValueNode_Const::Handle::cast_dynamic(child));
+					split=(const_child->get_value()).get(split);
+				}
+				screen_duck.color=(split? DUCK_COLOR_TANGENT_2 : DUCK_COLOR_TANGENT_1);
+			}
+			else
+				screen_duck.color=DUCK_COLOR_TANGENT_1;
+		}
 		else if((*iter)->get_type()&Duck::TYPE_VERTEX)
 			screen_duck.color=DUCK_COLOR_VERTEX;
 		else if((*iter)->get_type()&Duck::TYPE_RADIUS)
diff --git a/synfig-studio/src/synfigapp/action.cpp b/synfig-studio/src/synfigapp/action.cpp
index 21d5f0c..4b89c3e 100644
--- a/synfig-studio/src/synfigapp/action.cpp
+++ b/synfig-studio/src/synfigapp/action.cpp
@@ -196,6 +196,7 @@ Action::Main::Main()
 	ADD_ACTION(Action::ValueDescConnect);
 	ADD_ACTION(Action::ValueDescDisconnect);
 	ADD_ACTION(Action::ValueDescLink);
+	ADD_ACTION(Action::ValueDescLinkOpposite);
 	ADD_ACTION(Action::ValueDescBLineLink);
 
 	ADD_ACTION(Action::WaypointAdd);
diff --git a/synfig-studio/src/synfigapp/actions/valuedesclink.cpp b/synfig-studio/src/synfigapp/actions/valuedesclink.cpp
index 66c736e..6afde69 100644
--- a/synfig-studio/src/synfigapp/actions/valuedesclink.cpp
+++ b/synfig-studio/src/synfigapp/actions/valuedesclink.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2010 Carlos López
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -34,6 +35,7 @@
 
 #include <synfigapp/canvasinterface.h>
 #include <synfig/valuenode_const.h>
+#include <synfig/valuenode_scale.h>
 
 #include <synfigapp/general.h>
 
@@ -56,13 +58,23 @@ ACTION_SET_PRIORITY(Action::ValueDescLink,0);
 ACTION_SET_VERSION(Action::ValueDescLink,"0.0");
 ACTION_SET_CVS_ID(Action::ValueDescLink,"$Id$");
 
+ACTION_INIT(Action::ValueDescLinkOpposite);
+ACTION_SET_NAME(Action::ValueDescLinkOpposite,"ValueDescLinkOpposite");
+ACTION_SET_LOCAL_NAME(Action::ValueDescLinkOpposite,N_("Link Opposite"));
+ACTION_SET_TASK(Action::ValueDescLinkOpposite,"connect");
+ACTION_SET_CATEGORY(Action::ValueDescLinkOpposite,Action::CATEGORY_VALUEDESC);
+ACTION_SET_PRIORITY(Action::ValueDescLinkOpposite,0);
+ACTION_SET_VERSION(Action::ValueDescLinkOpposite,"0.0");
+ACTION_SET_CVS_ID(Action::ValueDescLinkOpposite,"$Id$");
+
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
 
 /* === M E T H O D S ======================================================= */
 
-Action::ValueDescLink::ValueDescLink(): poison(false), status_level(0)
+Action::ValueDescLink::ValueDescLink():
+poison(false), status_level(0), link_scalar(0.0), link_opposite(false)
 {
 }
 
@@ -72,7 +84,7 @@ Action::ValueDescLink::get_param_vocab()
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
 
 	ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
-		.set_local_name(_("ValueDesc to link"))
+		.set_local_name(_("ValueDesc to smart link"))
 		.set_requires_multiple()
 	);
 
@@ -116,6 +128,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param
 			}
 
 			link_value_node=value_desc.get_value_node();
+			link_scalar=value_desc.get_scalar();
 			status_message = _("Used exported ValueNode ('") + link_value_node->get_id() + _("').");
 		}
 		else if(value_desc.is_value_node())
@@ -125,6 +138,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param
 				status_level = 1;
 				status_message = _("Using the only available ValueNode.");
 				link_value_node=value_desc.get_value_node();
+				link_scalar=value_desc.get_scalar();
 			}
 			else if(link_value_node->is_exported())
 			{
@@ -138,6 +152,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param
 					status_level = 2;
 					status_message = _("Using the most referenced ValueNode.");
 					link_value_node=value_desc.get_value_node();
+					link_scalar=value_desc.get_scalar();
 				}
 				else if (status_level <= 2)
 				{
@@ -152,6 +167,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param
 				status_level = 3;
 				status_message = _("There's a tie for most referenced; using the animated ValueNode.");
 				link_value_node=value_desc.get_value_node();
+				link_scalar=value_desc.get_scalar();
 			}
 			else if(ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node()) && !ValueNode_Const::Handle::cast_dynamic(link_value_node))
 			{
@@ -173,6 +189,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param
 					status_level = 4;
 					status_message = _("There's a tie for most referenced, and both are animated; using the one with the most waypoints.");
 					link_value_node=value_desc.get_value_node();
+					link_scalar=value_desc.get_scalar();
 				}
 				else if (status_level <= 4)
 				{
@@ -180,6 +197,26 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param
 					status_message = _("There's a tie for most referenced, and both are animated; using the one with the most waypoints.");
 				}
 			}
+			// If both are Linkable Value Nodes and has waypoint in its children, use the one with more waypoints
+			else if(LinkableValueNode::Handle::cast_dynamic(link_value_node) &&
+					LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node()) &&
+					LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() !=
+					LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size())
+			{
+				if(LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() <
+				LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size())
+				{
+					status_level = 4;
+					status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints.");
+					link_value_node=value_desc.get_value_node();
+					link_scalar=value_desc.get_scalar();
+				}
+				else if (status_level <= 4)
+				{
+					status_level = 4;
+					status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints.");
+				}
+			}
 			// Use the one that was least recently changed
 			else if(link_value_node->get_time_last_changed()!=value_desc.get_value_node()->get_time_last_changed())
 			{
@@ -188,6 +225,7 @@ Action::ValueDescLink::set_param(const synfig::String& name, const Action::Param
 					status_level = 5;
 					status_message = _("Everything is tied; using the least recently modified value.");
 					link_value_node=value_desc.get_value_node();
+					link_scalar=value_desc.get_scalar();
 				}
 				else if (status_level <= 5)
 				{
@@ -262,25 +300,57 @@ Action::ValueDescLink::prepare()
 		add_action_front(action);
 	}
 
-	/*
-	if(!link_value_node->is_exported())
-	{
-		Action::Handle action(Action::create("ValueNodeAdd"));
-
-		action->set_param("canvas",get_canvas());
-		action->set_param("canvas_interface",get_canvas_interface());
-		action->set_param("new",link_value_node);
-		action->set_param("name",strprintf(_("Unnamed%08d"),synfig::UniqueID().get_uid()));
-
-		assert(action->is_ready());
-		if(!action->is_ready())
-			throw Error(Error::TYPE_NOTREADY);
-
-		add_action_front(action);
-	}
-	*/
+	// Check if the selected  link value node is already a scale -1.0 Linkable Value Node
+	bool link_is_scaled(false);
+	if(synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node))
+		{
+			synfig::ValueNode_Const::Handle scale_vn(
+					synfig::ValueNode_Const::Handle::cast_dynamic(
+							synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node)->get_link(1)
+							)
+						);
+			if(scale_vn)
+				if((*scale_vn)(synfig::Time(0))==synfig::ValueBase(Real(-1.0)))
+					link_is_scaled=true;
+		}
 
 	std::list<ValueDesc>::iterator iter;
+	// Gets the scalar value of the current value node
+	Real current_scalar(value_desc_list.begin()->get_scalar());
+	bool found_inverse(false);
+	// Check if we are dealing the case of linking differnt types of tangents
+	for(iter=value_desc_list.begin();iter!=value_desc_list.end();++iter)
+	{
+		ValueDesc& v_desc(*iter);
+		// If parent is linkable value node
+		if(v_desc.parent_is_linkable_value_node())
+		{
+			// if the link describe to any tangent (index 4 or 5), continue
+			if(v_desc.get_index() == 4 || v_desc.get_index() == 5)
+			{
+				synfig::Real iter_scalar=v_desc.get_scalar();
+				// Let's compare the sign  of scalar of the value node witht the current one
+				// and remember if a change of sign is seen.
+				if(iter_scalar*current_scalar < 0) // if they have different signs
+				{
+					found_inverse=true;
+					current_scalar=iter_scalar;
+				}
+			}
+			else // link doesn't describe a tangent
+			{
+				found_inverse=false;
+				break;
+			}
+		}
+		else // parent is not a linkable value node
+		{
+			found_inverse=false;
+			break;
+		}
+	}
+	// found_inverse =  true only if all they are tangents and some are inversed tangents
+	//Noe let's loop throug all the value desc
 	for(iter=value_desc_list.begin();iter!=value_desc_list.end();++iter)
 	{
 		ValueDesc& value_desc(*iter);
@@ -289,20 +359,182 @@ Action::ValueDescLink::prepare()
 		// don't link it to itself
 		if (value_desc.is_exported())
 			continue;
+		// Don't link the selected to itself (maybe it is redundant with the previous check)
+		if(value_desc.get_value_node() == link_value_node)
+			continue;
+		// found_inverse xor link_opposite
+		// If     found_inverse and not link_opposite then scale by -1 first (smart link)
+		// If     found inverse and     link_opposite then do a direct link instead
+		// If not found_inverse and not link_opposite then do a direct link instead
+		// If not found_inverse and     link_opposite then scale by -1 first (smart link)
+		if((found_inverse && !link_opposite) || (!found_inverse && link_opposite))
+		{
+			//Check if the current value node has opposite scalar than the link
+			// value node to convert to scale -1.0 before connect.
+			// Check also if the link value node is NOT also a scale -1
+			// And check also if we are linking opposite
+			if( (value_desc.get_scalar()*link_scalar<0 || link_opposite) && (link_is_scaled==false))
+			{
+				//Let's create a Scale Value Node
+				synfig::ValueNode::Handle scale_value_node=synfig::LinkableValueNode::create("scale",iter->get_value(time));
+				if(!scale_value_node)
+					throw Error(Error::TYPE_BUG);
+				scale_value_node->set_parent_canvas(get_canvas());
+				//Let's connect the new Scale Value Node to the value node
+				Action::Handle action1(Action::create("ValueDescConnect"));
+				if(!action1)
+					throw Error(Error::TYPE_CRITICAL);
+				action1->set_param("canvas",get_canvas());
+				action1->set_param("canvas_interface",get_canvas_interface());
+				action1->set_param("dest",value_desc);
+				action1->set_param("src",scale_value_node);
+				assert(action1->is_ready());
+				if(!action1->is_ready())
+					throw Error(Error::TYPE_NOTREADY);
+				add_action_front(action1);
+
+				//Let's Connect the link value node to the scale value node link subparam
+				Action::Handle action2(Action::create("ValueNodeLinkConnect"));
+				if(!action2)
+					throw Error(Error::TYPE_CRITICAL);
+
+				action2->set_param("canvas",get_canvas());
+				action2->set_param("canvas_interface",get_canvas_interface());
+				action2->set_param("parent_value_node",scale_value_node);
+				action2->set_param("index",0);
+				action2->set_param("value_node",link_value_node);
+				assert(action2->is_ready());
+				if(!action2->is_ready())
+					throw Error(Error::TYPE_NOTREADY);
+				add_action_front(action2);
+
+				//Let's Set the scale to -1
+				Action::Handle action3(Action::create("ValueNodeConstSet"));
+				if(!action3)
+					throw Error(Error::TYPE_CRITICAL);
+
+				action3->set_param("canvas",get_canvas());
+				action3->set_param("canvas_interface",get_canvas_interface());
+				action3->set_param("value_node",synfig::LinkableValueNode::Handle::cast_dynamic(scale_value_node)->get_link(1));
+				action3->set_param("new_value",synfig::ValueBase(Real(-1.0)));
+				assert(action3->is_ready());
+				if(!action3->is_ready())
+					throw Error(Error::TYPE_NOTREADY);
+				add_action_front(action3);
+			}
+			else if((iter->get_scalar()*link_scalar<0 || link_opposite) && (link_is_scaled==true))
+			{
+				//Let's connect the link value node -> link to the value node
+				// There is not needed conversion to scale of the value node
+				// because the link value node is already a scale -1
+				Action::Handle action4(Action::create("ValueDescConnect"));
+				if(!action4)
+					throw Error(Error::TYPE_CRITICAL);
+				action4->set_param("canvas",get_canvas());
+				action4->set_param("canvas_interface",get_canvas_interface());
+				action4->set_param("dest",value_desc);
+				action4->set_param("src",synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node)->get_link(0));
+				assert(action4->is_ready());
+				if(!action4->is_ready())
+					throw Error(Error::TYPE_NOTREADY);
+				add_action_front(action4);
+			}
+			else
+			{
+				//Let's connect the link value node to the value node
+				Action::Handle action(Action::create("ValueDescConnect"));
 
-		Action::Handle action(Action::create("ValueDescConnect"));
+				action->set_param("canvas",get_canvas());
+				action->set_param("canvas_interface",get_canvas_interface());
+				action->set_param("src",link_value_node);
+				action->set_param("dest",value_desc);
 
-		action->set_param("canvas",get_canvas());
-		action->set_param("canvas_interface",get_canvas_interface());
-		action->set_param("src",link_value_node);
-		action->set_param("dest",value_desc);
+				assert(action->is_ready());
+				if(!action->is_ready())
+					throw Error(Error::TYPE_NOTREADY);
 
-		assert(action->is_ready());
-		if(!action->is_ready())
-			throw Error(Error::TYPE_NOTREADY);
+				add_action_front(action);
+			}
+		} // found inverse
+		else // Not found inverse so do a regualr link
+		{
+			//Let's connect the link value node to the value node
+			Action::Handle action(Action::create("ValueDescConnect"));
 
-		add_action_front(action);
+			action->set_param("canvas",get_canvas());
+			action->set_param("canvas_interface",get_canvas_interface());
+			action->set_param("src",link_value_node);
+			action->set_param("dest",value_desc);
+
+			assert(action->is_ready());
+			if(!action->is_ready())
+				throw Error(Error::TYPE_NOTREADY);
+
+			add_action_front(action);
+		}
 	}
 
 	synfig::info("http://synfig.org/Linking#Tier_%d : %s", status_level, status_message.c_str());
 }
+
+
+Action::ValueDescLinkOpposite::ValueDescLinkOpposite()
+{
+}
+
+Action::ParamVocab
+Action::ValueDescLinkOpposite::get_param_vocab()
+{
+	return Action::ValueDescLink::get_param_vocab();
+}
+
+bool
+Action::ValueDescLinkOpposite::is_candidate(const ParamList &x)
+{
+	// If action parameters are not Value Desc
+	if(!candidate_check(get_param_vocab(),x))
+		return false;
+
+	int total_tangents=0;
+	ParamList::const_iterator iter;
+	//Search thru all the Param and pick up the value descriptions
+	for(iter=x.begin(); iter!=x.end(); iter++)
+	{
+		if(iter->first == "value_desc")
+		{
+			ValueDesc v_desc(iter->second.get_value_desc());
+			// if the value description parent is linkable value node, continue
+			if(!v_desc.parent_is_linkable_value_node())
+				return false;
+			// if the link describe to any tangent (index 4 or 5), continue
+			if(v_desc.get_index() != 4 && v_desc.get_index() != 5)
+				return false;
+			total_tangents++;
+		}
+	}
+	// If we found two tangents then continue
+	if(total_tangents!=2)
+		return false;
+	// We have reached exactly two tangents
+	return true;
+}
+
+bool
+Action::ValueDescLinkOpposite::set_param(const synfig::String& name, const Action::Param &param)
+{
+	return Action::ValueDescLink::set_param(name,param);
+}
+
+bool
+Action::ValueDescLinkOpposite::is_ready()const
+{
+	return Action::ValueDescLink::is_ready();
+}
+
+void
+Action::ValueDescLinkOpposite::prepare()
+{
+	// prepare to do a opposite link and reuse the code from ValueDescLink
+	link_opposite=true;
+	ValueDescLink::prepare();
+}
diff --git a/synfig-studio/src/synfigapp/actions/valuedesclink.h b/synfig-studio/src/synfigapp/actions/valuedesclink.h
index a72e78f..e7c4ba6 100644
--- a/synfig-studio/src/synfigapp/actions/valuedesclink.h
+++ b/synfig-studio/src/synfigapp/actions/valuedesclink.h
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2010 Carlos López
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -46,13 +47,27 @@ class ValueDescLink :
 	public Super
 {
 private:
-
+	friend class ValueDescLinkOpposite;
+	//! List of Value Descriptions retrieved from the action Parameters list
+	//! to be linked
 	std::list<ValueDesc> value_desc_list;
+	//! Selected value node from the Value Descriptions (maybe none)
+	//! to which the others would link
 	synfig::ValueNode::Handle link_value_node;
+	//! If poison is true then Link is not possible (two exported value nodes found)
 	bool poison;
+	//! Used to monitorize the tie decision when selecting the link value node
 	int status_level;
+	//! Message to inform the status of the tie decision when selecting the link value node
 	synfig::String status_message;
+	//! Time where the value nodes are evaluated
 	synfig::Time time;
+	//! Scalar value of the link value node. It is used for linking tangents.
+	//! In the synfig::ParamDesc list there is a value used to draw the tangents on the
+	//! canvas that is called scalar
+	synfig::Real link_scalar;
+	//! If true then link opposite is being called.
+	bool link_opposite;
 public:
 
 	ValueDescLink();
@@ -68,6 +83,24 @@ public:
 	ACTION_MODULE_EXT
 };
 
+class ValueDescLinkOpposite :
+	public ValueDescLink
+{
+public:
+
+	ValueDescLinkOpposite();
+
+	static ParamVocab get_param_vocab();
+	static bool is_candidate(const ParamList &x);
+
+	virtual bool set_param(const synfig::String& name, const Param &);
+	virtual bool is_ready()const;
+
+	virtual void prepare();
+
+	ACTION_MODULE_EXT
+};
+
 }; // END of namespace action
 }; // END of namespace studio
 
diff --git a/synfig-studio/src/synfigapp/value_desc.h b/synfig-studio/src/synfigapp/value_desc.h
index 99b4604..56501a2 100644
--- a/synfig-studio/src/synfigapp/value_desc.h
+++ b/synfig-studio/src/synfigapp/value_desc.h
@@ -59,6 +59,9 @@ class ValueDesc
 	// Info for exported ValueNode
 	synfig::Canvas::Handle canvas;
 
+	// Info for visual editon
+	synfig::Real scalar;
+
 public:
 	bool operator==(const ValueDesc &rhs)const
 	{
@@ -70,7 +73,9 @@ public:
 			return true;
 		if((canvas||rhs.canvas) && canvas!=rhs.canvas)
 			return false;
-		if((parent_value_node||rhs.parent_value_node) && parent_value_node!=rhs.parent_value_node)
+		if((parent_value_node||rhs.parent_value_node) && (parent_value_node!=rhs.parent_value_node))
+			return false;
+		if(scalar!=rhs.scalar)
 			return false;
 		if(index!=rhs.index)
 			return false;
@@ -90,9 +95,10 @@ public:
 		layer(layer),
 		name(param_name) { }
 
-	ValueDesc(synfig::LinkableValueNode::Handle parent_value_node,int index):
+	ValueDesc(synfig::LinkableValueNode::Handle parent_value_node,int index, synfig::Real s=1.0):
 		parent_value_node(parent_value_node),
-		index(index) { }
+		index(index),
+		scalar(s) { }
 
 //	ValueDesc(synfig::LinkableValueNode::Handle parent_value_node,const synfig::String& param_name):
 //		parent_value_node(parent_value_node),
@@ -131,6 +137,7 @@ public:
 
 	synfig::ValueNode::Handle get_parent_value_node()const { assert(parent_is_value_node()); return parent_value_node; }
 	int get_index()const { assert(parent_is_linkable_value_node()); return index; }
+	synfig::Real get_scalar()const { assert(parent_is_linkable_value_node()); return scalar; }
 	synfig::String get_name()const { assert(parent_is_linkable_value_node()); return (synfig::LinkableValueNode::Handle::cast_reinterpret(parent_value_node))->link_name(index); }
 	synfig::Time get_waypoint_time()const { assert(parent_is_waypoint()); return waypoint_time; }
 
@@ -194,6 +201,7 @@ public:
 
 	synfig::String
 	get_description(bool show_exported_name = true)const;
+
 }; // END of class ValueDesc
 
 }; // END of namespace synfigapp_instance