Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-artwork/mainline

Conflicts:
	icons/scalable/actions/Makefile.am

18 files changed, 262 insertions, 2 deletions

diff --git a/gtk/engine/sugar-info.c b/gtk/engine/sugar-info.c
index b4313a7..b4bf9c5 100644
--- a/gtk/engine/sugar-info.c
+++ b/gtk/engine/sugar-info.c
@@ -191,7 +191,10 @@ sugar_fill_arrow_info (SugarArrowInfo *arrow_info,
     arrow_info->filled_triangle = FALSE;
 
     /* If the background is black, then we draw a solid triangle. */
-    color = &info->style->bg[GTK_STATE_NORMAL];
+    if (info->rc_style->color_flags & SUGAR_COLOR_BG)
+        color = &info->rc_style->colors[SUGAR_COLOR_BG];
+    else
+        color = &info->style->bg[GTK_STATE_NORMAL];
     if (color->red == 0 && color->green == 0 && color->blue == 0)
         arrow_info->filled_triangle = TRUE;
 }
diff --git a/gtk/theme/gtkrc.em b/gtk/theme/gtkrc.em
index 5a4078f..f22a3e8 100644
--- a/gtk/theme/gtkrc.em
+++ b/gtk/theme/gtkrc.em
@@ -822,6 +822,7 @@ widget_class "*<GtkScrolledWindow>.<GtkHScrollbar>" style "hscrollbar-scrolled-w
 
 # Toolbar
 widget_class "*<GtkToolButton>*"          style "toolbutton"
+widget_class "*<SugarColorToolButton>*"   style "toolbutton"
 widget_class "*<GtkSeparatorToolItem>*"   style "separatortoolbutton"
 widget_class "*<GtkToolbar>"              style "toolbar"
 
diff --git a/icons/scalable/actions/transfer-from-application-octet-stream.svg b/icons/scalable/actions/transfer-from-application-octet-stream.svg
new file mode 100644
index 0000000..1228c14
--- /dev/null
+++ b/icons/scalable/actions/transfer-from-application-octet-stream.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-data">
+	<g>
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g>
+		<g>
+			<polygon fill="#ffffff" points="18.434,10.583 32.046,10.583 39.809,18.343 39.809,38.42      18.434,38.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.809,18.343 32.046,18.343 32.046,10.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<rect fill="&fill_color;" height="3.576" width="3.575" x="22.015" y="29.131"/>
+	<rect fill="&fill_color;" height="3.575" width="3.575" x="25.59" y="25.556"/>
+	<rect fill="&fill_color;" height="3.576" width="3.575" x="29.165" y="29.131"/>
+	<rect fill="&fill_color;" height="3.575" width="3.576" x="32.74" y="25.556"/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-from-audio-x-generic.svg b/icons/scalable/actions/transfer-from-audio-x-generic.svg
new file mode 100644
index 0000000..489989d
--- /dev/null
+++ b/icons/scalable/actions/transfer-from-audio-x-generic.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-audio">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="18.435,10.583 32.046,10.583 39.811,18.343 39.811,38.42      18.435,38.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.811,18.343 32.046,18.343 32.046,10.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<path d="M29.74,32.428   c-0.332-0.946-2.086-0.697-2.866-0.045c-1.56,1.306-0.275,2.857,1.511,2.131C29.401,34.098,30.072,33.377,29.74,32.428z" display="inline" fill="&fill_color;" stroke="&fill_color;" stroke-width="2.275"/>
+	<line display="inline" fill="none" stroke="&fill_color;" stroke-width="1.4625" x1="30.141" x2="30.141" y1="32.499" y2="24.154"/>
+	<polygon display="inline" fill="&fill_color;" points="34.109,22.899 29.424,25.212 29.424,22.698 34.109,20.383  "/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-from-image-x-generic.svg b/icons/scalable/actions/transfer-from-image-x-generic.svg
new file mode 100644
index 0000000..b1b485f
--- /dev/null
+++ b/icons/scalable/actions/transfer-from-image-x-generic.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-image">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="43.041,35.189 43.041,21.577 35.281,13.812      15.204,13.812 15.204,35.189    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="35.281,13.812 35.281,21.577 43.041,21.577    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<path d="M29.206,21.798c-4.067,0-7.456,4.056-7.456,4.056s3.389,4.076,7.456,4.074   c4.069-0.004,7.458-4.078,7.458-4.078S33.275,21.795,29.206,21.798z M29.206,28.715c-1.575,0-2.852-1.277-2.852-2.853   c0-1.572,1.277-2.852,2.852-2.852c1.573,0,2.85,1.28,2.85,2.852C32.056,27.438,30.779,28.715,29.206,28.715z" display="inline" fill="&fill_color;"/>
+	<circle cx="29.207" cy="25.863" display="inline" fill="&fill_color;" r="1.294"/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-from-text-uri-list.svg b/icons/scalable/actions/transfer-from-text-uri-list.svg
new file mode 100644
index 0000000..d6f83c6
--- /dev/null
+++ b/icons/scalable/actions/transfer-from-text-uri-list.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-url">
+	<g>
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g>
+		<g>
+			<polygon fill="#ffffff" points="18.435,10.583 32.046,10.583 39.811,18.343 39.811,38.42      18.435,38.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.811,18.343 32.046,18.343 32.046,10.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<g>
+		<circle cx="29.123" cy="28.4" fill="&fill_color;" r="6.469"/>
+		<g>
+			<path d="M29.124,21.932c0,0,3.596,2.971,3.596,6.492     c0,3.523-3.596,6.445-3.596,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/>
+			<path d="M29.124,21.932c0,0-3.642,2.728-3.642,6.492     c0,3.765,3.642,6.445,3.642,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/>
+			<line fill="none" stroke="#ffffff" stroke-width="0.975" x1="29.124" x2="29.124" y1="21.932" y2="34.869"/>
+			<line fill="none" stroke="#ffffff" stroke-width="0.975" x1="22.654" x2="35.591" y1="28.4" y2="28.4"/>
+		</g>
+	</g>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-from-text-x-generic.svg b/icons/scalable/actions/transfer-from-text-x-generic.svg
new file mode 100644
index 0000000..f789579
--- /dev/null
+++ b/icons/scalable/actions/transfer-from-text-x-generic.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-text">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="18.435,10.583 32.046,10.583 39.811,18.343 39.811,38.42      18.435,38.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.811,18.343 32.046,18.343 32.046,10.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<line display="inline" fill="none" stroke="&fill_color;" stroke-width="2.275" x1="22.948" x2="35.298" y1="23.688" y2="23.688"/>
+	<line display="inline" fill="none" stroke="&fill_color;" stroke-width="2.275" x1="22.948" x2="35.298" y1="28.238" y2="28.238"/>
+	<line display="inline" fill="none" stroke="&fill_color;" stroke-width="2.275" x1="22.948" x2="35.298" y1="32.787" y2="32.787"/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-from-video-x-generic.svg b/icons/scalable/actions/transfer-from-video-x-generic.svg
new file mode 100644
index 0000000..ef09227
--- /dev/null
+++ b/icons/scalable/actions/transfer-from-video-x-generic.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-video">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="43.041,35.189 43.041,21.577 35.281,13.812      15.204,13.812 15.204,35.189    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="35.281,13.812 35.281,21.577 43.041,21.577    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<path d="M29.207,22.772c-3.092,0-5.668,3.083-5.668,3.083s2.576,3.099,5.668,3.098   c3.092-0.004,5.669-3.102,5.669-3.102S32.299,22.771,29.207,22.772z M29.207,28.031c-1.197,0-2.168-0.972-2.168-2.169   c0-1.195,0.971-2.168,2.168-2.168c1.195,0,2.167,0.973,2.167,2.168C31.374,27.06,30.402,28.031,29.207,28.031z" display="inline" fill="&fill_color;"/>
+	<circle cx="29.207" cy="25.863" display="inline" fill="&fill_color;" r="0.984"/>
+	<circle cx="20.998" cy="25.863" display="inline" fill="&fill_color;" r="0.984"/>
+	<circle cx="18.073" cy="25.863" display="inline" fill="&fill_color;" r="0.984"/>
+	<circle cx="39.847" cy="25.863" display="inline" fill="&fill_color;" r="0.984"/>
+	<circle cx="36.923" cy="25.863" display="inline" fill="&fill_color;" r="0.984"/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-from.svg b/icons/scalable/actions/transfer-from.svg
new file mode 100644
index 0000000..79668c1
--- /dev/null
+++ b/icons/scalable/actions/transfer-from.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+</g></svg>
\ No newline at end of file
diff --git a/icons/scalable/actions/transfer-to-application-octet-stream.svg b/icons/scalable/actions/transfer-to-application-octet-stream.svg
new file mode 100644
index 0000000..f2642f4
--- /dev/null
+++ b/icons/scalable/actions/transfer-to-application-octet-stream.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-to-data">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="8.443,21.866 8.443,52.581     50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 1.75,20.038   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="18.434,16.583 32.046,16.583 39.809,24.343 39.809,44.42      18.434,44.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.809,24.343 32.046,24.343 32.046,16.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<rect display="inline" fill="&fill_color;" height="3.576" width="3.575" x="22.015" y="35.131"/>
+	<rect display="inline" fill="&fill_color;" height="3.575" width="3.575" x="25.59" y="31.556"/>
+	<rect display="inline" fill="&fill_color;" height="3.576" width="3.575" x="29.165" y="35.131"/>
+	<rect display="inline" fill="&fill_color;" height="3.575" width="3.576" x="32.74" y="31.556"/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-to-audio-x-generic.svg b/icons/scalable/actions/transfer-to-audio-x-generic.svg
new file mode 100644
index 0000000..6fbddc6
--- /dev/null
+++ b/icons/scalable/actions/transfer-to-audio-x-generic.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-to-audio">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="8.443,21.866 8.443,52.581     50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 1.75,20.038   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="18.435,16.583 32.046,16.583 39.811,24.343 39.811,44.42      18.435,44.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.811,24.343 32.046,24.343 32.046,16.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<path d="M29.74,38.428   c-0.332-0.946-2.086-0.697-2.866-0.045c-1.56,1.306-0.275,2.857,1.511,2.131C29.401,40.098,30.072,39.377,29.74,38.428z" display="inline" fill="&fill_color;" stroke="&fill_color;" stroke-width="2.275"/>
+	<line display="inline" fill="none" stroke="&fill_color;" stroke-width="1.4625" x1="30.141" x2="30.141" y1="38.499" y2="30.154"/>
+	<polygon display="inline" fill="&fill_color;" points="34.109,28.898 29.424,31.212 29.424,28.698 34.109,26.383  "/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-to-image-x-generic.svg b/icons/scalable/actions/transfer-to-image-x-generic.svg
new file mode 100644
index 0000000..d261c8a
--- /dev/null
+++ b/icons/scalable/actions/transfer-to-image-x-generic.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-to-image">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="8.443,21.866 8.443,52.581     50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 1.75,20.038   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="43.041,41.189 43.041,27.577 35.281,19.812      15.204,19.812 15.204,41.189    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="35.281,19.812 35.281,27.577 43.041,27.577    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<path d="M29.206,27.798c-4.067,0-7.456,4.056-7.456,4.056s3.389,4.076,7.456,4.074   c4.069-0.004,7.458-4.078,7.458-4.078S33.275,27.795,29.206,27.798z M29.206,34.715c-1.575,0-2.852-1.277-2.852-2.853   c0-1.572,1.277-2.853,2.852-2.853c1.573,0,2.85,1.28,2.85,2.853C32.056,33.438,30.779,34.715,29.206,34.715z" display="inline" fill="&fill_color;"/>
+	<circle cx="29.207" cy="31.863" display="inline" fill="&fill_color;" r="1.294"/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-to-text-uri-list.svg b/icons/scalable/actions/transfer-to-text-uri-list.svg
new file mode 100644
index 0000000..624fdbe
--- /dev/null
+++ b/icons/scalable/actions/transfer-to-text-uri-list.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-to-url">
+	<g>
+		<polygon fill="&fill_color;" points="8.443,21.866 8.443,52.581     50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 1.75,20.038   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g>
+		<g>
+			<polygon fill="#ffffff" points="18.435,16.583 32.046,16.583 39.811,24.343 39.811,44.42      18.435,44.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.811,24.343 32.046,24.343 32.046,16.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<g>
+		<circle cx="29.123" cy="34.4" fill="&fill_color;" r="6.469"/>
+		<g>
+			<line fill="none" stroke="#ffffff" stroke-width="0.975" x1="29.124" x2="29.124" y1="27.932" y2="40.869"/>
+			<line fill="none" stroke="#ffffff" stroke-width="0.975" x1="29.124" x2="29.124" y1="27.932" y2="40.869"/>
+			<path d="M29.124,27.932c0,0,3.596,2.97,3.596,6.492     c0,3.523-3.596,6.445-3.596,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/>
+			<path d="M29.124,27.932c0,0-3.642,2.728-3.642,6.492     c0,3.765,3.642,6.445,3.642,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/>
+		</g>
+	</g>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-to-text-x-generic.svg b/icons/scalable/actions/transfer-to-text-x-generic.svg
new file mode 100644
index 0000000..cd878a5
--- /dev/null
+++ b/icons/scalable/actions/transfer-to-text-x-generic.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-to-text">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="8.443,21.866 8.443,52.581     50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 1.75,20.038   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="18.435,16.583 32.046,16.583 39.811,24.343 39.811,44.42      18.435,44.42    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="39.811,24.343 32.046,24.343 32.046,16.583    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<line display="inline" fill="none" stroke="&fill_color;" stroke-width="2.275" x1="22.948" x2="35.298" y1="29.688" y2="29.688"/>
+	<line display="inline" fill="none" stroke="&fill_color;" stroke-width="2.275" x1="22.948" x2="35.298" y1="34.238" y2="34.238"/>
+	<line display="inline" fill="none" stroke="&fill_color;" stroke-width="2.275" x1="22.948" x2="35.298" y1="38.787" y2="38.787"/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-to-video-x-generic.svg b/icons/scalable/actions/transfer-to-video-x-generic.svg
new file mode 100644
index 0000000..2ba759f
--- /dev/null
+++ b/icons/scalable/actions/transfer-to-video-x-generic.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#666666">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-to-video">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="8.443,21.866 8.443,52.581     50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 1.75,20.038   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+	<g display="inline">
+		<g>
+			<polygon fill="#ffffff" points="43.041,41.189 43.041,27.577 35.281,19.812      15.204,19.812 15.204,41.189    " stroke="&fill_color;" stroke-width="2.275"/>
+			<polyline fill="none" points="35.281,19.812 35.281,27.577 43.041,27.577    " stroke="&fill_color;" stroke-width="2.275"/>
+		</g>
+	</g>
+	<path d="M29.207,28.772c-3.092,0-5.668,3.083-5.668,3.083s2.576,3.099,5.668,3.098   c3.092-0.004,5.669-3.102,5.669-3.102S32.299,28.771,29.207,28.772z M29.207,34.031c-1.197,0-2.168-0.972-2.168-2.169   c0-1.195,0.971-2.169,2.168-2.169c1.195,0,2.167,0.974,2.167,2.169C31.374,33.06,30.402,34.031,29.207,34.031z" display="inline" fill="&fill_color;"/>
+	<circle cx="29.207" cy="31.863" display="inline" fill="&fill_color;" r="0.984"/>
+	<circle cx="20.998" cy="31.863" display="inline" fill="&fill_color;" r="0.984"/>
+	<circle cx="18.073" cy="31.863" display="inline" fill="&fill_color;" r="0.984"/>
+	<circle cx="39.847" cy="31.863" display="inline" fill="&fill_color;" r="0.984"/>
+	<circle cx="36.923" cy="31.863" display="inline" fill="&fill_color;" r="0.984"/>
+</g></svg>
diff --git a/icons/scalable/actions/transfer-to.svg b/icons/scalable/actions/transfer-to.svg
new file mode 100644
index 0000000..bb9b3a0
--- /dev/null
+++ b/icons/scalable/actions/transfer-to.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#ffffff">
+]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-to">
+	<g display="inline">
+		<polygon fill="&fill_color;" points="8.443,21.866 8.443,52.581     50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 1.75,20.038   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+</g></svg>
\ No newline at end of file
diff --git a/icons/scalable/control/Makefile.am b/icons/scalable/control/Makefile.am
index e194cdb..965423f 100644
--- a/icons/scalable/control/Makefile.am
+++ b/icons/scalable/control/Makefile.am
@@ -3,7 +3,8 @@ category=control
 icondir = $(datadir)/icons/sugar/$(iconsize)/$(category)
 
 icon_DATA =				\
-	control-popup-arrow.svg
+	control-popup-arrow.svg		\
+	color-preview.svg
 
 EXTRA_DIST = $(icon_DATA)
 
diff --git a/icons/scalable/control/color-preview.svg b/icons/scalable/control/color-preview.svg
new file mode 100644
index 0000000..c33f554
--- /dev/null
+++ b/icons/scalable/control/color-preview.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="device-network-wireless-100">
+	<g>
+		<g>
+			<defs>
+				<rect height="45" id="SVGID_1_" width="45" x="4.875" y="5"/>
+			</defs>
+			<clipPath id="SVGID_2_">
+				<use overflow="visible" xlink:href="#SVGID_1_"/>
+			</clipPath>
+			<path clip-path="url(#SVGID_2_)" d="M46.375,27.498c0,10.494-8.507,19.002-19,19.002s-19-8.508-19-19.002     c0-10.49,8.507-18.998,19-18.998S46.375,17.003,46.375,27.498z" fill="&fill_color;"/>
+		</g>
+		<path d="M46.375,27.498    c0,10.494-8.507,19.002-19,19.002s-19-8.508-19-19.002c0-10.49,8.507-18.998,19-18.998S46.375,17.003,46.375,27.498z" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+	</g>
+</g></svg>
\ No newline at end of file