From 41615891a07ece601a70a3f7149b316cdfdf9ee0 Mon Sep 17 00:00:00 2001
From: creyc <corey@venemo.com>
Date: Thu, 14 Aug 2014 14:03:17 -0400
Subject: [PATCH] Added airplane and vtail graphics

Added airplane and vtail graphics. Also further reduced filesize of
existing graphics + better readability.
---
 images/motor_order/airplane.svg | 101 ++++++++++++
 images/motor_order/custom.svg   |  42 +++--
 images/motor_order/hex6p.svg    | 220 +++++++++++--------------
 images/motor_order/hex6x.svg    | 222 +++++++++++--------------
 images/motor_order/octox.svg    | 281 ++++++++++++++------------------
 images/motor_order/quadp.svg    | 154 ++++++++---------
 images/motor_order/quadx.svg    | 153 ++++++++---------
 images/motor_order/tri.svg      | 163 +++++++++---------
 images/motor_order/vtail.svg    |  73 +++++++++
 images/motor_order/y4.svg       | 154 ++++++++---------
 images/motor_order/y6.svg       | 226 ++++++++++++-------------
 tabs/initial_setup.css          |   5 +
 tabs/initial_setup.js           |   4 +
 13 files changed, 904 insertions(+), 894 deletions(-)
 create mode 100644 images/motor_order/airplane.svg
 create mode 100644 images/motor_order/vtail.svg

diff --git a/images/motor_order/airplane.svg b/images/motor_order/airplane.svg
new file mode 100644
index 0000000000..a04b0f0558
--- /dev/null
+++ b/images/motor_order/airplane.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:#ED1C24;">
+	<!ENTITY st1 "fill:none;stroke:#BF1B2C;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st2 "fill:none;stroke:#000000;stroke-miterlimit:10;">
+	<!ENTITY st3 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#666666;stroke-miterlimit:10;">
+	<!ENTITY st5 "fill:none;stroke:#8D198F;stroke-width:2.4379;stroke-miterlimit:10;">
+	<!ENTITY st6 "fill:none;stroke:#666666;stroke-width:2;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="AirplaneMix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="126.33px"
+	 height="120.93px" viewBox="-14.5 -44.84 126.33 120.93" xml:space="preserve">
+<g id="FrontArrow" transform="matrix(1.25,0,0,-1.25,-381.26404,917.36835)">
+	<path id="path5270" style="&st3;" d="M343.99,717.59v9.9"/>
+	<path id="path5274" style="&st0;" d="M351.42,725.31l-7.48,12.95l-7.48-12.95H351.42L351.42,725.31z"/>
+</g>
+<g id="AirplaneGraphic">
+	<polyline id="polyline3" style="&st4;" points="-4.2,22.63 -4.2,15.58 29,15.58 29,22.63 	"/>
+	<polyline id="polyline5" style="&st4;" points="101.53,22.63 101.53,15.58 68.83,15.58 68.83,22.63 	"/>
+	<path id="rect11_2_" style="&st6;" d="M-13.5,22.63c0,0,0-31.4,18.57-31.4h87.19c18.57,0,18.57,31.4,18.57,31.4H-13.5z"/>
+	<path id="polyline13_2_" style="&st2;" d="M37.73,22.63"/>
+	<path id="polyline13-4_2_" style="&st2;" d="M59.61,22.63"/>
+	<path id="polyline13-4_4_" style="&st6;" d="M46.42,72.99L15.96,71c0-18.32,15.88-15,30.44-18.67l-3.65-29.7"/>
+	<path id="polyline13-4_3_" style="&st6;" d="M54.58,22.63l-3.64,29.7C65.49,56,81.38,52.67,81.38,71l-30.46,1.99"/>
+	<line id="line34_1_" style="&st4;" x1="16.58" y1="65.45" x2="46.76" y2="67.03"/>
+	<line id="line36_1_" style="&st4;" x1="80.76" y1="65.45" x2="50.57" y2="67.03"/>
+	<path id="path38" style="&st4;" d="M50.92,73.57c0-2.09,0-5.78,0-10.99c0-8.56-2.25-8.81-2.25-8.81s-2.25,0.25-2.25,8.81
+		c0,8.56,0,13.01,0,13.01h4.5C50.92,75.6,50.92,74.92,50.92,73.57"/>
+	<polyline id="polyline420" style="&st6;" points="37.72,-8.77 37.72,-15.32 41,-22.39 56.33,-22.39 59.61,-15.32 59.61,-8.77 	"/>
+</g>
+<g id="1and2" transform="matrix(1.25,0,0,-1.25,-378.9054,819.72049)">
+	<g>
+		<path d="M337.29,675.44c0-0.07-0.02-0.12-0.05-0.16c-0.04-0.04-0.09-0.06-0.15-0.06h-0.61c-0.06,0-0.11,0.02-0.15,0.07
+			c-0.04,0.04-0.05,0.1-0.05,0.16v7.04l-1.44-0.63c-0.06-0.02-0.11-0.03-0.15-0.03c-0.07,0-0.1,0.04-0.1,0.13v0.57
+			c0,0.06,0.04,0.11,0.11,0.15l1.69,0.8c0.09,0.05,0.17,0.07,0.24,0.07h0.46c0.06,0,0.11-0.02,0.15-0.06
+			c0.04-0.04,0.06-0.09,0.06-0.16v-7.89H337.29z"/>
+		<path d="M343.59,683.41c0-0.04,0-0.07-0.01-0.09l-2.53-7.88c-0.04-0.15-0.11-0.22-0.2-0.22h-0.63c-0.11,0-0.16,0.05-0.16,0.14
+			c0,0.04,0.01,0.09,0.02,0.14l2.53,7.82c0.04,0.15,0.11,0.22,0.19,0.22h0.63C343.54,683.54,343.59,683.5,343.59,683.41z"/>
+		<path d="M349.51,681.61c0-0.3-0.05-0.57-0.15-0.8c-0.1-0.24-0.25-0.46-0.46-0.67c-0.21-0.21-0.49-0.44-0.85-0.69l-1.07-0.73
+			c-0.4-0.27-0.72-0.53-0.95-0.77c-0.23-0.24-0.39-0.49-0.48-0.74c-0.09-0.25-0.13-0.54-0.13-0.88v-0.24h3.77
+			c0.15,0,0.22-0.06,0.22-0.19v-0.49c0-0.07-0.02-0.12-0.07-0.15c-0.04-0.03-0.1-0.05-0.16-0.05h-4.45c-0.06,0-0.11,0.02-0.16,0.06
+			c-0.05,0.04-0.07,0.09-0.07,0.15v0.91c0,0.39,0.06,0.76,0.18,1.11c0.12,0.35,0.3,0.67,0.56,0.98c0.25,0.3,0.58,0.59,0.98,0.86
+			l1.13,0.77c0.47,0.31,0.77,0.57,0.92,0.77c0.15,0.2,0.22,0.46,0.22,0.8c0,0.27-0.05,0.49-0.16,0.66c-0.1,0.17-0.26,0.29-0.47,0.38
+			c-0.21,0.09-0.47,0.12-0.79,0.12c-0.25,0-0.51-0.02-0.76-0.07c-0.26-0.05-0.51-0.1-0.77-0.17c-0.25-0.07-0.46-0.13-0.63-0.18
+			c-0.07-0.02-0.12-0.02-0.16,0.01c-0.04,0.03-0.06,0.08-0.06,0.14v0.38c0,0.07,0.01,0.12,0.04,0.15c0.02,0.03,0.07,0.06,0.13,0.08
+			c0.19,0.08,0.4,0.16,0.62,0.24c0.22,0.07,0.48,0.14,0.78,0.19s0.58,0.08,0.85,0.08c0.38,0,0.72-0.04,1.02-0.13
+			c0.3-0.09,0.55-0.21,0.74-0.37c0.19-0.16,0.34-0.37,0.45-0.62C349.46,682.25,349.51,681.95,349.51,681.61z"/>
+	</g>
+	<path id="path5318" style="&st5;" d="M353.75,679.1c0-6.38-5.17-11.57-11.57-11.57c-6.4,0-11.57,5.18-11.57,11.57
+		c0,6.39,5.17,11.57,11.57,11.57C348.58,690.67,353.75,685.48,353.75,679.1z"/>
+</g>
+<g id="3" transform="translate(-52.834,-63.500761)">
+	<path id="path5276-7" style="&st1;" d="M78.81,83.09H53.55V57.82h25.27L78.81,83.09L78.81,83.09z"/>
+	<path d="M65.65,75.33c-0.45,0-0.9-0.06-1.37-0.17c-0.47-0.11-0.86-0.23-1.18-0.36c-0.08-0.04-0.14-0.08-0.16-0.12
+		s-0.04-0.1-0.04-0.18v-0.48c0-0.19,0.09-0.25,0.28-0.2c0.55,0.15,1,0.26,1.34,0.33c0.34,0.07,0.71,0.11,1.1,0.11
+		c0.75,0,1.29-0.15,1.61-0.46s0.49-0.8,0.49-1.48v-0.29c0-0.27-0.05-0.53-0.15-0.8c-0.1-0.27-0.28-0.48-0.53-0.65
+		s-0.57-0.26-0.96-0.26h-2.54c-0.18,0-0.27-0.08-0.27-0.25V69.6c0-0.08,0.02-0.14,0.08-0.19c0.06-0.05,0.11-0.08,0.19-0.08h2.54
+		c0.42,0,0.75-0.08,0.99-0.25c0.24-0.17,0.41-0.37,0.51-0.63s0.14-0.52,0.14-0.8v-0.2c0-0.4-0.07-0.71-0.2-0.95
+		c-0.13-0.24-0.35-0.42-0.66-0.53s-0.72-0.17-1.24-0.17c-0.39,0-0.76,0.04-1.11,0.11c-0.35,0.07-0.79,0.18-1.32,0.32
+		c-0.19,0.05-0.28-0.01-0.28-0.2v-0.47c0-0.09,0.01-0.15,0.04-0.19c0.03-0.04,0.08-0.07,0.16-0.11c0.31-0.13,0.7-0.25,1.16-0.37
+		c0.46-0.12,0.93-0.17,1.39-0.17c1.11,0,1.94,0.21,2.51,0.62c0.57,0.41,0.85,1.12,0.85,2.11v0.2c0,0.24-0.03,0.47-0.09,0.68
+		c-0.06,0.21-0.14,0.41-0.26,0.6s-0.26,0.36-0.42,0.52s-0.36,0.28-0.57,0.39c0.46,0.22,0.79,0.53,1.01,0.92
+		c0.22,0.39,0.32,0.82,0.32,1.27v0.29c0,1.02-0.29,1.77-0.89,2.26C67.52,75.07,66.71,75.33,65.65,75.33z"/>
+</g>
+<g id="4">
+	<path id="path5276" style="&st1;" d="M96.78,19.86H71.51V-5.4h25.27V19.86L96.78,19.86z"/>
+	<path d="M87.55,8.71c0,0.08-0.03,0.14-0.08,0.18c-0.05,0.04-0.12,0.06-0.19,0.06h-1.22v2.5c0,0.08-0.02,0.14-0.07,0.2
+		c-0.04,0.05-0.1,0.08-0.17,0.08h-0.81c-0.16,0-0.24-0.09-0.24-0.28v-2.5h-4.05c-0.21,0-0.35-0.04-0.44-0.12s-0.13-0.22-0.13-0.42
+		V7.88c0-0.2,0.06-0.37,0.17-0.52l4.14-5.81c0.1-0.15,0.23-0.23,0.41-0.23h0.82c0.25,0,0.37,0.1,0.37,0.31v6.26h1.22
+		c0.08,0,0.14,0.02,0.19,0.07c0.05,0.05,0.08,0.11,0.08,0.18V8.71L87.55,8.71z M84.79,7.9V3.11c0-0.05-0.02-0.08-0.05-0.08h-0.01
+		c-0.04,0-0.07,0.03-0.11,0.08L81.39,7.7c-0.03,0.04-0.05,0.08-0.05,0.12c0,0.05,0.04,0.08,0.12,0.08H84.79z"/>
+</g>
+<g id="5">
+	<polyline id="polyline40" style="&st2;" points="48.67,65.33 28.26,44.49 17.37,44.49 	"/>
+	<path id="path5276-7_1_" style="&st1;" d="M17.2,57.08H-8.07V31.81H17.2V57.08z"/>
+	<circle id="circle62" cx="48.67" cy="65.33" r="1.88"/>
+	<path d="M4.88,49.42c-0.45,0-0.91-0.06-1.38-0.17s-0.86-0.23-1.17-0.36c-0.09-0.05-0.14-0.09-0.17-0.12
+		c-0.03-0.03-0.04-0.09-0.04-0.17v-0.48c0-0.19,0.09-0.26,0.28-0.2c0.97,0.29,1.79,0.44,2.45,0.44c0.78,0,1.36-0.18,1.73-0.55
+		s0.55-0.92,0.55-1.65v-0.21c0-0.69-0.22-1.17-0.67-1.45s-1.2-0.42-2.25-0.42H2.53c-0.06,0-0.12-0.03-0.16-0.08
+		s-0.06-0.11-0.06-0.16v-0.01l0.39-4.66C2.71,39.1,2.74,39.04,2.8,39c0.06-0.04,0.12-0.06,0.18-0.06H7.8c0.08,0,0.14,0.02,0.2,0.06
+		s0.08,0.1,0.08,0.17v0.62c0,0.15-0.09,0.23-0.28,0.23H3.78l-0.23,3.02h0.66c0.91,0,1.68,0.09,2.29,0.27s1.09,0.49,1.43,0.92
+		c0.34,0.43,0.5,1.01,0.5,1.73v0.21c0,1.04-0.31,1.84-0.93,2.41C6.88,49.15,6.01,49.42,4.88,49.42z"/>
+</g>
+<g id="6">
+	<polyline id="polyline42" style="&st2;" points="61.83,69.6 71.55,44.45 83.02,44.45 	"/>
+	<path id="path5276-7_2_" style="&st1;" d="M108.28,57.08H83.01V31.81h25.27V57.08z"/>
+	<circle id="circle64" cx="61.83" cy="69.59" r="1.66"/>
+	<path d="M96.61,38.73c0.86,0,1.7,0.17,2.52,0.52c0.08,0.03,0.14,0.06,0.16,0.1s0.04,0.1,0.04,0.19v0.51c0,0.18-0.09,0.25-0.28,0.19
+		c-0.59-0.15-1.04-0.27-1.34-0.34c-0.31-0.07-0.67-0.11-1.11-0.11c-0.68,0-1.19,0.13-1.54,0.38c-0.35,0.25-0.58,0.59-0.69,1.03
+		c-0.11,0.44-0.16,1-0.16,1.7v0.16c0.82-0.19,1.53-0.28,2.11-0.28c0.65,0,1.23,0.09,1.74,0.27c0.51,0.18,0.92,0.49,1.23,0.92
+		c0.31,0.43,0.46,1.01,0.46,1.73v0.08c0,0.75-0.13,1.39-0.38,1.91s-0.63,0.93-1.14,1.21c-0.51,0.28-1.14,0.42-1.9,0.42
+		c-0.53,0-1-0.08-1.42-0.24s-0.77-0.4-1.06-0.72c-0.29-0.32-0.52-0.73-0.67-1.24c-0.15-0.51-0.24-1.09-0.24-1.76V42.9
+		c0-0.99,0.14-1.79,0.41-2.4c0.27-0.61,0.68-1.06,1.22-1.34C95.13,38.87,95.8,38.73,96.61,38.73z M98.5,45.78V45.7
+		c0-0.47-0.1-0.86-0.3-1.15c-0.2-0.29-0.46-0.49-0.78-0.61c-0.32-0.12-0.69-0.18-1.09-0.18c-0.31,0-0.68,0.03-1.09,0.08
+		c-0.41,0.05-0.75,0.11-1.02,0.17v1.33c0,0.75,0.08,1.34,0.24,1.76s0.4,0.73,0.71,0.91c0.31,0.18,0.7,0.27,1.18,0.27
+		c0.33,0,0.63-0.05,0.9-0.14c0.27-0.09,0.49-0.23,0.68-0.42c0.19-0.19,0.33-0.45,0.43-0.78C98.45,46.62,98.5,46.23,98.5,45.78z"/>
+</g>
+</svg>
diff --git a/images/motor_order/custom.svg b/images/motor_order/custom.svg
index 2086558f99..70a637ba35 100644
--- a/images/motor_order/custom.svg
+++ b/images/motor_order/custom.svg
@@ -1,26 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg3971" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="43.828px" height="95px"
-	 viewBox="0 0 43.828 95" xml:space="preserve">
-<g id="layer1" transform="translate(-353.46478,-451.46461)">
-	<g id="Custom_Mix" transform="matrix(1.25,0,0,-1.25,29.893856,1001.973)">
-		<path id="MotorOrderGraphic" fill="#BDBCBC" d="M260.982,427.344c-1.417,2.291-2.125,4.313-2.125,6.063
-			c0,1.291,0.344,2.375,1.031,3.25s1.594,1.594,2.719,2.156s2.406,0.969,3.844,1.219s2.906,0.375,4.406,0.375
-			c2.875,0,5.698-0.375,8.469-1.125c2.77-0.75,5.23-1.854,7.375-3.313c2.145-1.459,3.886-3.281,5.219-5.469s2-4.74,2-7.656
-			c0-1.917-0.302-3.615-0.906-5.094c-0.605-1.479-1.406-2.834-2.406-4.063c-1-1.229-2.167-2.375-3.5-3.438s-2.73-2.115-4.188-3.156
-			c-1.25-0.875-2.458-1.719-3.625-2.531s-2.208-1.656-3.125-2.531c-0.917-0.875-1.656-1.823-2.219-2.844
-			c-0.563-1.021-0.844-2.177-0.844-3.469c0-1.209,0.281-2.469,0.844-3.781s1.448-2.844,2.656-4.594
-			c-0.958-0.667-1.906-1.188-2.844-1.563s-1.844-0.563-2.719-0.563c-1.208,0-2.271,0.208-3.188,0.625
-			c-0.917,0.416-1.688,0.979-2.313,1.688c-0.625,0.708-1.104,1.541-1.438,2.5c-0.333,0.958-0.5,1.979-0.5,3.063
-			c0,1.791,0.375,3.448,1.125,4.969c0.75,1.52,1.719,2.938,2.906,4.25s2.542,2.541,4.063,3.688c1.521,1.146,3.052,2.26,4.594,3.344
-			c1.417,1,2.802,1.989,4.156,2.969c1.355,0.979,2.552,1.979,3.594,3c1.042,1.021,1.875,2.083,2.5,3.188
-			c0.625,1.104,0.938,2.302,0.938,3.594c0,1.541-0.375,2.864-1.125,3.969c-0.75,1.104-1.739,2-2.969,2.688s-2.645,1.188-4.25,1.5
-			s-3.281,0.469-5.031,0.469C268.857,430.719,264.482,429.594,260.982,427.344z M277.107,371.032c0-2.25-0.625-3.917-1.875-5
-			c-1.25-1.084-3.063-1.625-5.438-1.625c-1.917,0-3.396,0.604-4.438,1.813c-1.042,1.208-1.563,2.813-1.563,4.813
-			c0,2.375,0.646,4.083,1.938,5.125c1.292,1.041,3.083,1.563,5.375,1.563c2,0,3.5-0.584,4.5-1.75
-			C276.607,374.802,277.107,373.157,277.107,371.032z"/>
-	</g>
-</g>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:#BDBCBC;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="custom-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="43.83px" height="95px"
+	 viewBox="0 0 43.83 95" xml:space="preserve">
+<path id="CustomSymbol" style="&st0;" d="M2.66,16.33C0.89,13.46,0,10.94,0,8.75c0-1.61,0.43-2.97,1.29-4.06
+	s1.99-1.99,3.4-2.69s3.01-1.21,4.8-1.52S13.13,0,15,0c3.59,0,7.12,0.47,10.59,1.41s6.54,2.32,9.22,4.14
+	c2.68,1.82,4.86,4.1,6.52,6.84c1.67,2.73,2.5,5.93,2.5,9.57c0,2.4-0.38,4.52-1.13,6.37c-0.76,1.85-1.76,3.54-3.01,5.08
+	c-1.25,1.54-2.71,2.97-4.38,4.3c-1.67,1.33-3.41,2.64-5.24,3.94c-1.56,1.09-3.07,2.15-4.53,3.16c-1.46,1.02-2.76,2.07-3.91,3.16
+	c-1.15,1.09-2.07,2.28-2.77,3.55s-1.05,2.72-1.05,4.34c0,1.51,0.35,3.09,1.05,4.73s1.81,3.56,3.32,5.74
+	c-1.2,0.83-2.38,1.48-3.56,1.95s-2.31,0.7-3.4,0.7c-1.51,0-2.84-0.26-3.98-0.78c-1.15-0.52-2.11-1.22-2.89-2.11
+	c-0.78-0.88-1.38-1.93-1.8-3.13c-0.42-1.2-0.63-2.47-0.63-3.83c0-2.24,0.47-4.31,1.41-6.21c0.94-1.9,2.15-3.67,3.63-5.31
+	s3.18-3.18,5.08-4.61c1.9-1.43,3.81-2.82,5.74-4.18c1.77-1.25,3.5-2.49,5.19-3.71c1.69-1.22,3.19-2.47,4.49-3.75s2.34-2.6,3.13-3.98
+	c0.78-1.38,1.17-2.88,1.17-4.49c0-1.93-0.47-3.58-1.41-4.96c-0.94-1.38-2.17-2.5-3.71-3.36c-1.54-0.86-3.31-1.48-5.31-1.88
+	c-2.01-0.39-4.1-0.59-6.29-0.59C12.5,12.11,7.03,13.52,2.66,16.33z M22.81,86.72c0,2.81-0.78,4.9-2.34,6.25
+	c-1.56,1.35-3.83,2.03-6.8,2.03c-2.4,0-4.24-0.76-5.55-2.27c-1.3-1.51-1.95-3.52-1.95-6.02c0-2.97,0.81-5.1,2.42-6.41
+	c1.62-1.3,3.85-1.95,6.72-1.95c2.5,0,4.38,0.73,5.63,2.19C22.19,82.01,22.81,84.06,22.81,86.72z"/>
 </svg>
diff --git a/images/motor_order/hex6p.svg b/images/motor_order/hex6p.svg
index 59700dafa9..63738458a8 100644
--- a/images/motor_order/hex6p.svg
+++ b/images/motor_order/hex6p.svg
@@ -1,126 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg4419" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="119.33px"
-	 height="135.031px" viewBox="0 0 119.33 135.031" xml:space="preserve">
-<g id="layer1" transform="translate(-315.33485,-443.45501)">
-	<g id="Hexa-Plus" transform="matrix(1.25,0,0,-1.25,26.114921,1206.5344)">
-		<g id="MotorOrderGraphic">
-			<g id="FrontArrow">
-				<path id="path5224" fill="none" stroke="#ED1C24" stroke-width="5" stroke-miterlimit="10" d="M281.639,543.118v9.902"/>
-				<path id="path5228" fill="#ED1C24" d="M289.076,550.832l-7.477,12.953l-7.48-12.953H289.076z"/>
-			</g>
-			<g id="M5">
-				<path id="path4000" fill="#231F20" d="M280.755,584.262c-0.388,0-0.781,0.048-1.181,0.144c-0.4,0.096-0.735,0.198-1.005,0.307
-					c-0.074,0.039-0.123,0.073-0.146,0.103s-0.035,0.079-0.035,0.149v0.41c0,0.164,0.08,0.221,0.24,0.17
-					c0.832-0.25,1.534-0.375,2.104-0.375c0.672,0,1.164,0.158,1.479,0.475c0.315,0.316,0.472,0.787,0.472,1.412v0.182
-					c0,0.59-0.193,1.005-0.577,1.245c-0.384,0.24-1.028,0.36-1.93,0.36h-1.436c-0.055,0-0.101,0.023-0.138,0.068
-					s-0.055,0.091-0.055,0.138v0.012l0.334,3.996c0.008,0.063,0.035,0.112,0.082,0.15s0.1,0.056,0.158,0.056h4.13
-					c0.067,0,0.123-0.019,0.17-0.056s0.07-0.087,0.07-0.15v-0.527c0-0.129-0.08-0.193-0.241-0.193h-3.445l-0.193-2.59h0.563
-					c0.781,0,1.437-0.078,1.966-0.234c0.529-0.156,0.937-0.42,1.222-0.791s0.427-0.865,0.427-1.482v-0.182
-					c0-0.891-0.264-1.579-0.794-2.065C282.466,584.505,281.719,584.262,280.755,584.262z"/>
-				<path id="path5498" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M266.354,588.925
-					c0-7.86,6.372-14.232,14.232-14.232c7.861,0,14.233,6.372,14.233,14.232c0,7.86-6.372,14.232-14.233,14.232
-					C272.726,603.157,266.354,596.785,266.354,588.925z"/>
-				<path id="path5502" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M278.129,603.207l6.21-6.186"/>
-				<path id="path5506" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M278.129,603.207l6.812,5.757"/>
-			</g>
-			<g id="M4">
-				<path id="path3994" fill="#231F20" d="M254.33,569.654c0-0.066-0.023-0.118-0.068-0.156c-0.045-0.037-0.098-0.056-0.161-0.056
-					h-1.043v-2.138c0-0.066-0.019-0.123-0.056-0.17s-0.087-0.07-0.149-0.07h-0.697c-0.137,0-0.205,0.081-0.205,0.241v2.138h-3.469
-					c-0.176,0-0.302,0.036-0.378,0.105c-0.076,0.07-0.114,0.19-0.114,0.358v0.457c0,0.168,0.049,0.316,0.146,0.445l3.551,4.98
-					c0.082,0.129,0.199,0.193,0.352,0.193h0.703c0.211,0,0.316-0.087,0.316-0.263v-5.367h1.043c0.066,0,0.121-0.02,0.164-0.059
-					c0.043-0.039,0.064-0.092,0.064-0.159V569.654z M251.963,570.351v4.107c0,0.047-0.016,0.07-0.047,0.07h-0.012
-					c-0.031,0-0.063-0.023-0.094-0.07l-2.771-3.938c-0.027-0.031-0.041-0.064-0.041-0.1c0-0.047,0.033-0.07,0.1-0.07H251.963z"/>
-				<path id="path5510" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M265.536,571.148
-					c0-7.86-6.372-14.232-14.232-14.232c-7.861,0-14.233,6.372-14.233,14.232c0,7.86,6.372,14.232,14.233,14.232
-					C259.165,585.38,265.536,579.008,265.536,571.148z"/>
-				<path id="path5514" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M246.198,584.849l-8.708,0.996"/>
-				<path id="path5518" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M246.198,584.849l-1.769-8.74"/>
-			</g>
-			<g id="M2">
-				<path id="path4014" fill="#231F20" d="M314.506,574.888c0-0.32-0.053-0.606-0.159-0.859c-0.105-0.252-0.27-0.492-0.495-0.72
-					c-0.225-0.229-0.529-0.474-0.912-0.736l-1.148-0.779c-0.434-0.293-0.774-0.568-1.023-0.826c-0.248-0.258-0.42-0.521-0.516-0.791
-					c-0.095-0.27-0.143-0.582-0.143-0.938v-0.252h4.043c0.16,0,0.24-0.068,0.24-0.205v-0.527c0-0.07-0.023-0.124-0.07-0.161
-					c-0.047-0.037-0.103-0.056-0.17-0.056h-4.764c-0.063,0-0.118,0.022-0.167,0.067c-0.048,0.045-0.073,0.099-0.073,0.161v0.973
-					c0,0.418,0.063,0.813,0.19,1.186c0.127,0.373,0.327,0.723,0.598,1.049c0.271,0.326,0.622,0.632,1.052,0.917l1.213,0.82
-					c0.5,0.336,0.83,0.61,0.991,0.823s0.241,0.497,0.241,0.853c0,0.289-0.056,0.524-0.167,0.706
-					c-0.112,0.182-0.278,0.316-0.502,0.402c-0.222,0.086-0.503,0.129-0.844,0.129c-0.269,0-0.542-0.025-0.817-0.073
-					c-0.275-0.049-0.548-0.112-0.82-0.188c-0.272-0.077-0.497-0.14-0.677-0.191c-0.074-0.023-0.133-0.02-0.176,0.012
-					s-0.065,0.082-0.065,0.152v0.41c0,0.074,0.012,0.128,0.038,0.161c0.026,0.034,0.073,0.064,0.143,0.091
-					c0.208,0.09,0.43,0.174,0.669,0.252c0.238,0.078,0.516,0.145,0.834,0.202c0.319,0.056,0.622,0.085,0.911,0.085
-					c0.406,0,0.772-0.047,1.096-0.141s0.59-0.227,0.797-0.398s0.367-0.393,0.48-0.662S314.506,575.251,314.506,574.888
-					L314.506,574.888z"/>
-				<path id="path5522" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M316.985,559.777
-					c-7.157-3.248-15.595-0.078-18.841,7.08c-3.248,7.158-0.078,15.595,7.08,18.841c7.158,3.248,15.594,0.077,18.842-7.08
-					C327.313,571.46,324.142,563.024,316.985,559.777z"/>
-				<path id="path5526" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M321.472,583.047l-2.691,8.342"/>
-				<path id="path5530" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M321.472,583.047l-8.69-2"/>
-			</g>
-			<g id="g4851">
-				<path id="path3998" fill="#231F20" d="M312.264,533.344c0-0.07-0.02-0.128-0.059-0.173c-0.039-0.045-0.091-0.067-0.158-0.067
-					h-0.656c-0.066,0-0.119,0.023-0.158,0.07s-0.059,0.103-0.059,0.17v7.547l-1.547-0.674c-0.063-0.023-0.115-0.034-0.158-0.034
-					c-0.07,0-0.105,0.045-0.105,0.134v0.609c0,0.063,0.039,0.116,0.117,0.158l1.81,0.862c0.098,0.051,0.182,0.076,0.252,0.076h0.492
-					c0.063,0,0.116-0.02,0.161-0.061c0.045-0.041,0.068-0.097,0.068-0.167V533.344z"/>
-				<path id="path5534" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M317.875,550.924
-					c-6.912,3.739-15.55,1.166-19.29-5.748c-3.74-6.912-1.166-15.55,5.748-19.289c6.916-3.739,15.55-1.166,19.291,5.748
-					C327.363,538.549,324.789,547.185,317.875,550.924z"/>
-				<path id="path5538" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M318.106,526.017l-8.039,3.494"/>
-				<path id="path5542" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M318.106,526.017l-4.241-7.845"/>
-			</g>
-			<g id="M6">
-				<path id="path4002" fill="#231F20" d="M283.906,517.301v0.07c0,0.406-0.085,0.733-0.255,0.981
-					c-0.17,0.248-0.394,0.423-0.671,0.525s-0.588,0.152-0.932,0.152c-0.269,0-0.581-0.022-0.938-0.067
-					c-0.355-0.045-0.646-0.095-0.873-0.149v-1.143c0-0.641,0.07-1.144,0.208-1.511s0.341-0.627,0.607-0.78s0.602-0.228,1.008-0.228
-					c0.284,0,0.541,0.039,0.77,0.117c0.228,0.078,0.422,0.198,0.58,0.359c0.158,0.163,0.28,0.385,0.366,0.669
-					C283.863,516.579,283.906,516.914,283.906,517.301z M282.289,523.348c0.738,0,1.459-0.148,2.163-0.445
-					c0.07-0.027,0.117-0.056,0.141-0.085s0.034-0.085,0.034-0.167v-0.434c0-0.156-0.08-0.211-0.24-0.164
-					c-0.504,0.133-0.887,0.23-1.148,0.291c-0.262,0.06-0.578,0.091-0.949,0.091c-0.582,0-1.023-0.108-1.324-0.323
-					s-0.498-0.509-0.589-0.884s-0.138-0.859-0.138-1.453v-0.135c0.707,0.16,1.31,0.241,1.81,0.241c0.555,0,1.052-0.078,1.491-0.234
-					s0.791-0.42,1.055-0.791s0.396-0.865,0.396-1.482v-0.07c0-0.641-0.109-1.188-0.326-1.641s-0.543-0.799-0.979-1.037
-					c-0.435-0.238-0.977-0.357-1.625-0.357c-0.453,0-0.859,0.07-1.216,0.208s-0.661,0.346-0.911,0.621s-0.443,0.63-0.577,1.063
-					s-0.202,0.938-0.202,1.512v2.104c0,0.848,0.117,1.533,0.352,2.056c0.235,0.523,0.584,0.907,1.049,1.152
-					S281.598,523.348,282.289,523.348L282.289,523.348z"/>
-				<path id="path5546" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M280.119,532.251
-					c7.774,1.152,15.013-4.216,16.166-11.991c1.152-7.776-4.217-15.014-11.991-16.166c-7.776-1.155-15.012,4.216-16.165,11.991
-					C266.975,523.86,272.343,531.098,280.119,532.251L280.119,532.251z"/>
-				<path id="path5550" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M268.677,514.274l-2.649-8.353"/>
-				<path id="path5554" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M268.677,514.274l8.238-3.413"/>
-			</g>
-			<g id="M3">
-				<path id="path3996" fill="#231F20" d="M252.24,531.942c-0.383,0-0.775,0.048-1.178,0.144c-0.402,0.095-0.738,0.198-1.008,0.308
-					c-0.07,0.034-0.117,0.068-0.141,0.099s-0.035,0.082-0.035,0.152v0.41c0,0.16,0.08,0.216,0.24,0.17
-					c0.473-0.125,0.854-0.219,1.145-0.281s0.605-0.094,0.941-0.094c0.645,0,1.105,0.131,1.383,0.393s0.416,0.684,0.416,1.266v0.252
-					c0,0.23-0.044,0.458-0.132,0.683c-0.088,0.224-0.238,0.411-0.451,0.559s-0.487,0.222-0.823,0.222h-2.18
-					c-0.152,0-0.229,0.073-0.229,0.217v0.416c0,0.067,0.021,0.122,0.064,0.164c0.043,0.044,0.098,0.065,0.164,0.065h2.18
-					c0.359,0,0.644,0.07,0.852,0.211c0.209,0.141,0.354,0.32,0.434,0.537c0.08,0.216,0.12,0.444,0.12,0.682v0.17
-					c0,0.341-0.057,0.612-0.17,0.818c-0.113,0.205-0.302,0.357-0.565,0.457c-0.264,0.1-0.618,0.149-1.064,0.149
-					c-0.336,0-0.654-0.031-0.955-0.094s-0.678-0.154-1.131-0.276c-0.16-0.047-0.24,0.011-0.24,0.17v0.405
-					c0,0.073,0.012,0.128,0.038,0.161c0.025,0.033,0.071,0.063,0.137,0.091c0.266,0.113,0.598,0.218,0.996,0.314
-					c0.398,0.095,0.795,0.143,1.189,0.143c0.949,0,1.667-0.177,2.154-0.534c0.486-0.355,0.729-0.956,0.729-1.805v-0.17
-					c0-0.207-0.024-0.401-0.073-0.583c-0.049-0.182-0.122-0.354-0.22-0.516c-0.098-0.162-0.219-0.31-0.363-0.443
-					s-0.307-0.244-0.486-0.334c0.391-0.188,0.679-0.45,0.864-0.788c0.186-0.337,0.278-0.702,0.278-1.092v-0.252
-					c0-0.871-0.253-1.516-0.759-1.937C253.859,532.152,253.151,531.942,252.24,531.942L252.24,531.942z"/>
-				<path id="path5558" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M259.759,524.335
-					c6.632,4.219,8.589,13.016,4.371,19.647c-4.219,6.633-13.016,8.589-19.648,4.372c-6.633-4.219-8.589-13.016-4.37-19.648
-					C244.33,522.073,253.127,520.117,259.759,524.335z"/>
-				<path id="path5562" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M241.389,526.607l1.887,8.559"/>
-				<path id="path5566" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M241.389,526.607l-8.513,2.656"/>
-			</g>
-		</g>
-	</g>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:#231F20;">
+	<!ENTITY st3 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="hex6p-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="113.34px"
+	 height="127.02px" viewBox="5.62 7.63 113.34 127.02" xml:space="preserve">
+<g id="M6">
+	<path id="path4002" style="&st2;" d="M65.66,116.45v-0.09c0-0.51-0.11-0.92-0.32-1.23c-0.21-0.31-0.49-0.53-0.84-0.66
+		c-0.35-0.13-0.73-0.19-1.17-0.19c-0.34,0-0.73,0.03-1.17,0.08c-0.44,0.06-0.81,0.12-1.09,0.19v1.43c0,0.8,0.09,1.43,0.26,1.89
+		c0.17,0.46,0.43,0.78,0.76,0.97c0.33,0.19,0.75,0.29,1.26,0.29c0.36,0,0.68-0.05,0.96-0.15c0.29-0.1,0.53-0.25,0.72-0.45
+		c0.2-0.2,0.35-0.48,0.46-0.84C65.61,117.36,65.66,116.94,65.66,116.45z M63.64,108.89c0.92,0,1.82,0.18,2.7,0.56
+		c0.09,0.03,0.15,0.07,0.18,0.11c0.03,0.04,0.04,0.11,0.04,0.21v0.54c0,0.19-0.1,0.26-0.3,0.21c-0.63-0.17-1.11-0.29-1.43-0.36
+		c-0.33-0.08-0.72-0.11-1.19-0.11c-0.73,0-1.28,0.13-1.66,0.4c-0.38,0.27-0.62,0.64-0.74,1.11c-0.11,0.47-0.17,1.07-0.17,1.82v0.17
+		c0.88-0.2,1.64-0.3,2.26-0.3c0.69,0,1.32,0.1,1.86,0.29c0.55,0.2,0.99,0.52,1.32,0.99c0.33,0.46,0.49,1.08,0.49,1.85v0.09
+		c0,0.8-0.14,1.49-0.41,2.05c-0.27,0.57-0.68,1-1.22,1.3c-0.54,0.3-1.22,0.45-2.03,0.45c-0.57,0-1.07-0.09-1.52-0.26
+		c-0.45-0.17-0.83-0.43-1.14-0.78s-0.55-0.79-0.72-1.33c-0.17-0.54-0.25-1.17-0.25-1.89v-2.63c0-1.06,0.15-1.92,0.44-2.57
+		c0.29-0.65,0.73-1.13,1.31-1.44C62.06,109.04,62.78,108.89,63.64,108.89L63.64,108.89z"/>
+	<path id="path5546" style="&st0;" d="M60.93,97.77c9.72-1.44,18.77,5.27,20.21,14.99c1.44,9.72-5.27,18.77-14.99,20.21
+		c-9.72,1.44-18.76-5.27-20.21-14.99C44.5,108.25,51.21,99.21,60.93,97.77L60.93,97.77z"/>
+	<path id="path5550" style="&st4;" d="M46.63,120.24l-3.31,10.44"/>
+	<path id="path5554" style="&st4;" d="M46.63,120.24l10.3,4.27"/>
+</g>
+<g id="M5">
+	<path id="path4000" style="&st2;" d="M61.72,32.75c-0.48,0-0.98-0.06-1.48-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.05-0.15-0.09-0.18-0.13c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.28,0.3-0.21c1.04,0.31,1.92,0.47,2.63,0.47
+		c0.84,0,1.45-0.2,1.85-0.59c0.39-0.4,0.59-0.98,0.59-1.76v-0.23c0-0.74-0.24-1.26-0.72-1.56c-0.48-0.3-1.29-0.45-2.41-0.45h-1.79
+		c-0.07,0-0.13-0.03-0.17-0.08c-0.05-0.06-0.07-0.11-0.07-0.17v-0.02l0.42-5c0.01-0.08,0.04-0.14,0.1-0.19
+		c0.06-0.05,0.13-0.07,0.2-0.07h5.16c0.08,0,0.15,0.02,0.21,0.07c0.06,0.05,0.09,0.11,0.09,0.19v0.66c0,0.16-0.1,0.24-0.3,0.24
+		h-4.31l-0.24,3.24H61c0.98,0,1.8,0.1,2.46,0.29c0.66,0.19,1.17,0.52,1.53,0.99c0.36,0.46,0.53,1.08,0.53,1.85v0.23
+		c0,1.11-0.33,1.97-0.99,2.58C63.86,32.45,62.93,32.75,61.72,32.75z"/>
+	<path id="path5498" style="&st0;" d="M43.72,26.92c0,9.83,7.96,17.79,17.79,17.79c9.83,0,17.79-7.96,17.79-17.79
+		c0-9.82-7.96-17.79-17.79-17.79C51.69,9.13,43.72,17.1,43.72,26.92z"/>
+	<path id="path5502" style="&st4;" d="M44.35,21.12l10.5-3.14"/>
+	<path id="path5506" style="&st4;" d="M44.35,21.12l-2.27-10.91"/>
+</g>
+<g id="M4">
+	<path id="path3994" style="&st2;" d="M28.69,51.01c0,0.08-0.03,0.15-0.08,0.2c-0.06,0.05-0.12,0.07-0.2,0.07h-1.3v2.67
+		c0,0.08-0.02,0.15-0.07,0.21c-0.05,0.06-0.11,0.09-0.19,0.09h-0.87c-0.17,0-0.26-0.1-0.26-0.3v-2.67h-4.34
+		c-0.22,0-0.38-0.04-0.47-0.13c-0.1-0.09-0.14-0.24-0.14-0.45v-0.57c0-0.21,0.06-0.4,0.18-0.56l4.44-6.22
+		c0.1-0.16,0.25-0.24,0.44-0.24h0.88c0.26,0,0.4,0.11,0.4,0.33v6.71h1.3c0.08,0,0.15,0.03,0.21,0.07c0.05,0.05,0.08,0.12,0.08,0.2
+		L28.69,51.01L28.69,51.01z M25.73,50.14v-5.13c0-0.06-0.02-0.09-0.06-0.09h-0.02c-0.04,0-0.08,0.03-0.12,0.09l-3.46,4.92
+		c-0.03,0.04-0.05,0.08-0.05,0.13c0,0.06,0.04,0.09,0.13,0.09L25.73,50.14L25.73,50.14z"/>
+	<path id="path5510" style="&st0;" d="M42.7,49.14c0,9.82-7.96,17.79-17.79,17.79c-9.83,0-17.79-7.97-17.79-17.79
+		c0-9.83,7.97-17.79,17.79-17.79S42.7,39.32,42.7,49.14z"/>
+	<path id="path5514" style="&st4;" d="M19.84,31.58L9.09,29.52"/>
+	<path id="path5518" style="&st4;" d="M19.84,31.58l-3.03,10.73"/>
+</g>
+<g id="M3">
+	<path id="path3996" style="&st2;" d="M26.08,98.15c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.04-0.15-0.08-0.18-0.12s-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		s0.76,0.12,1.18,0.12c0.81,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.85,0.52-1.58v-0.32c0-0.29-0.05-0.57-0.17-0.85
+		c-0.11-0.28-0.3-0.51-0.56-0.7c-0.27-0.19-0.61-0.28-1.03-0.28H23.8c-0.19,0-0.29-0.09-0.29-0.27v-0.52c0-0.08,0.03-0.15,0.08-0.21
+		c0.05-0.05,0.12-0.08,0.21-0.08h2.72c0.45,0,0.81-0.09,1.06-0.26c0.26-0.18,0.44-0.4,0.54-0.67c0.1-0.27,0.15-0.55,0.15-0.85v-0.21
+		c0-0.43-0.07-0.77-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.13-0.77-0.19-1.33-0.19c-0.42,0-0.82,0.04-1.19,0.12
+		c-0.38,0.08-0.85,0.19-1.41,0.34c-0.2,0.06-0.3-0.01-0.3-0.21v-0.51c0-0.09,0.01-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.17-0.11
+		c0.33-0.14,0.75-0.27,1.24-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67c0.61,0.44,0.91,1.19,0.91,2.26v0.21
+		c0,0.26-0.03,0.5-0.09,0.73c-0.06,0.23-0.15,0.44-0.27,0.65c-0.12,0.2-0.27,0.39-0.45,0.55c-0.18,0.17-0.38,0.31-0.61,0.42
+		c0.49,0.24,0.85,0.56,1.08,0.99c0.23,0.42,0.35,0.88,0.35,1.36v0.32c0,1.09-0.32,1.9-0.95,2.42C28.1,97.89,27.22,98.15,26.08,98.15
+		L26.08,98.15z"/>
+	<path id="path5558" style="&st0;" d="M35.48,107.66c8.29-5.27,10.74-16.27,5.46-24.56c-5.27-8.29-16.27-10.74-24.56-5.46
+		c-8.29,5.27-10.74,16.27-5.46,24.56C16.19,110.49,27.19,112.93,35.48,107.66z"/>
+	<path id="path5562" style="&st4;" d="M20.21,109.83l-3.19-10.48"/>
+	<path id="path5566" style="&st4;" d="M20.21,109.83l-10.9,2.32"/>
+</g>
+<g id="M2">
+	<path id="path4014" style="&st2;" d="M103.91,44.47c0,0.4-0.07,0.76-0.2,1.07c-0.13,0.32-0.34,0.62-0.62,0.9
+		c-0.28,0.29-0.66,0.59-1.14,0.92l-1.43,0.97c-0.54,0.37-0.97,0.71-1.28,1.03c-0.31,0.32-0.53,0.65-0.64,0.99
+		c-0.12,0.34-0.18,0.73-0.18,1.17v0.31h5.05c0.2,0,0.3,0.08,0.3,0.26v0.66c0,0.09-0.03,0.15-0.09,0.2
+		c-0.06,0.05-0.13,0.07-0.21,0.07h-5.96c-0.08,0-0.15-0.03-0.21-0.08s-0.09-0.12-0.09-0.2v-1.22c0-0.52,0.08-1.02,0.24-1.48
+		c0.16-0.47,0.41-0.9,0.75-1.31s0.78-0.79,1.32-1.15l1.52-1.03c0.63-0.42,1.04-0.76,1.24-1.03c0.2-0.27,0.3-0.62,0.3-1.07
+		c0-0.36-0.07-0.66-0.21-0.88c-0.14-0.23-0.35-0.39-0.63-0.5c-0.28-0.11-0.63-0.16-1.06-0.16c-0.34,0-0.68,0.03-1.02,0.09
+		c-0.34,0.06-0.68,0.14-1.02,0.23c-0.34,0.1-0.62,0.18-0.85,0.24c-0.09,0.03-0.17,0.02-0.22-0.02c-0.05-0.04-0.08-0.1-0.08-0.19
+		v-0.51c0-0.09,0.02-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.18-0.11c0.26-0.11,0.54-0.22,0.84-0.32c0.3-0.1,0.65-0.18,1.04-0.25
+		c0.4-0.07,0.78-0.11,1.14-0.11c0.51,0,0.96,0.06,1.37,0.18c0.41,0.12,0.74,0.28,1,0.5c0.26,0.21,0.46,0.49,0.6,0.83
+		C103.84,43.62,103.91,44.02,103.91,44.47L103.91,44.47z"/>
+	<path id="path5522" style="&st0;" d="M107.01,63.36c-8.95,4.06-19.49,0.1-23.55-8.85c-4.06-8.95-0.1-19.49,8.85-23.55
+		c8.95-4.06,19.49-0.1,23.55,8.85C119.92,48.75,115.96,59.3,107.01,63.36z"/>
+	<path id="path5526" style="&st4;" d="M112.62,34.27l-3.36-10.43"/>
+	<path id="path5530" style="&st4;" d="M112.62,34.27l-10.86,2.5"/>
+</g>
+<g id="M1">
+	<path id="path3998" style="&st2;" d="M101.11,96.4c0,0.09-0.03,0.16-0.07,0.22c-0.05,0.06-0.11,0.08-0.2,0.08h-0.82
+		c-0.08,0-0.15-0.03-0.2-0.09s-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04c-0.09,0-0.13-0.06-0.13-0.17
+		v-0.76c0-0.08,0.05-0.14,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.09,0.32-0.09h0.61c0.08,0,0.15,0.03,0.2,0.08
+		c0.06,0.05,0.08,0.12,0.08,0.21V96.4L101.11,96.4z"/>
+	<path id="path5534" style="&st0;" d="M108.12,74.42c-8.64-4.67-19.44-1.46-24.11,7.19c-4.67,8.64-1.46,19.44,7.19,24.11
+		c8.64,4.67,19.44,1.46,24.11-7.19C119.98,89.89,116.77,79.1,108.12,74.42z"/>
+	<path id="path5538" style="&st4;" d="M108.41,105.56l-10.05-4.37"/>
+	<path id="path5542" style="&st4;" d="M108.41,105.56l-5.3,9.81"/>
+</g>
+<g id="FrontArrow">
+	<path id="path5224" style="&st3;" d="M62.83,84.18V71.8"/>
+	<path id="path5228" style="&st1;" d="M72.13,74.54l-9.35-16.19l-9.35,16.19H72.13z"/>
 </g>
 </svg>
diff --git a/images/motor_order/hex6x.svg b/images/motor_order/hex6x.svg
index e4a3a72a34..78e0086042 100644
--- a/images/motor_order/hex6x.svg
+++ b/images/motor_order/hex6x.svg
@@ -1,129 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg4235" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="131.271px"
-	 height="126.82px" viewBox="0 0 131.271 126.82" xml:space="preserve">
-<g id="layer1" transform="translate(-309.36456,-449.17394)">
-	<g id="Hexa-X" transform="matrix(1.25,0,0,-1.25,231.63326,1208.6047)">
-		<g id="MotorOrderGraphic">
-			<g id="FrontArrow">
-				<path id="path5248" fill="none" stroke="#ED1C24" stroke-width="5" stroke-miterlimit="10" d="M116.611,545.955v9.902"/>
-				<path id="path5252" fill="#ED1C24" d="M124.049,553.669l-7.478,12.953l-7.48-12.953H124.049z"/>
-			</g>
-			<g id="M4">
-				<path id="path4034" fill="#231F20" d="M101.95,584.224c0-0.066-0.023-0.119-0.067-0.156c-0.045-0.037-0.099-0.055-0.162-0.055
-					h-1.043v-2.139c0-0.066-0.018-0.123-0.055-0.169c-0.037-0.047-0.087-0.07-0.149-0.07h-0.698c-0.137,0-0.205,0.08-0.205,0.24
-					v2.139h-3.469c-0.176,0-0.302,0.035-0.378,0.105c-0.076,0.07-0.114,0.189-0.114,0.357v0.457c0,0.168,0.048,0.316,0.146,0.445
-					l3.551,4.98c0.082,0.129,0.199,0.194,0.352,0.194h0.703c0.211,0,0.316-0.088,0.316-0.264v-5.367h1.043
-					c0.066,0,0.121-0.02,0.164-0.059s0.065-0.091,0.065-0.158V584.224z M99.583,584.921v4.108c0,0.047-0.016,0.07-0.047,0.07h-0.012
-					c-0.031,0-0.063-0.023-0.094-0.07l-2.772-3.938c-0.027-0.031-0.041-0.065-0.041-0.1c0-0.047,0.033-0.07,0.099-0.07H99.583z"/>
-				<path id="path5426" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M113.536,585.612
-					c0-7.859-6.372-14.231-14.232-14.231c-7.861,0-14.233,6.372-14.233,14.231c0,7.86,6.372,14.232,14.233,14.232
-					C107.165,599.844,113.536,593.473,113.536,585.612z"/>
-				<path id="path5430" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M94.198,599.314l-8.708,0.996"/>
-				<path id="path5434" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M94.198,599.314l-1.769-8.74"/>
-			</g>
-			<g id="M2">
-				<path id="path4040" fill="#231F20" d="M136.498,588.904c0-0.32-0.052-0.606-0.158-0.859c-0.105-0.252-0.271-0.492-0.495-0.72
-					c-0.225-0.229-0.528-0.474-0.911-0.736l-1.148-0.779c-0.434-0.293-0.775-0.569-1.023-0.827c-0.248-0.258-0.42-0.521-0.516-0.791
-					c-0.096-0.27-0.144-0.582-0.144-0.938v-0.252h4.043c0.16,0,0.241-0.068,0.241-0.205v-0.527c0-0.07-0.023-0.124-0.07-0.161
-					c-0.047-0.037-0.104-0.056-0.17-0.056h-4.763c-0.063,0-0.119,0.023-0.167,0.067c-0.049,0.045-0.073,0.099-0.073,0.162v0.973
-					c0,0.418,0.063,0.813,0.191,1.186c0.127,0.373,0.326,0.723,0.598,1.049c0.271,0.326,0.622,0.632,1.052,0.917l1.213,0.82
-					c0.5,0.336,0.83,0.61,0.99,0.823c0.16,0.213,0.241,0.498,0.241,0.853c0,0.289-0.056,0.524-0.167,0.705
-					c-0.112,0.182-0.278,0.316-0.501,0.402s-0.504,0.129-0.844,0.129c-0.27,0-0.542-0.024-0.818-0.073
-					c-0.275-0.049-0.548-0.112-0.82-0.188c-0.271-0.077-0.497-0.14-0.677-0.191c-0.074-0.023-0.133-0.02-0.176,0.012
-					s-0.064,0.082-0.064,0.152v0.41c0,0.074,0.013,0.128,0.038,0.161c0.026,0.034,0.073,0.063,0.144,0.091
-					c0.207,0.09,0.43,0.174,0.668,0.252s0.516,0.145,0.835,0.202c0.318,0.056,0.622,0.084,0.911,0.084
-					c0.406,0,0.772-0.047,1.096-0.141s0.59-0.227,0.797-0.398s0.367-0.392,0.48-0.662S136.498,589.267,136.498,588.904
-					L136.498,588.904z"/>
-				<path id="path5438" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M119.344,586.006
-					c0-7.86,6.372-14.232,14.232-14.232c7.861,0,14.233,6.372,14.233,14.232c0,7.86-6.372,14.232-14.233,14.232
-					C125.716,600.238,119.344,593.866,119.344,586.006L119.344,586.006z"/>
-				<path id="path5442" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M131.119,600.287l6.209-6.186"/>
-				<path id="path5446" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M131.119,600.287l6.812,5.757"/>
-			</g>
-			<g id="M5">
-				<path id="path3915" fill="#231F20" d="M150.758,552.359c-0.387,0-0.78,0.048-1.181,0.144c-0.4,0.095-0.735,0.198-1.005,0.308
-					c-0.074,0.039-0.123,0.073-0.146,0.102c-0.023,0.029-0.036,0.079-0.036,0.149v0.41c0,0.164,0.08,0.221,0.241,0.17
-					c0.832-0.25,1.533-0.375,2.103-0.375c0.672,0,1.166,0.158,1.48,0.474c0.315,0.316,0.472,0.787,0.472,1.412v0.181
-					c0,0.59-0.192,1.005-0.577,1.245c-0.384,0.24-1.028,0.36-1.93,0.36h-1.436c-0.055,0-0.1,0.023-0.138,0.067
-					c-0.037,0.045-0.055,0.091-0.055,0.138v0.012l0.334,3.996c0.009,0.063,0.035,0.112,0.082,0.149
-					c0.047,0.037,0.1,0.055,0.159,0.055h4.13c0.066,0,0.123-0.019,0.17-0.055c0.047-0.038,0.07-0.087,0.07-0.149v-0.527
-					c0-0.129-0.08-0.194-0.241-0.194h-3.445l-0.193-2.59h0.563c0.781,0,1.437-0.078,1.966-0.234c0.53-0.156,0.937-0.42,1.222-0.791
-					s0.427-0.866,0.427-1.483v-0.181c0-0.891-0.264-1.58-0.794-2.066C152.469,552.602,151.722,552.359,150.758,552.359
-					L150.758,552.359z"/>
-				<path id="path5450" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M157.346,543.333
-					c-7.158-3.248-15.594-0.078-18.841,7.08c-3.248,7.158-0.077,15.595,7.081,18.841c7.156,3.248,15.593,0.077,18.841-7.08
-					C167.674,555.016,164.504,546.58,157.346,543.333z"/>
-				<path id="path5454" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M161.833,566.603l-2.691,8.342"/>
-				<path id="path5458" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M161.833,566.603l-8.69-2"/>
-			</g>
-			<g id="M1">
-				<path id="path4038" fill="#231F20" d="M135.056,524.406c0-0.07-0.02-0.128-0.059-0.173c-0.039-0.045-0.092-0.067-0.159-0.067
-					h-0.656c-0.066,0-0.119,0.023-0.158,0.07s-0.059,0.103-0.059,0.17v7.547l-1.547-0.673c-0.063-0.023-0.116-0.035-0.159-0.035
-					c-0.07,0-0.105,0.045-0.105,0.134v0.609c0,0.063,0.039,0.116,0.117,0.159l1.811,0.861c0.098,0.051,0.181,0.077,0.252,0.077
-					h0.492c0.063,0,0.116-0.021,0.161-0.062c0.045-0.041,0.068-0.097,0.068-0.167V524.406z"/>
-				<path id="path5462" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M140.686,540.34
-					c-6.912,3.739-15.55,1.166-19.29-5.748c-3.739-6.912-1.165-15.55,5.748-19.289c6.916-3.74,15.55-1.166,19.291,5.748
-					C150.173,527.965,147.6,536.601,140.686,540.34z"/>
-				<path id="path5466" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M140.917,515.433l-8.04,3.493"/>
-				<path id="path5470" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M140.917,515.433l-4.243-7.845"/>
-			</g>
-			<g id="M3">
-				<path id="path4042" fill="#231F20" d="M99.321,523.028c-0.383,0-0.776,0.048-1.178,0.144c-0.402,0.095-0.738,0.198-1.008,0.308
-					c-0.07,0.035-0.117,0.068-0.141,0.099s-0.035,0.082-0.035,0.152v0.41c0,0.16,0.08,0.217,0.241,0.17
-					c0.473-0.125,0.854-0.219,1.145-0.281c0.291-0.063,0.605-0.094,0.941-0.094c0.645,0,1.105,0.13,1.383,0.392
-					s0.416,0.684,0.416,1.266v0.252c0,0.23-0.044,0.458-0.132,0.682c-0.088,0.225-0.238,0.412-0.451,0.56
-					c-0.213,0.148-0.487,0.223-0.823,0.223h-2.18c-0.152,0-0.228,0.072-0.228,0.216v0.416c0,0.066,0.021,0.121,0.064,0.164
-					s0.098,0.064,0.164,0.064h2.18c0.359,0,0.644,0.07,0.852,0.211c0.209,0.141,0.354,0.32,0.434,0.536
-					c0.08,0.217,0.12,0.444,0.12,0.683v0.17c0,0.34-0.056,0.612-0.17,0.817c-0.113,0.205-0.302,0.357-0.566,0.457
-					c-0.264,0.099-0.618,0.149-1.063,0.149c-0.336,0-0.655-0.031-0.955-0.094s-0.677-0.154-1.13-0.275
-					c-0.16-0.047-0.241,0.01-0.241,0.169v0.405c0,0.074,0.012,0.128,0.038,0.161c0.025,0.034,0.071,0.063,0.138,0.091
-					c0.266,0.113,0.598,0.218,0.996,0.314c0.398,0.095,0.795,0.143,1.19,0.143c0.949,0,1.666-0.177,2.153-0.533
-					c0.486-0.355,0.73-0.957,0.73-1.805v-0.17c0-0.207-0.025-0.401-0.073-0.583c-0.049-0.181-0.122-0.353-0.22-0.516
-					c-0.098-0.162-0.219-0.309-0.363-0.442s-0.307-0.245-0.487-0.334c0.391-0.188,0.679-0.45,0.864-0.787
-					c0.186-0.338,0.279-0.702,0.279-1.093v-0.252c0-0.871-0.253-1.516-0.759-1.936C100.939,523.238,100.231,523.028,99.321,523.028
-					L99.321,523.028z"/>
-				<path id="path5474" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M97.577,541.901
-					c7.774,1.152,15.013-4.216,16.166-11.991c1.152-7.777-4.216-15.014-11.991-16.166c-7.777-1.154-15.012,4.216-16.166,11.991
-					C84.433,533.51,89.801,540.748,97.577,541.901z"/>
-				<path id="path5478" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M86.136,523.924l-2.649-8.354"/>
-				<path id="path5482" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M86.136,523.924l8.238-3.412"/>
-			</g>
-			<g id="M6">
-				<path id="path4036" fill="#231F20" d="M84.498,555.019v0.07c0,0.406-0.084,0.733-0.255,0.981
-					c-0.17,0.248-0.394,0.423-0.671,0.524s-0.588,0.152-0.931,0.152c-0.27,0-0.582-0.023-0.938-0.067
-					c-0.355-0.045-0.647-0.094-0.873-0.149v-1.143c0-0.641,0.07-1.145,0.209-1.512c0.138-0.367,0.341-0.627,0.606-0.779
-					s0.602-0.229,1.008-0.229c0.285,0,0.542,0.039,0.77,0.117c0.229,0.078,0.422,0.198,0.58,0.36
-					c0.158,0.162,0.28,0.385,0.366,0.668C84.455,554.297,84.498,554.633,84.498,555.019z M82.881,561.066
-					c0.738,0,1.459-0.148,2.162-0.445c0.07-0.027,0.117-0.056,0.141-0.085c0.023-0.03,0.035-0.085,0.035-0.167v-0.434
-					c0-0.156-0.08-0.211-0.241-0.164c-0.504,0.133-0.887,0.23-1.148,0.29c-0.262,0.061-0.578,0.091-0.949,0.091
-					c-0.582,0-1.023-0.108-1.324-0.323s-0.497-0.509-0.588-0.884c-0.092-0.375-0.138-0.859-0.138-1.453v-0.135
-					c0.707,0.16,1.311,0.241,1.811,0.241c0.555,0,1.052-0.078,1.491-0.234c0.439-0.156,0.791-0.42,1.055-0.791
-					c0.263-0.371,0.395-0.865,0.395-1.482v-0.07c0-0.641-0.109-1.188-0.325-1.641c-0.217-0.453-0.543-0.799-0.979-1.037
-					c-0.435-0.238-0.977-0.357-1.626-0.357c-0.453,0-0.859,0.069-1.216,0.208c-0.358,0.138-0.662,0.345-0.912,0.621
-					c-0.25,0.275-0.442,0.63-0.577,1.063c-0.135,0.434-0.202,0.938-0.202,1.512v2.104c0,0.848,0.117,1.533,0.352,2.056
-					s0.584,0.907,1.048,1.151C81.611,560.944,82.19,561.066,82.881,561.066L82.881,561.066z"/>
-				<path id="path5486" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M90.568,544.372
-					c6.632,4.219,8.589,13.016,4.371,19.647c-4.219,6.633-13.016,8.589-19.648,4.372c-6.634-4.219-8.589-13.016-4.37-19.649
-					C75.139,542.109,83.936,540.152,90.568,544.372z"/>
-				<path id="path5490" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M72.198,546.643l1.887,8.559"/>
-				<path id="path5494" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M72.198,546.643l-8.513,2.656"/>
-			</g>
-		</g>
-	</g>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:#231F20;">
+	<!ENTITY st3 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="hex6x-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="130.52px"
+	 height="126.07px" viewBox="0.37 0.38 130.52 126.07" xml:space="preserve">
+<g id="M6">
+	<path id="path4036" style="&st2;" d="M27.89,65.66v-0.09c0-0.51-0.11-0.92-0.32-1.23c-0.21-0.31-0.49-0.53-0.84-0.66
+		c-0.35-0.13-0.74-0.19-1.16-0.19c-0.34,0-0.73,0.03-1.17,0.08c-0.44,0.06-0.81,0.12-1.09,0.19v1.43c0,0.8,0.09,1.43,0.26,1.89
+		c0.17,0.46,0.43,0.78,0.76,0.97c0.33,0.19,0.75,0.29,1.26,0.29c0.36,0,0.68-0.05,0.96-0.15c0.29-0.1,0.53-0.25,0.72-0.45
+		s0.35-0.48,0.46-0.83C27.84,66.56,27.89,66.14,27.89,65.66z M25.87,58.1c0.92,0,1.82,0.18,2.7,0.56c0.09,0.03,0.15,0.07,0.18,0.11
+		c0.03,0.04,0.04,0.11,0.04,0.21v0.54c0,0.19-0.1,0.26-0.3,0.21c-0.63-0.17-1.11-0.29-1.43-0.36c-0.33-0.08-0.72-0.11-1.19-0.11
+		c-0.73,0-1.28,0.13-1.66,0.4c-0.38,0.27-0.62,0.64-0.73,1.11c-0.12,0.47-0.17,1.07-0.17,1.82v0.17c0.88-0.2,1.64-0.3,2.26-0.3
+		c0.69,0,1.32,0.1,1.86,0.29c0.55,0.2,0.99,0.53,1.32,0.99c0.33,0.46,0.49,1.08,0.49,1.85v0.09c0,0.8-0.14,1.48-0.41,2.05
+		c-0.27,0.57-0.68,1-1.22,1.3c-0.54,0.3-1.22,0.45-2.03,0.45c-0.57,0-1.07-0.09-1.52-0.26c-0.45-0.17-0.83-0.43-1.14-0.78
+		c-0.31-0.34-0.55-0.79-0.72-1.33c-0.17-0.54-0.25-1.17-0.25-1.89v-2.63c0-1.06,0.15-1.92,0.44-2.57c0.29-0.65,0.73-1.13,1.31-1.44
+		C24.28,58.25,25.01,58.1,25.87,58.1L25.87,58.1z"/>
+	<path id="path5486" style="&st0;" d="M35.48,78.97c8.29-5.27,10.74-16.27,5.46-24.56c-5.27-8.29-16.27-10.74-24.56-5.46
+		C8.09,54.22,5.65,65.21,10.92,73.5C16.19,81.79,27.19,84.24,35.48,78.97z"/>
+	<path id="path5490" style="&st4;" d="M12.52,76.13l2.36-10.7"/>
+	<path id="path5494" style="&st4;" d="M12.52,76.13L1.87,72.81"/>
+</g>
+<g id="M5">
+	<path id="path3915" style="&st2;" d="M110.72,68.98c-0.48,0-0.98-0.06-1.48-0.18c-0.5-0.12-0.92-0.25-1.26-0.39
+		c-0.09-0.05-0.15-0.09-0.18-0.13c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.21,0.1-0.28,0.3-0.21c1.04,0.31,1.92,0.47,2.63,0.47
+		c0.84,0,1.46-0.2,1.85-0.59c0.39-0.39,0.59-0.98,0.59-1.76v-0.23c0-0.74-0.24-1.26-0.72-1.56c-0.48-0.3-1.29-0.45-2.41-0.45h-1.8
+		c-0.07,0-0.13-0.03-0.17-0.08c-0.05-0.06-0.07-0.11-0.07-0.17v-0.01l0.42-5c0.01-0.08,0.04-0.14,0.1-0.19
+		c0.06-0.05,0.13-0.07,0.2-0.07h5.16c0.08,0,0.15,0.02,0.21,0.07c0.06,0.05,0.09,0.11,0.09,0.19v0.66c0,0.16-0.1,0.24-0.3,0.24
+		h-4.31l-0.24,3.24h0.7c0.98,0,1.8,0.1,2.46,0.29c0.66,0.2,1.17,0.53,1.53,0.99s0.53,1.08,0.53,1.85v0.23
+		c0,1.11-0.33,1.97-0.99,2.58C112.86,68.68,111.92,68.98,110.72,68.98L110.72,68.98z"/>
+	<path id="path5450" style="&st0;" d="M118.95,80.26c-8.95,4.06-19.49,0.1-23.55-8.85c-4.06-8.95-0.1-19.49,8.85-23.55
+		c8.95-4.06,19.49-0.1,23.55,8.85C131.86,65.66,127.9,76.21,118.95,80.26z"/>
+	<path id="path5454" style="&st4;" d="M124.56,51.18l-3.36-10.43"/>
+	<path id="path5458" style="&st4;" d="M124.56,51.18l-10.86,2.5"/>
+</g>
+<g id="M4">
+	<path id="path4034" style="&st2;" d="M49.71,29.15c0,0.08-0.03,0.15-0.08,0.19c-0.06,0.05-0.12,0.07-0.2,0.07h-1.3v2.67
+		c0,0.08-0.02,0.15-0.07,0.21c-0.05,0.06-0.11,0.09-0.19,0.09h-0.87c-0.17,0-0.26-0.1-0.26-0.3v-2.67H42.4
+		c-0.22,0-0.38-0.04-0.47-0.13s-0.14-0.24-0.14-0.45v-0.57c0-0.21,0.06-0.39,0.18-0.56l4.44-6.23c0.1-0.16,0.25-0.24,0.44-0.24h0.88
+		c0.26,0,0.39,0.11,0.39,0.33v6.71h1.3c0.08,0,0.15,0.02,0.21,0.07s0.08,0.11,0.08,0.2V29.15L49.71,29.15z M46.75,28.28v-5.13
+		c0-0.06-0.02-0.09-0.06-0.09h-0.01c-0.04,0-0.08,0.03-0.12,0.09l-3.46,4.92c-0.03,0.04-0.05,0.08-0.05,0.13
+		c0,0.06,0.04,0.09,0.12,0.09H46.75z"/>
+	<path id="path5426" style="&st0;" d="M64.19,27.42c0,9.82-7.96,17.79-17.79,17.79c-9.83,0-17.79-7.96-17.79-17.79
+		c0-9.83,7.96-17.79,17.79-17.79C56.23,9.63,64.19,17.59,64.19,27.42z"/>
+	<path id="path5430" style="&st4;" d="M40.02,10.29L29.13,9.04"/>
+	<path id="path5434" style="&st4;" d="M40.02,10.29l-2.21,10.93"/>
+</g>
+<g id="M3">
+	<path id="path4042" style="&st2;" d="M46.42,105.65c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.04-0.15-0.08-0.18-0.12c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		c0.36,0.08,0.76,0.12,1.18,0.12c0.81,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.86,0.52-1.58v-0.31c0-0.29-0.05-0.57-0.17-0.85
+		c-0.11-0.28-0.3-0.52-0.56-0.7c-0.27-0.19-0.61-0.28-1.03-0.28h-2.72c-0.19,0-0.29-0.09-0.29-0.27V99.5c0-0.08,0.03-0.15,0.08-0.21
+		s0.12-0.08,0.21-0.08h2.73c0.45,0,0.8-0.09,1.06-0.26c0.26-0.18,0.44-0.4,0.54-0.67c0.1-0.27,0.15-0.55,0.15-0.85v-0.21
+		c0-0.42-0.07-0.76-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.12-0.77-0.19-1.33-0.19c-0.42,0-0.82,0.04-1.19,0.12
+		c-0.38,0.08-0.85,0.19-1.41,0.34c-0.2,0.06-0.3-0.01-0.3-0.21v-0.51c0-0.09,0.02-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.17-0.11
+		c0.33-0.14,0.75-0.27,1.25-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67c0.61,0.44,0.91,1.2,0.91,2.26v0.21
+		c0,0.26-0.03,0.5-0.09,0.73c-0.06,0.23-0.15,0.44-0.27,0.64c-0.12,0.2-0.27,0.39-0.45,0.55s-0.38,0.31-0.61,0.42
+		c0.49,0.24,0.85,0.56,1.08,0.98c0.23,0.42,0.35,0.88,0.35,1.37v0.31c0,1.09-0.32,1.9-0.95,2.42
+		C48.44,105.38,47.56,105.65,46.42,105.65L46.42,105.65z"/>
+	<path id="path5474" style="&st0;" d="M44.24,82.05c9.72-1.44,18.77,5.27,20.21,14.99c1.44,9.72-5.27,18.77-14.99,20.21
+		c-9.72,1.44-18.76-5.27-20.21-14.99C27.81,92.54,34.52,83.5,44.24,82.05z"/>
+	<path id="path5478" style="&st4;" d="M29.94,104.53l-3.31,10.44"/>
+	<path id="path5482" style="&st4;" d="M29.94,104.53l10.3,4.26"/>
+</g>
+<g id="M2">
+	<path id="path4040" style="&st2;" d="M92.89,23.3c0,0.4-0.07,0.76-0.2,1.07c-0.13,0.31-0.34,0.62-0.62,0.9
+		c-0.28,0.29-0.66,0.59-1.14,0.92l-1.44,0.97c-0.54,0.37-0.97,0.71-1.28,1.03s-0.53,0.65-0.64,0.99c-0.12,0.34-0.18,0.73-0.18,1.17
+		v0.32h5.05c0.2,0,0.3,0.08,0.3,0.26v0.66c0,0.09-0.03,0.16-0.09,0.2s-0.13,0.07-0.21,0.07H86.5c-0.08,0-0.15-0.03-0.21-0.08
+		c-0.06-0.06-0.09-0.12-0.09-0.2v-1.22c0-0.52,0.08-1.02,0.24-1.48c0.16-0.47,0.41-0.9,0.75-1.31c0.34-0.41,0.78-0.79,1.31-1.15
+		l1.52-1.02c0.63-0.42,1.04-0.76,1.24-1.03c0.2-0.27,0.3-0.62,0.3-1.07c0-0.36-0.07-0.66-0.21-0.88c-0.14-0.23-0.35-0.39-0.63-0.5
+		c-0.28-0.11-0.63-0.16-1.05-0.16c-0.34,0-0.68,0.03-1.02,0.09c-0.34,0.06-0.68,0.14-1.03,0.24c-0.34,0.1-0.62,0.17-0.85,0.24
+		c-0.09,0.03-0.17,0.03-0.22-0.01s-0.08-0.1-0.08-0.19V21.6c0-0.09,0.02-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.18-0.11
+		c0.26-0.11,0.54-0.22,0.83-0.32c0.3-0.1,0.64-0.18,1.04-0.25c0.4-0.07,0.78-0.11,1.14-0.11c0.51,0,0.96,0.06,1.37,0.18
+		c0.41,0.12,0.74,0.28,1,0.5s0.46,0.49,0.6,0.83C92.82,22.46,92.89,22.85,92.89,23.3L92.89,23.3z"/>
+	<path id="path5438" style="&st0;" d="M71.45,26.92c0,9.82,7.96,17.79,17.79,17.79c9.83,0,17.79-7.97,17.79-17.79
+		c0-9.83-7.96-17.79-17.79-17.79C79.41,9.13,71.45,17.1,71.45,26.92L71.45,26.92z"/>
+	<path id="path5442" style="&st4;" d="M86.17,9.07l7.76,7.73"/>
+	<path id="path5446" style="&st4;" d="M86.17,9.07l8.51-7.2"/>
+</g>
+<g id="M1">
+	<path id="path4038" style="&st2;" d="M91.09,103.92c0,0.09-0.03,0.16-0.07,0.22c-0.05,0.06-0.12,0.08-0.2,0.08H90
+		c-0.08,0-0.15-0.03-0.2-0.09s-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04c-0.09,0-0.13-0.06-0.13-0.17
+		v-0.76c0-0.08,0.05-0.15,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.1,0.32-0.1h0.62c0.08,0,0.14,0.03,0.2,0.08
+		c0.06,0.05,0.08,0.12,0.08,0.21L91.09,103.92L91.09,103.92z"/>
+	<path id="path5462" style="&st0;" d="M98.13,84.01c-8.64-4.67-19.44-1.46-24.11,7.19c-4.67,8.64-1.46,19.44,7.19,24.11
+		c8.64,4.68,19.44,1.46,24.11-7.18C109.99,99.47,106.77,88.68,98.13,84.01z"/>
+	<path id="path5466" style="&st4;" d="M98.41,115.14l-10.05-4.37"/>
+	<path id="path5470" style="&st4;" d="M98.41,115.14l-5.3,9.81"/>
+</g>
+<g id="FrontArrow">
+	<path id="path5248" style="&st3;" d="M68.03,76.99V64.61"/>
+	<path id="path5252" style="&st1;" d="M77.33,67.34l-9.35-16.19l-9.35,16.19H77.33z"/>
 </g>
 </svg>
diff --git a/images/motor_order/octox.svg b/images/motor_order/octox.svg
index 1cf089400b..0e088c7c90 100644
--- a/images/motor_order/octox.svg
+++ b/images/motor_order/octox.svg
@@ -1,162 +1,129 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg4069" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:#231F20;">
+	<!ENTITY st3 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="octox-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
 	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="153.18px"
-	 height="156.838px" viewBox="0 0 153.18 156.838" xml:space="preserve">
-<g id="layer1" transform="translate(-298.41006,-439.84159)">
-	<g id="Octo-X" transform="matrix(1.25,0,0,-1.25,240.06039,1013.5961)">
-		<g id="MotorOrderGraphic">
-			<g id="FrontArrow">
-				<path id="path5690" fill="none" stroke="#ED1C24" stroke-width="5" stroke-miterlimit="10" d="M113.448,387.081v9.902"/>
-				<path id="path5694" fill="#ED1C24" d="M120.886,394.794l-7.478,12.953l-7.48-12.953H120.886z"/>
-			</g>
-			<g id="M5">
-				<path id="path4119" fill="#231F20" d="M92.657,433.011c-0.387,0-0.78,0.048-1.18,0.144c-0.4,0.095-0.736,0.198-1.005,0.307
-					c-0.074,0.039-0.123,0.073-0.146,0.103c-0.023,0.029-0.035,0.079-0.035,0.149v0.41c0,0.164,0.08,0.221,0.24,0.17
-					c0.832-0.25,1.533-0.375,2.104-0.375c0.672,0,1.165,0.158,1.48,0.475s0.471,0.787,0.471,1.412v0.182
-					c0,0.59-0.192,1.005-0.577,1.245c-0.385,0.24-1.029,0.36-1.931,0.36h-1.436c-0.055,0-0.1,0.023-0.137,0.067
-					c-0.037,0.045-0.056,0.091-0.056,0.138v0.012l0.334,3.996c0.007,0.063,0.035,0.112,0.082,0.15
-					c0.046,0.037,0.099,0.055,0.158,0.055h4.131c0.066,0,0.123-0.019,0.17-0.055c0.047-0.038,0.07-0.087,0.07-0.15v-0.527
-					c0-0.129-0.08-0.193-0.24-0.193h-3.445l-0.194-2.59h0.563c0.781,0,1.437-0.078,1.966-0.234s0.936-0.42,1.221-0.791
-					s0.428-0.865,0.428-1.482v-0.182c0-0.891-0.265-1.579-0.794-2.065C94.37,433.254,93.623,433.011,92.657,433.011z"/>
-				<path id="path5712" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M107.741,437.072
-					c0-7.86-6.372-14.232-14.232-14.232c-7.861,0-14.233,6.372-14.233,14.232c0,7.86,6.372,14.232,14.233,14.232
-					C101.368,451.304,107.741,444.932,107.741,437.072z"/>
-				<path id="path5716" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M88.402,450.773l-8.708,0.996"/>
-				<path id="path5720" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M88.402,450.773l-1.769-8.74"/>
-			</g>
-			<g id="M2">
-				<path id="path4135" fill="#231F20" d="M130.726,440.359c0-0.32-0.052-0.607-0.159-0.859c-0.105-0.252-0.27-0.492-0.495-0.721
-					c-0.224-0.229-0.529-0.474-0.912-0.736l-1.148-0.779c-0.433-0.293-0.773-0.569-1.022-0.827c-0.248-0.258-0.42-0.521-0.516-0.791
-					c-0.095-0.27-0.144-0.582-0.144-0.938v-0.252h4.043c0.16,0,0.24-0.068,0.24-0.205v-0.527c0-0.07-0.023-0.124-0.07-0.161
-					s-0.103-0.056-0.17-0.056h-4.763c-0.063,0-0.119,0.023-0.167,0.068c-0.048,0.045-0.073,0.098-0.073,0.161v0.973
-					c0,0.418,0.064,0.813,0.191,1.186c0.127,0.373,0.327,0.723,0.598,1.049c0.271,0.326,0.622,0.632,1.052,0.917l1.213,0.82
-					c0.5,0.336,0.83,0.61,0.99,0.823s0.24,0.497,0.24,0.853c0,0.289-0.055,0.524-0.166,0.706c-0.112,0.182-0.279,0.315-0.501,0.401
-					c-0.223,0.086-0.505,0.129-0.844,0.129c-0.27,0-0.542-0.024-0.817-0.073c-0.276-0.049-0.549-0.111-0.82-0.188
-					c-0.272-0.076-0.498-0.14-0.677-0.191c-0.074-0.023-0.133-0.02-0.176,0.012s-0.064,0.082-0.064,0.152v0.41
-					c0,0.074,0.012,0.128,0.038,0.161c0.026,0.033,0.073,0.063,0.144,0.091c0.207,0.09,0.43,0.174,0.668,0.252
-					s0.516,0.146,0.835,0.202c0.319,0.057,0.622,0.085,0.911,0.085c0.406,0,0.772-0.047,1.095-0.141
-					c0.325-0.094,0.591-0.227,0.797-0.398c0.208-0.172,0.367-0.393,0.481-0.662C130.669,441.038,130.726,440.722,130.726,440.359
-					L130.726,440.359z"/>
-				<path id="path5736" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M113.548,437.465
-					c0-7.86,6.372-14.232,14.231-14.232c7.861,0,14.234,6.372,14.234,14.232c0,7.86-6.373,14.232-14.234,14.232
-					C119.92,451.697,113.548,445.325,113.548,437.465L113.548,437.465z"/>
-				<path id="path5740" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M125.323,451.747l6.209-6.186"/>
-				<path id="path5744" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M125.323,451.747l6.812,5.757"/>
-			</g>
-			<g id="M6">
-				<path id="path4138" fill="#231F20" d="M154.948,410.975v0.07c0,0.406-0.085,0.733-0.255,0.981
-					c-0.17,0.248-0.393,0.423-0.67,0.525s-0.587,0.152-0.931,0.152c-0.27,0-0.583-0.023-0.938-0.068
-					c-0.356-0.045-0.647-0.095-0.873-0.149v-1.143c0-0.641,0.069-1.145,0.208-1.512s0.341-0.627,0.606-0.779
-					s0.602-0.229,1.008-0.229c0.285,0,0.542,0.039,0.77,0.117c0.229,0.078,0.422,0.198,0.58,0.36s0.28,0.385,0.366,0.668
-					S154.948,410.588,154.948,410.975L154.948,410.975z M153.331,417.022c0.738,0,1.459-0.148,2.162-0.445
-					c0.07-0.027,0.117-0.056,0.141-0.085s0.035-0.085,0.036-0.167v-0.434c0-0.156-0.08-0.211-0.241-0.164
-					c-0.504,0.133-0.887,0.229-1.148,0.29s-0.578,0.091-0.949,0.091c-0.582,0-1.023-0.108-1.324-0.323s-0.497-0.509-0.589-0.884
-					s-0.138-0.859-0.138-1.453v-0.135c0.707,0.16,1.311,0.241,1.811,0.241c0.555,0,1.052-0.078,1.491-0.234s0.791-0.42,1.055-0.791
-					s0.395-0.865,0.395-1.482v-0.07c0-0.641-0.108-1.188-0.325-1.641s-0.543-0.799-0.978-1.038
-					c-0.436-0.238-0.978-0.357-1.627-0.357c-0.453,0-0.858,0.069-1.216,0.208s-0.661,0.346-0.911,0.621s-0.442,0.63-0.577,1.063
-					s-0.202,0.938-0.202,1.512v2.104c0,0.848,0.117,1.533,0.352,2.056s0.584,0.907,1.049,1.152S152.639,417.022,153.331,417.022
-					L153.331,417.022z"/>
-				<path id="path5760" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M159.368,398.913
-					c-7.159-3.248-15.595-0.078-18.841,7.08c-3.248,7.158-0.077,15.595,7.081,18.841c7.157,3.248,15.593,0.077,18.841-7.08
-					C169.695,410.595,166.526,402.16,159.368,398.913z"/>
-				<path id="path5764" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M163.856,422.183l-2.691,8.342"/>
-				<path id="path5768" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M163.856,422.183l-8.69-2"/>
-			</g>
-			<g id="M4">
-				<path id="path4147" fill="#231F20" d="M97.058,354.203c0-0.066-0.022-0.118-0.067-0.155c-0.045-0.038-0.099-0.056-0.161-0.056
-					h-1.043v-2.138c0-0.066-0.018-0.123-0.055-0.17c-0.037-0.048-0.087-0.07-0.15-0.07h-0.697c-0.137,0-0.205,0.08-0.205,0.24v2.138
-					H91.21c-0.176,0-0.302,0.036-0.378,0.106s-0.114,0.189-0.114,0.357v0.457c0,0.168,0.049,0.316,0.146,0.445l3.551,4.98
-					c0.082,0.129,0.199,0.193,0.352,0.193h0.703c0.211,0,0.316-0.087,0.316-0.263v-5.367h1.043c0.066,0,0.121-0.02,0.164-0.059
-					s0.064-0.092,0.064-0.158V354.203z M94.691,354.901v4.107c0,0.047-0.016,0.07-0.047,0.07h-0.012
-					c-0.031,0-0.063-0.023-0.094-0.07l-2.771-3.938c-0.027-0.031-0.041-0.064-0.041-0.099c0-0.047,0.033-0.07,0.1-0.07H94.691z"/>
-				<path id="path5784" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M100.279,367.786
-					c-6.913,3.739-15.55,1.166-19.29-5.748c-3.739-6.913-1.165-15.55,5.748-19.289c6.915-3.739,15.55-1.166,19.29,5.748
-					C109.766,355.411,107.194,364.047,100.279,367.786z"/>
-				<path id="path5788" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M100.51,342.878l-8.04,3.494"/>
-				<path id="path5792" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M100.51,342.878l-4.243-7.845"/>
-			</g>
-			<g id="M7">
-				<path id="path4144" fill="#231F20" d="M130.991,358.12c0-0.198-0.053-0.408-0.158-0.627l-3.452-7.353
-					c-0.063-0.122-0.15-0.182-0.264-0.182h-0.72c-0.121,0-0.181,0.06-0.181,0.182c0,0.039,0.011,0.081,0.034,0.128l3.627,7.536
-					c0.008,0.008,0.012,0.025,0.012,0.052c0,0.055-0.03,0.082-0.087,0.082h-4.091c-0.159,0-0.24,0.069-0.24,0.205v0.505
-					c0,0.058,0.023,0.111,0.07,0.158s0.104,0.07,0.17,0.07h4.377c0.316,0,0.546-0.07,0.688-0.211S130.991,358.343,130.991,358.12
-					L130.991,358.12z"/>
-				<path id="path5808" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M126.214,368.75
-					c7.775,1.152,15.014-4.216,16.166-11.991c1.152-7.776-4.216-15.014-11.991-16.166c-7.777-1.154-15.012,4.216-16.166,11.991
-					C113.07,360.358,118.439,367.597,126.214,368.75z"/>
-				<path id="path5812" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M114.773,350.773l-2.649-8.355"/>
-				<path id="path5816" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M114.773,350.773l8.238-3.413"/>
-			</g>
-			<g id="M1">
-				<path id="path4132" fill="#231F20" d="M67.952,408.794c0-0.07-0.02-0.128-0.059-0.173s-0.092-0.068-0.158-0.068h-0.656
-					c-0.066,0-0.119,0.023-0.158,0.07s-0.059,0.104-0.059,0.17v7.547l-1.547-0.674c-0.063-0.023-0.115-0.035-0.158-0.035
-					c-0.07,0-0.105,0.045-0.105,0.135v0.609c0,0.063,0.039,0.115,0.117,0.158l1.811,0.861c0.098,0.051,0.182,0.076,0.252,0.076
-					h0.492c0.063,0,0.116-0.02,0.161-0.061s0.067-0.097,0.067-0.167V408.794z"/>
-				<path id="path5832" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M75.062,400.864
-					c6.632,4.219,8.589,13.016,4.371,19.647c-4.219,6.633-13.016,8.589-19.648,4.372c-6.633-4.219-8.589-13.016-4.37-19.649
-					C59.633,398.602,68.431,396.645,75.062,400.864z"/>
-				<path id="path5836" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M56.693,403.135l1.887,8.559"/>
-				<path id="path5840" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M56.693,403.135l-8.513,2.656"/>
-			</g>
-			<g id="M3">
-				<path id="path4141" fill="#231F20" d="M152.614,374.592c-0.383,0-0.775,0.048-1.177,0.144c-0.402,0.095-0.738,0.198-1.008,0.307
-					c-0.07,0.035-0.117,0.069-0.141,0.1c-0.023,0.03-0.035,0.082-0.035,0.152v0.41c0,0.16,0.08,0.216,0.241,0.17
-					c0.472-0.125,0.855-0.219,1.145-0.281c0.291-0.063,0.605-0.094,0.941-0.094c0.644,0,1.105,0.131,1.383,0.393
-					c0.277,0.262,0.416,0.684,0.416,1.266v0.252c0,0.23-0.044,0.458-0.131,0.682c-0.088,0.224-0.239,0.412-0.452,0.56
-					c-0.212,0.148-0.487,0.222-0.823,0.222h-2.18c-0.152,0-0.228,0.073-0.228,0.217v0.416c0,0.067,0.021,0.122,0.064,0.164
-					c0.043,0.044,0.098,0.065,0.164,0.065h2.18c0.359,0,0.644,0.07,0.853,0.211c0.209,0.141,0.353,0.32,0.433,0.536
-					c0.08,0.216,0.12,0.445,0.12,0.683v0.17c0,0.341-0.056,0.613-0.17,0.817c-0.112,0.205-0.302,0.358-0.565,0.458
-					c-0.263,0.099-0.618,0.149-1.063,0.149c-0.336,0-0.655-0.031-0.955-0.094s-0.677-0.154-1.13-0.276
-					c-0.161-0.047-0.241,0.011-0.241,0.17v0.405c0,0.073,0.013,0.127,0.038,0.161c0.026,0.033,0.071,0.063,0.138,0.091
-					c0.266,0.113,0.598,0.218,0.996,0.313c0.398,0.096,0.795,0.144,1.189,0.144c0.95,0,1.667-0.177,2.154-0.534
-					c0.487-0.355,0.729-0.956,0.729-1.805v-0.17c0-0.207-0.023-0.402-0.073-0.583c-0.049-0.182-0.123-0.354-0.22-0.516
-					c-0.098-0.163-0.219-0.31-0.364-0.443c-0.144-0.133-0.306-0.244-0.486-0.334c0.391-0.188,0.679-0.45,0.864-0.788
-					c0.186-0.337,0.278-0.702,0.278-1.092v-0.252c0-0.871-0.252-1.516-0.758-1.937C154.233,374.802,153.525,374.592,152.614,374.592
-					L152.614,374.592z"/>
-				<path id="path5856" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M159.259,390.847
-					c-6.913,3.739-15.55,1.166-19.29-5.748c-3.739-6.913-1.166-15.55,5.748-19.289c6.915-3.74,15.55-1.166,19.29,5.748
-					C168.745,378.472,166.173,387.108,159.259,390.847L159.259,390.847z"/>
-				<path id="path5860" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M159.489,365.939l-8.039,3.493"/>
-				<path id="path5864" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M159.489,365.939l-4.242-7.845"/>
-			</g>
-			<g id="M8">
-				<path id="path4129" fill="#231F20" d="M71.301,377.1c0-0.839-0.275-1.477-0.823-1.913c-0.549-0.436-1.247-0.653-2.095-0.653
-					h-0.117c-0.848,0-1.546,0.217-2.095,0.653c-0.549,0.435-0.823,1.073-0.823,1.913v0.229c0,0.375,0.104,0.742,0.311,1.102
-					s0.492,0.641,0.855,0.844c-0.367,0.191-0.65,0.451-0.847,0.779s-0.296,0.692-0.296,1.091v0.111c0,0.539,0.124,0.983,0.372,1.333
-					c0.248,0.35,0.589,0.609,1.023,0.777s0.934,0.252,1.5,0.252h0.117c0.566,0,1.066-0.084,1.5-0.252s0.774-0.427,1.022-0.777
-					c0.248-0.35,0.372-0.794,0.372-1.333v-0.111c0-0.27-0.044-0.523-0.132-0.763c-0.088-0.237-0.215-0.45-0.381-0.636
-					c-0.166-0.185-0.376-0.342-0.63-0.471c0.359-0.199,0.643-0.477,0.852-0.832s0.314-0.727,0.314-1.113V377.1z M70.223,381.143
-					v0.111c0,0.473-0.158,0.836-0.475,1.09s-0.771,0.38-1.365,0.38h-0.117c-0.594,0-1.049-0.127-1.365-0.38s-0.475-0.617-0.475-1.09
-					v-0.111c0-0.411,0.125-0.753,0.375-1.029c0.25-0.276,0.635-0.413,1.154-0.413H68.7c0.512,0,0.893,0.138,1.145,0.413
-					C70.097,380.39,70.223,380.733,70.223,381.143z M70.211,377.1v0.229c0,0.242-0.052,0.479-0.155,0.712
-					c-0.104,0.233-0.27,0.423-0.498,0.574c-0.229,0.151-0.514,0.226-0.858,0.226h-0.744c-0.34,0-0.625-0.074-0.855-0.223
-					s-0.398-0.34-0.504-0.574s-0.158-0.473-0.158-0.715V377.1c0-0.523,0.159-0.93,0.477-1.222c0.318-0.291,0.769-0.436,1.351-0.436
-					h0.117c0.59,0,1.042,0.145,1.356,0.436C70.054,376.169,70.211,376.576,70.211,377.1z"/>
-				<path id="path5880" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M66.308,393.407
-					c7.774,1.152,15.013-4.216,16.166-11.991c1.152-7.776-4.217-15.014-11.992-16.166c-7.776-1.154-15.012,4.216-16.165,11.991
-					C53.165,385.015,58.532,392.254,66.308,393.407z"/>
-				<path id="path5884" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M54.867,375.43l-2.649-8.354"/>
-				<path id="path5888" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M54.867,375.43l8.238-3.413"/>
-			</g>
-		</g>
-	</g>
+	 height="156.84px" viewBox="0 0 153.18 156.84" xml:space="preserve">
+<g id="M8">
+	<path id="path4129" style="&st2;" d="M30.78,102.38c0,1.05-0.34,1.85-1.03,2.39c-0.69,0.54-1.56,0.82-2.62,0.82h-0.15
+		c-1.06,0-1.93-0.27-2.62-0.82c-0.69-0.54-1.03-1.34-1.03-2.39v-0.29c0-0.47,0.13-0.93,0.39-1.38s0.62-0.8,1.07-1.05
+		c-0.46-0.24-0.81-0.56-1.06-0.97c-0.25-0.41-0.37-0.86-0.37-1.36v-0.14c0-0.67,0.15-1.23,0.46-1.67c0.31-0.44,0.74-0.76,1.28-0.97
+		c0.54-0.21,1.17-0.32,1.88-0.32h0.15c0.71,0,1.33,0.11,1.88,0.32c0.54,0.21,0.97,0.53,1.28,0.97c0.31,0.44,0.46,0.99,0.46,1.67
+		v0.14c0,0.34-0.05,0.65-0.17,0.95c-0.11,0.3-0.27,0.56-0.48,0.79c-0.21,0.23-0.47,0.43-0.79,0.59c0.45,0.25,0.8,0.6,1.07,1.04
+		c0.26,0.44,0.39,0.91,0.39,1.39L30.78,102.38L30.78,102.38z M29.43,97.33v-0.14c0-0.59-0.2-1.04-0.59-1.36
+		c-0.4-0.32-0.96-0.48-1.71-0.48h-0.15c-0.74,0-1.31,0.16-1.71,0.48c-0.39,0.32-0.59,0.77-0.59,1.36v0.14
+		c0,0.51,0.16,0.94,0.47,1.29c0.31,0.34,0.79,0.52,1.44,0.52h0.93c0.64,0,1.12-0.17,1.43-0.52C29.27,98.27,29.43,97.84,29.43,97.33z
+		 M29.41,102.38v-0.29c0-0.3-0.07-0.6-0.19-0.89c-0.13-0.29-0.34-0.53-0.62-0.72c-0.29-0.19-0.64-0.28-1.07-0.28h-0.93
+		c-0.42,0-0.78,0.09-1.07,0.28c-0.29,0.19-0.5,0.43-0.63,0.72c-0.13,0.29-0.2,0.59-0.2,0.89v0.29c0,0.65,0.2,1.16,0.6,1.53
+		c0.4,0.36,0.96,0.54,1.69,0.54h0.15c0.74,0,1.3-0.18,1.7-0.54S29.41,103.03,29.41,102.38z"/>
+	<path id="path5880" style="&st0;" d="M24.54,82c9.72-1.44,18.77,5.27,20.21,14.99c1.44,9.72-5.27,18.77-14.99,20.21
+		c-9.72,1.44-18.77-5.27-20.21-14.99C8.11,92.49,14.82,83.44,24.54,82z"/>
+	<path id="path5884" style="&st4;" d="M10.23,104.47l-3.31,10.44"/>
+	<path id="path5888" style="&st4;" d="M10.23,104.47l10.3,4.27"/>
+</g>
+<g id="M7">
+	<path id="path4144" style="&st2;" d="M105.39,126.1c0,0.25-0.07,0.51-0.2,0.78l-4.32,9.19c-0.08,0.15-0.19,0.23-0.33,0.23h-0.9
+		c-0.15,0-0.23-0.08-0.23-0.23c0-0.05,0.01-0.1,0.04-0.16l4.53-9.42c0.01-0.01,0.02-0.03,0.02-0.06c0-0.07-0.04-0.1-0.11-0.1h-5.11
+		c-0.2,0-0.3-0.09-0.3-0.26v-0.63c0-0.07,0.03-0.14,0.09-0.2s0.13-0.09,0.21-0.09h5.47c0.4,0,0.68,0.09,0.86,0.26
+		C105.3,125.6,105.39,125.83,105.39,126.1L105.39,126.1z"/>
+	<path id="path5808" style="&st0;" d="M99.42,112.82c9.72-1.44,18.77,5.27,20.21,14.99c1.44,9.72-5.27,18.77-14.99,20.21
+		c-9.72,1.44-18.77-5.27-20.21-14.99C82.99,123.31,89.7,114.26,99.42,112.82z"/>
+	<path id="path5812" style="&st4;" d="M85.12,135.29l-3.31,10.44"/>
+	<path id="path5816" style="&st4;" d="M85.12,135.29l10.3,4.27"/>
+</g>
+<g id="M6">
+	<path id="path4138" style="&st2;" d="M135.34,60.04v-0.09c0-0.51-0.11-0.92-0.32-1.23c-0.21-0.31-0.49-0.53-0.84-0.66
+		c-0.35-0.13-0.73-0.19-1.16-0.19c-0.34,0-0.73,0.03-1.17,0.08c-0.45,0.06-0.81,0.12-1.09,0.19v1.43c0,0.8,0.09,1.43,0.26,1.89
+		s0.43,0.78,0.76,0.97s0.75,0.29,1.26,0.29c0.36,0,0.68-0.05,0.96-0.15c0.29-0.1,0.53-0.25,0.73-0.45c0.2-0.2,0.35-0.48,0.46-0.83
+		C135.28,60.94,135.34,60.52,135.34,60.04L135.34,60.04z M133.31,52.48c0.92,0,1.82,0.19,2.7,0.56c0.09,0.03,0.15,0.07,0.18,0.11
+		s0.04,0.11,0.04,0.21v0.54c0,0.2-0.1,0.26-0.3,0.21c-0.63-0.17-1.11-0.29-1.44-0.36s-0.72-0.11-1.19-0.11
+		c-0.73,0-1.28,0.13-1.66,0.4c-0.38,0.27-0.62,0.64-0.74,1.1s-0.17,1.07-0.17,1.82v0.17c0.88-0.2,1.64-0.3,2.26-0.3
+		c0.69,0,1.32,0.1,1.86,0.29c0.55,0.2,0.99,0.52,1.32,0.99s0.49,1.08,0.49,1.85v0.09c0,0.8-0.13,1.49-0.41,2.05
+		c-0.27,0.57-0.68,1-1.22,1.3c-0.54,0.3-1.22,0.45-2.03,0.45c-0.57,0-1.07-0.09-1.52-0.26s-0.83-0.43-1.14-0.78
+		s-0.55-0.79-0.72-1.33c-0.17-0.54-0.25-1.17-0.25-1.89v-2.63c0-1.06,0.15-1.92,0.44-2.57c0.29-0.65,0.73-1.13,1.31-1.44
+		S132.45,52.48,133.31,52.48L133.31,52.48z"/>
+	<path id="path5760" style="&st0;" d="M140.86,75.11c-8.95,4.06-19.49,0.1-23.55-8.85c-4.06-8.95-0.1-19.49,8.85-23.55
+		c8.95-4.06,19.49-0.1,23.55,8.85C153.77,60.51,149.81,71.05,140.86,75.11z"/>
+	<path id="path5764" style="&st4;" d="M146.47,46.03l-3.36-10.43"/>
+	<path id="path5768" style="&st4;" d="M146.47,46.03l-10.86,2.5"/>
+</g>
+<g id="M5">
+	<path id="path4119" style="&st2;" d="M57.47,32.49c-0.48,0-0.98-0.06-1.48-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.05-0.15-0.09-0.18-0.13c-0.03-0.04-0.04-0.1-0.04-0.19V31.1c0-0.21,0.1-0.28,0.3-0.21c1.04,0.31,1.92,0.47,2.63,0.47
+		c0.84,0,1.46-0.2,1.85-0.59c0.39-0.4,0.59-0.98,0.59-1.77v-0.23c0-0.74-0.24-1.26-0.72-1.56c-0.48-0.3-1.29-0.45-2.41-0.45h-1.8
+		c-0.07,0-0.13-0.03-0.17-0.08c-0.05-0.06-0.07-0.11-0.07-0.17v-0.02l0.42-5c0.01-0.08,0.04-0.14,0.1-0.19
+		c0.06-0.05,0.12-0.07,0.2-0.07h5.16c0.08,0,0.15,0.02,0.21,0.07c0.06,0.05,0.09,0.11,0.09,0.19v0.66c0,0.16-0.1,0.24-0.3,0.24
+		h-4.31l-0.24,3.24h0.7c0.98,0,1.8,0.1,2.46,0.29c0.66,0.19,1.17,0.52,1.53,0.99c0.36,0.46,0.54,1.08,0.54,1.85V29
+		c0,1.11-0.33,1.97-0.99,2.58C59.61,32.19,58.68,32.49,57.47,32.49z"/>
+	<path id="path5712" style="&st0;" d="M76.33,27.41c0,9.83-7.96,17.79-17.79,17.79c-9.83,0-17.79-7.96-17.79-17.79
+		c0-9.82,7.96-17.79,17.79-17.79C68.36,9.62,76.33,17.59,76.33,27.41z"/>
+	<path id="path5716" style="&st4;" d="M52.15,10.29L41.27,9.04"/>
+	<path id="path5720" style="&st4;" d="M52.15,10.29l-2.21,10.93"/>
+</g>
+<g id="M4">
+	<path id="path4147" style="&st2;" d="M62.97,131c0,0.08-0.03,0.15-0.08,0.19c-0.06,0.05-0.12,0.07-0.2,0.07h-1.3v2.67
+		c0,0.08-0.02,0.15-0.07,0.21c-0.05,0.06-0.11,0.09-0.19,0.09h-0.87c-0.17,0-0.26-0.1-0.26-0.3v-2.67h-4.34
+		c-0.22,0-0.38-0.04-0.47-0.13c-0.1-0.09-0.14-0.24-0.14-0.45v-0.57c0-0.21,0.06-0.39,0.18-0.56l4.44-6.23
+		c0.1-0.16,0.25-0.24,0.44-0.24h0.88c0.26,0,0.4,0.11,0.4,0.33v6.71h1.3c0.08,0,0.15,0.03,0.21,0.07c0.05,0.05,0.08,0.12,0.08,0.2
+		L62.97,131L62.97,131z M60.01,130.13V125c0-0.06-0.02-0.09-0.06-0.09h-0.01c-0.04,0-0.08,0.03-0.12,0.09l-3.46,4.92
+		c-0.03,0.04-0.05,0.08-0.05,0.12c0,0.06,0.04,0.09,0.13,0.09H60.01z"/>
+	<path id="path5784" style="&st0;" d="M67,114.02c-8.64-4.67-19.44-1.46-24.11,7.18c-4.67,8.64-1.46,19.44,7.18,24.11
+		c8.64,4.67,19.44,1.46,24.11-7.18C78.86,129.49,75.64,118.7,67,114.02z"/>
+	<path id="path5788" style="&st4;" d="M67.29,145.16l-10.05-4.37"/>
+	<path id="path5792" style="&st4;" d="M67.29,145.16l-5.3,9.81"/>
+</g>
+<g id="M3">
+	<path id="path4141" style="&st2;" d="M132.42,105.51c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.04-0.15-0.09-0.18-0.13c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		s0.76,0.12,1.18,0.12c0.8,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.85,0.52-1.58v-0.31c0-0.29-0.06-0.57-0.16-0.85
+		c-0.11-0.28-0.3-0.51-0.56-0.7c-0.27-0.19-0.61-0.28-1.03-0.28h-2.72c-0.19,0-0.29-0.09-0.29-0.27v-0.52
+		c0-0.08,0.03-0.15,0.08-0.21c0.05-0.06,0.12-0.08,0.21-0.08h2.72c0.45,0,0.8-0.09,1.07-0.26c0.26-0.18,0.44-0.4,0.54-0.67
+		c0.1-0.27,0.15-0.56,0.15-0.85v-0.21c0-0.43-0.07-0.77-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.12-0.77-0.19-1.33-0.19
+		c-0.42,0-0.82,0.04-1.19,0.12c-0.38,0.08-0.85,0.19-1.41,0.34c-0.2,0.06-0.3-0.01-0.3-0.21v-0.51c0-0.09,0.02-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.17-0.11c0.33-0.14,0.75-0.27,1.25-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67
+		c0.61,0.44,0.91,1.2,0.91,2.26v0.21c0,0.26-0.03,0.5-0.09,0.73c-0.06,0.23-0.15,0.44-0.28,0.64s-0.27,0.39-0.46,0.55
+		c-0.18,0.17-0.38,0.3-0.61,0.42c0.49,0.24,0.85,0.56,1.08,0.99c0.23,0.42,0.35,0.88,0.35,1.37v0.32c0,1.09-0.31,1.89-0.95,2.42
+		C134.44,105.25,133.56,105.51,132.42,105.51L132.42,105.51z"/>
+	<path id="path5856" style="&st0;" d="M140.72,85.2c-8.64-4.67-19.44-1.46-24.11,7.18c-4.67,8.64-1.46,19.44,7.18,24.11
+		c8.64,4.67,19.44,1.46,24.11-7.18C152.58,100.67,149.37,89.87,140.72,85.2L140.72,85.2z"/>
+	<path id="path5860" style="&st4;" d="M141.01,116.33l-10.05-4.37"/>
+	<path id="path5864" style="&st4;" d="M141.01,116.33l-5.3,9.81"/>
+</g>
+<g id="M2">
+	<path id="path4135" style="&st2;" d="M105.06,23.31c0,0.4-0.07,0.76-0.2,1.07c-0.13,0.31-0.34,0.62-0.62,0.9
+		c-0.28,0.29-0.66,0.59-1.14,0.92l-1.44,0.97c-0.54,0.37-0.97,0.71-1.28,1.03c-0.31,0.32-0.53,0.65-0.65,0.99
+		c-0.12,0.34-0.18,0.73-0.18,1.17v0.31h5.05c0.2,0,0.3,0.08,0.3,0.26v0.66c0,0.09-0.03,0.15-0.09,0.2s-0.13,0.07-0.21,0.07h-5.95
+		c-0.08,0-0.15-0.03-0.21-0.08c-0.06-0.06-0.09-0.12-0.09-0.2v-1.22c0-0.52,0.08-1.02,0.24-1.48c0.16-0.47,0.41-0.9,0.75-1.31
+		c0.34-0.41,0.78-0.79,1.32-1.15l1.52-1.02c0.63-0.42,1.04-0.76,1.24-1.03c0.2-0.27,0.3-0.62,0.3-1.07c0-0.36-0.07-0.65-0.21-0.88
+		c-0.14-0.23-0.35-0.39-0.63-0.5c-0.28-0.11-0.63-0.16-1.05-0.16c-0.34,0-0.68,0.03-1.02,0.09c-0.34,0.06-0.69,0.14-1.03,0.23
+		c-0.34,0.1-0.62,0.18-0.85,0.24c-0.09,0.03-0.17,0.03-0.22-0.01s-0.08-0.1-0.08-0.19v-0.51c0-0.09,0.01-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.18-0.11c0.26-0.11,0.54-0.22,0.83-0.31c0.3-0.1,0.64-0.18,1.04-0.25c0.4-0.07,0.78-0.11,1.14-0.11
+		c0.51,0,0.96,0.06,1.37,0.18c0.41,0.12,0.74,0.28,1,0.5c0.26,0.21,0.46,0.49,0.6,0.83C104.99,22.46,105.06,22.85,105.06,23.31
+		L105.06,23.31z"/>
+	<path id="path5736" style="&st0;" d="M83.59,26.92c0,9.82,7.96,17.79,17.79,17.79c9.83,0,17.79-7.97,17.79-17.79
+		c0-9.83-7.97-17.79-17.79-17.79C91.55,9.13,83.59,17.1,83.59,26.92L83.59,26.92z"/>
+	<path id="path5740" style="&st4;" d="M98.3,9.07l7.76,7.73"/>
+	<path id="path5744" style="&st4;" d="M98.3,9.07l8.51-7.2"/>
+</g>
+<g id="M1">
+	<path id="path4132" style="&st2;" d="M26.59,62.76c0,0.09-0.02,0.16-0.07,0.22c-0.05,0.06-0.12,0.08-0.2,0.08H25.5
+		c-0.08,0-0.15-0.03-0.2-0.09c-0.05-0.06-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04
+		c-0.09,0-0.13-0.06-0.13-0.17v-0.76c0-0.08,0.05-0.14,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.1,0.32-0.1h0.61
+		c0.08,0,0.15,0.02,0.2,0.08c0.06,0.05,0.08,0.12,0.08,0.21V62.76L26.59,62.76z"/>
+	<path id="path5832" style="&st0;" d="M35.48,72.67c8.29-5.27,10.74-16.27,5.46-24.56c-5.27-8.29-16.27-10.74-24.56-5.46
+		c-8.29,5.27-10.74,16.27-5.46,24.56C16.19,75.5,27.19,77.95,35.48,72.67z"/>
+	<path id="path5836" style="&st4;" d="M12.52,69.84l2.36-10.7"/>
+	<path id="path5840" style="&st4;" d="M12.52,69.84L1.88,66.52"/>
+</g>
+<g id="FrontArrow">
+	<path id="path5690" style="&st3;" d="M80.46,89.9V77.53"/>
+	<path id="path5694" style="&st1;" d="M89.76,80.26l-9.35-16.19l-9.35,16.19H89.76z"/>
 </g>
 </svg>
diff --git a/images/motor_order/quadp.svg b/images/motor_order/quadp.svg
index aad058d38a..8d19de64fb 100644
--- a/images/motor_order/quadp.svg
+++ b/images/motor_order/quadp.svg
@@ -1,89 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg3581" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="123.684px"
-	 height="130.941px" viewBox="0 0 123.684 130.941" xml:space="preserve">
-<g id="layer1" transform="translate(-313.15844,-448.10506)">
-	<g id="QuadCopter-Plus" transform="matrix(1.25,0,0,-1.25,104.48314,1403.5657)">
-		<g id="MotorOrderGraphic">
-			<g id="FrontArrow">
-				<path id="path5112" fill="none" stroke="#ED1C24" stroke-width="5" stroke-miterlimit="10" d="M216.456,705.083v9.901"/>
-				<path id="path5116" fill="#ED1C24" d="M223.893,712.797l-7.478,12.953l-7.48-12.953H223.893z"/>
-			</g>
-			<g id="M4">
-				<path id="path3908" fill="#231F20" d="M217.965,747.336c0-0.066-0.023-0.118-0.067-0.155c-0.045-0.037-0.098-0.056-0.161-0.056
-					h-1.043v-2.139c0-0.066-0.019-0.123-0.056-0.17c-0.037-0.047-0.087-0.07-0.149-0.07h-0.697c-0.137,0-0.205,0.08-0.205,0.24
-					v2.139h-3.469c-0.176,0-0.302,0.036-0.378,0.105c-0.076,0.07-0.114,0.189-0.114,0.357v0.457c0,0.168,0.049,0.316,0.147,0.445
-					l3.551,4.98c0.082,0.129,0.199,0.193,0.352,0.193h0.703c0.211,0,0.316-0.088,0.316-0.264v-5.367h1.043
-					c0.066,0,0.121-0.02,0.164-0.059s0.064-0.092,0.064-0.158V747.336z M215.598,748.032v4.108c0,0.047-0.016,0.07-0.047,0.07
-					h-0.012c-0.031,0-0.063-0.024-0.094-0.07l-2.771-3.938c-0.027-0.032-0.041-0.065-0.041-0.1c0-0.047,0.034-0.07,0.1-0.07H215.598
-					z"/>
-				<path id="path5342" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M229.939,748.172
-					c0-7.86-6.372-14.232-14.232-14.232c-7.861,0-14.233,6.372-14.233,14.232c0,7.86,6.372,14.232,14.233,14.232
-					C223.567,762.403,229.939,756.031,229.939,748.172z"/>
-				<path id="path5346" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M210.601,761.872l-8.708,0.996"/>
-				<path id="path5350" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M210.601,761.872l-1.769-8.74"/>
-			</g>
-			<g id="M3">
-				<path id="path3906" fill="#231F20" d="M184.987,707.979c-0.383,0-0.775,0.048-1.177,0.144c-0.402,0.095-0.738,0.198-1.008,0.308
-					c-0.07,0.034-0.117,0.068-0.141,0.099s-0.035,0.082-0.035,0.152v0.41c0,0.16,0.08,0.216,0.24,0.17
-					c0.473-0.125,0.855-0.219,1.146-0.281c0.291-0.063,0.604-0.093,0.94-0.093c0.645,0,1.105,0.13,1.383,0.392
-					s0.416,0.684,0.416,1.266v0.252c0,0.23-0.044,0.458-0.132,0.683c-0.087,0.224-0.238,0.411-0.451,0.559
-					c-0.213,0.148-0.488,0.223-0.823,0.223h-2.18c-0.152,0-0.229,0.072-0.229,0.216v0.416c0,0.066,0.022,0.121,0.065,0.164
-					s0.098,0.064,0.164,0.064h2.18c0.359,0,0.644,0.07,0.852,0.211c0.209,0.141,0.354,0.319,0.434,0.536
-					c0.08,0.217,0.12,0.444,0.12,0.683v0.17c0,0.34-0.057,0.612-0.17,0.817s-0.302,0.357-0.565,0.457
-					c-0.264,0.1-0.619,0.15-1.064,0.15c-0.336,0-0.654-0.032-0.955-0.094c-0.301-0.063-0.678-0.154-1.131-0.275
-					c-0.16-0.047-0.24,0.01-0.24,0.17v0.404c0,0.074,0.012,0.128,0.038,0.161c0.025,0.033,0.071,0.064,0.137,0.091
-					c0.266,0.113,0.598,0.218,0.996,0.313s0.795,0.144,1.189,0.144c0.949,0,1.667-0.178,2.154-0.533
-					c0.486-0.355,0.729-0.957,0.729-1.805v-0.17c0-0.207-0.024-0.401-0.073-0.583c-0.049-0.182-0.123-0.354-0.22-0.516
-					s-0.219-0.309-0.363-0.442s-0.306-0.244-0.486-0.334c0.391-0.188,0.679-0.45,0.864-0.788c0.186-0.338,0.278-0.702,0.278-1.093
-					v-0.252c0-0.872-0.252-1.517-0.759-1.938C186.606,708.19,185.897,707.979,184.987,707.979L184.987,707.979z"/>
-				<path id="path5354" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M199.157,712.376
-					c0,7.859-6.372,14.232-14.232,14.232c-7.861,0-14.233-6.373-14.233-14.232c0-7.861,6.372-14.232,14.233-14.232
-					C192.785,698.144,199.157,704.515,199.157,712.376z"/>
-				<path id="path5358" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M177.358,700.324l-0.751,8.733"/>
-				<path id="path5362" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M177.358,700.324h-8.918"/>
-			</g>
-			<g id="M1">
-				<path id="path3902" fill="#231F20" d="M216.991,674.942c0-0.07-0.02-0.128-0.059-0.173c-0.039-0.045-0.092-0.067-0.159-0.067
-					h-0.656c-0.066,0-0.119,0.023-0.158,0.07s-0.059,0.104-0.059,0.17v7.547l-1.547-0.673c-0.063-0.023-0.116-0.036-0.159-0.036
-					c-0.07,0-0.105,0.045-0.105,0.135v0.609c0,0.063,0.039,0.115,0.117,0.159l1.811,0.861c0.098,0.051,0.181,0.077,0.252,0.077
-					h0.492c0.063,0,0.116-0.021,0.161-0.063c0.045-0.041,0.068-0.096,0.068-0.166V674.942z"/>
-				<path id="path5366" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M201.474,678.915
-					c0,7.859,6.372,14.232,14.232,14.232c7.861,0,14.233-6.373,14.233-14.232c0-7.861-6.372-14.231-14.233-14.231
-					C207.846,664.684,201.474,671.054,201.474,678.915z"/>
-				<path id="path5370" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M217.578,664.961l7.876-3.845"/>
-				<path id="path5374" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M217.578,664.961l4.584,7.65"/>
-			</g>
-			<g id="M2">
-				<path id="path3904" fill="#231F20" d="M253.005,714.659c0-0.32-0.052-0.606-0.158-0.858s-0.271-0.492-0.495-0.721
-					c-0.225-0.229-0.528-0.474-0.911-0.736l-1.148-0.779c-0.434-0.293-0.775-0.569-1.023-0.827c-0.248-0.258-0.42-0.521-0.516-0.791
-					c-0.096-0.27-0.144-0.582-0.144-0.938v-0.252h4.043c0.16,0,0.241-0.069,0.241-0.205v-0.527c0-0.07-0.023-0.123-0.07-0.161
-					c-0.047-0.038-0.104-0.056-0.17-0.056h-4.763c-0.063,0-0.119,0.023-0.167,0.068c-0.049,0.044-0.073,0.098-0.073,0.161v0.973
-					c0,0.418,0.063,0.814,0.191,1.187c0.127,0.373,0.326,0.723,0.598,1.049c0.271,0.326,0.622,0.631,1.052,0.916l1.213,0.82
-					c0.5,0.336,0.83,0.611,0.99,0.823s0.241,0.497,0.241,0.852c0,0.289-0.056,0.525-0.167,0.706
-					c-0.112,0.182-0.278,0.315-0.501,0.401s-0.504,0.129-0.844,0.129c-0.27,0-0.542-0.024-0.818-0.073
-					c-0.275-0.049-0.548-0.111-0.82-0.188c-0.271-0.076-0.497-0.14-0.677-0.191c-0.074-0.023-0.133-0.02-0.176,0.012
-					s-0.064,0.082-0.064,0.152v0.41c0,0.074,0.013,0.128,0.038,0.161c0.026,0.033,0.073,0.063,0.144,0.091
-					c0.207,0.09,0.43,0.174,0.668,0.252s0.516,0.146,0.835,0.202c0.318,0.057,0.622,0.085,0.911,0.085
-					c0.406,0,0.772-0.047,1.096-0.141s0.59-0.227,0.797-0.398s0.367-0.393,0.48-0.662S253.005,715.022,253.005,714.659
-					L253.005,714.659z"/>
-				<path id="path5378" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M235.922,711.888
-					c0-7.861,6.372-14.232,14.232-14.232c7.861,0,14.233,6.371,14.233,14.232c0,7.859-6.372,14.232-14.234,14.232
-					C242.294,726.12,235.922,719.747,235.922,711.888z"/>
-				<path id="path5382" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M247.696,726.169l6.211-6.186"/>
-				<path id="path5386" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M247.696,726.169l6.813,5.756"/>
-			</g>
-		</g>
-	</g>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:#231F20;">
+	<!ENTITY st3 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="quadp-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="114.93px"
+	 height="124.07px" viewBox="4.37 2.5 114.93 124.07" xml:space="preserve">
+<g id="M4">
+	<path id="path3908" style="&st2;" d="M64.72,23.41c0,0.08-0.03,0.15-0.08,0.19c-0.06,0.05-0.12,0.07-0.2,0.07h-1.3v2.67
+		c0,0.08-0.02,0.15-0.07,0.21c-0.05,0.06-0.11,0.09-0.19,0.09H62c-0.17,0-0.26-0.1-0.26-0.3v-2.67h-4.34
+		c-0.22,0-0.38-0.04-0.47-0.13c-0.09-0.09-0.14-0.24-0.14-0.45v-0.57c0-0.21,0.06-0.4,0.18-0.56l4.44-6.22
+		c0.1-0.16,0.25-0.24,0.44-0.24h0.88c0.26,0,0.4,0.11,0.4,0.33v6.71h1.3c0.08,0,0.15,0.03,0.21,0.07s0.08,0.12,0.08,0.2L64.72,23.41
+		L64.72,23.41z M61.76,22.54v-5.13c0-0.06-0.02-0.09-0.06-0.09h-0.02c-0.04,0-0.08,0.03-0.12,0.09l-3.46,4.92
+		c-0.03,0.04-0.05,0.08-0.05,0.13c0,0.06,0.04,0.09,0.13,0.09H61.76z"/>
+	<path id="path5342" style="&st0;" d="M79.68,22.37c0,9.82-7.96,17.79-17.79,17.79c-9.83,0-17.79-7.97-17.79-17.79
+		c0-9.83,7.96-17.79,17.79-17.79C71.72,4.58,79.68,12.55,79.68,22.37z"/>
+	<path id="path5346" style="&st4;" d="M55.51,5.24L44.63,4"/>
+	<path id="path5350" style="&st4;" d="M55.51,5.24L53.3,16.17"/>
+</g>
+<g id="M3">
+	<path id="path3906" style="&st2;" d="M26.56,70.49c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.04-0.15-0.08-0.18-0.12c-0.03-0.04-0.04-0.1-0.04-0.19V69.1c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		c0.36,0.08,0.75,0.12,1.17,0.12c0.81,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.86,0.52-1.58v-0.31c0-0.29-0.06-0.57-0.17-0.85
+		c-0.11-0.28-0.3-0.51-0.56-0.7c-0.27-0.19-0.61-0.28-1.03-0.28h-2.73c-0.19,0-0.29-0.09-0.29-0.27v-0.52
+		c0-0.08,0.03-0.15,0.08-0.21c0.05-0.05,0.12-0.08,0.2-0.08h2.73c0.45,0,0.8-0.09,1.06-0.26c0.26-0.18,0.44-0.4,0.54-0.67
+		c0.1-0.27,0.15-0.55,0.15-0.85v-0.21c0-0.42-0.07-0.76-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.13-0.77-0.19-1.33-0.19
+		c-0.42,0-0.82,0.04-1.19,0.12c-0.38,0.08-0.85,0.19-1.41,0.34c-0.2,0.06-0.3-0.01-0.3-0.21v-0.5c0-0.09,0.01-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.17-0.11c0.33-0.14,0.75-0.27,1.25-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67
+		c0.61,0.44,0.91,1.2,0.91,2.26v0.21c0,0.26-0.03,0.5-0.09,0.73s-0.15,0.44-0.27,0.65c-0.12,0.2-0.27,0.39-0.45,0.55
+		c-0.18,0.17-0.38,0.3-0.61,0.42c0.49,0.24,0.85,0.56,1.08,0.99c0.23,0.42,0.35,0.88,0.35,1.37v0.31c0,1.09-0.32,1.9-0.95,2.42
+		C28.58,70.22,27.7,70.49,26.56,70.49L26.56,70.49z"/>
+	<path id="path5354" style="&st0;" d="M44.27,64.99c0-9.82-7.96-17.79-17.79-17.79c-9.83,0-17.79,7.97-17.79,17.79
+		c0,9.83,7.96,17.79,17.79,17.79C36.31,82.78,44.27,74.82,44.27,64.99z"/>
+	<path id="path5358" style="&st4;" d="M17.02,80.06l-0.94-10.92"/>
+	<path id="path5362" style="&st4;" d="M17.02,80.06H5.87"/>
+</g>
+<g id="M1">
+	<path id="path3902" style="&st2;" d="M63.45,107.78c0,0.09-0.03,0.16-0.07,0.22c-0.05,0.06-0.12,0.08-0.2,0.08h-0.82
+		c-0.08,0-0.15-0.03-0.2-0.09c-0.05-0.06-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04
+		c-0.09,0-0.13-0.06-0.13-0.17v-0.76c0-0.08,0.05-0.14,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.1,0.32-0.1h0.61
+		c0.08,0,0.15,0.03,0.2,0.08c0.06,0.05,0.08,0.12,0.08,0.21L63.45,107.78L63.45,107.78z"/>
+	<path id="path5366" style="&st0;" d="M44.05,102.82c0-9.82,7.96-17.79,17.79-17.79c9.83,0,17.79,7.97,17.79,17.79
+		c0,9.83-7.96,17.79-17.79,17.79C52.02,120.61,44.05,112.64,44.05,102.82z"/>
+	<path id="path5370" style="&st4;" d="M64.18,120.26l9.84,4.81"/>
+	<path id="path5374" style="&st4;" d="M64.18,120.26l5.73-9.56"/>
+</g>
+<g id="M2">
+	<path id="path3904" style="&st2;" d="M103.58,62.14c0,0.4-0.07,0.76-0.2,1.07c-0.13,0.31-0.34,0.61-0.62,0.9
+		c-0.28,0.29-0.66,0.59-1.14,0.92L100.19,66c-0.54,0.37-0.97,0.71-1.28,1.03c-0.31,0.32-0.53,0.65-0.65,0.99
+		c-0.12,0.34-0.18,0.73-0.18,1.17v0.32h5.05c0.2,0,0.3,0.09,0.3,0.26v0.66c0,0.09-0.03,0.15-0.09,0.2s-0.13,0.07-0.21,0.07h-5.95
+		c-0.08,0-0.15-0.03-0.21-0.08c-0.06-0.06-0.09-0.12-0.09-0.2V69.2c0-0.52,0.08-1.02,0.24-1.48c0.16-0.47,0.41-0.9,0.75-1.31
+		c0.34-0.41,0.78-0.79,1.32-1.15l1.52-1.02c0.63-0.42,1.04-0.76,1.24-1.03c0.2-0.26,0.3-0.62,0.3-1.06c0-0.36-0.07-0.66-0.21-0.88
+		c-0.14-0.23-0.35-0.39-0.63-0.5c-0.28-0.11-0.63-0.16-1.05-0.16c-0.34,0-0.68,0.03-1.02,0.09c-0.34,0.06-0.69,0.14-1.03,0.24
+		c-0.34,0.09-0.62,0.17-0.85,0.24c-0.09,0.03-0.17,0.03-0.22-0.01c-0.05-0.04-0.08-0.1-0.08-0.19v-0.51c0-0.09,0.02-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.18-0.11c0.26-0.11,0.54-0.22,0.83-0.32c0.3-0.1,0.64-0.18,1.04-0.25c0.4-0.07,0.78-0.11,1.14-0.11
+		c0.51,0,0.97,0.06,1.37,0.18c0.41,0.12,0.74,0.28,1,0.5s0.46,0.49,0.6,0.83C103.51,61.29,103.58,61.68,103.58,62.14L103.58,62.14z"
+		/>
+	<path id="path5378" style="&st0;" d="M82.23,65.6c0,9.83,7.97,17.79,17.79,17.79c9.83,0,17.79-7.96,17.79-17.79
+		c0-9.82-7.97-17.79-17.79-17.79C90.19,47.81,82.23,55.78,82.23,65.6z"/>
+	<path id="path5382" style="&st4;" d="M96.94,47.75l7.76,7.73"/>
+	<path id="path5386" style="&st4;" d="M96.94,47.75l8.52-7.2"/>
+</g>
+<g id="FrontArrow">
+	<path id="path5112" style="&st3;" d="M61.89,74.11V61.73"/>
+	<path id="path5116" style="&st1;" d="M71.19,64.46l-9.35-16.19l-9.35,16.19H71.19z"/>
 </g>
 </svg>
diff --git a/images/motor_order/quadx.svg b/images/motor_order/quadx.svg
index fea375d884..04be3d14e7 100644
--- a/images/motor_order/quadx.svg
+++ b/images/motor_order/quadx.svg
@@ -1,88 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg3387" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="89.125px"
-	 height="96.596px" viewBox="0 0 89.125 96.596" xml:space="preserve">
-<g id="layer1" transform="translate(-331.63693,-454.24951)">
-	<g id="QuadCopter-X" transform="matrix(1.25,0,0,-1.25,260.80888,1395.1084)">
-		<g id="MotorOrderGraphic">
-			<g id="FrontArrow">
-				<path id="path5094" fill="none" stroke="#ED1C24" stroke-width="5" stroke-miterlimit="10" d="M93.897,704.08v9.902"/>
-				<path id="path5098" fill="#ED1C24" d="M101.335,711.793l-7.478,12.953l-7.48-12.953H101.335z"/>
-			</g>
-			<g id="M3">
-				<path id="path3488" fill="#231F20" d="M74.815,690.309c-0.383,0-0.775,0.048-1.178,0.144c-0.402,0.096-0.738,0.198-1.008,0.308
-					c-0.07,0.035-0.117,0.068-0.141,0.099s-0.035,0.082-0.035,0.152v0.41c0,0.16,0.08,0.217,0.24,0.17
-					c0.473-0.125,0.854-0.219,1.145-0.281s0.605-0.094,0.941-0.094c0.645,0,1.105,0.13,1.383,0.392s0.416,0.684,0.416,1.266v0.252
-					c0,0.23-0.044,0.458-0.132,0.683c-0.088,0.224-0.238,0.411-0.451,0.559s-0.487,0.223-0.823,0.223h-2.18
-					c-0.152,0-0.229,0.072-0.229,0.216v0.416c0,0.066,0.021,0.121,0.064,0.164s0.098,0.064,0.164,0.064h2.18
-					c0.359,0,0.643,0.07,0.852,0.211s0.354,0.32,0.434,0.537c0.08,0.216,0.12,0.444,0.12,0.682v0.17c0,0.34-0.057,0.613-0.17,0.817
-					c-0.113,0.205-0.302,0.358-0.566,0.457c-0.264,0.1-0.618,0.149-1.063,0.149c-0.336,0-0.654-0.031-0.955-0.094
-					s-0.678-0.154-1.131-0.275c-0.16-0.047-0.24,0.01-0.24,0.17v0.405c0,0.074,0.012,0.128,0.038,0.161
-					c0.025,0.034,0.071,0.063,0.138,0.091c0.266,0.113,0.598,0.218,0.996,0.314c0.398,0.095,0.795,0.143,1.189,0.143
-					c0.949,0,1.667-0.177,2.153-0.533s0.73-0.957,0.73-1.805v-0.17c0-0.207-0.025-0.401-0.073-0.583
-					c-0.049-0.181-0.122-0.353-0.22-0.516c-0.098-0.162-0.219-0.309-0.363-0.442s-0.307-0.245-0.486-0.334
-					c0.391-0.188,0.679-0.45,0.864-0.787c0.186-0.338,0.279-0.702,0.279-1.093v-0.252c0-0.871-0.253-1.516-0.759-1.936
-					C76.433,690.519,75.725,690.309,74.815,690.309L74.815,690.309z"/>
-				<path id="path5294" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M88.879,694.71
-					c0,7.859-6.372,14.232-14.232,14.232c-7.861,0-14.233-6.373-14.233-14.232c0-7.861,6.372-14.232,14.233-14.232
-					C82.507,680.478,88.879,686.849,88.879,694.71z"/>
-				<path id="path5298" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M67.08,682.658l-0.751,8.733"/>
-				<path id="path5302" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M67.08,682.658h-8.918"/>
-			</g>
-			<g id="M2">
-				<path id="path3486" fill="#231F20" d="M115.077,734.333c0-0.32-0.053-0.607-0.159-0.859c-0.105-0.252-0.271-0.492-0.495-0.721
-					c-0.224-0.228-0.528-0.474-0.911-0.735l-1.148-0.779c-0.434-0.293-0.774-0.569-1.023-0.827s-0.42-0.521-0.516-0.791
-					s-0.144-0.582-0.144-0.938v-0.252h4.044c0.159,0,0.24-0.069,0.24-0.205V727.7c0-0.07-0.023-0.124-0.07-0.162
-					c-0.047-0.037-0.104-0.056-0.17-0.056h-4.764c-0.063,0-0.119,0.023-0.167,0.067c-0.048,0.045-0.073,0.098-0.073,0.161v0.973
-					c0,0.418,0.064,0.814,0.191,1.187c0.127,0.373,0.327,0.723,0.598,1.049c0.271,0.326,0.623,0.631,1.052,0.916l1.212,0.82
-					c0.5,0.336,0.83,0.611,0.991,0.823c0.159,0.213,0.24,0.497,0.24,0.852c0,0.289-0.055,0.525-0.167,0.706
-					c-0.112,0.182-0.278,0.316-0.501,0.401s-0.504,0.129-0.844,0.129c-0.27,0-0.542-0.024-0.817-0.073
-					c-0.276-0.048-0.549-0.111-0.82-0.188c-0.272-0.076-0.497-0.139-0.677-0.19c-0.075-0.023-0.133-0.02-0.177,0.012
-					c-0.042,0.03-0.064,0.081-0.064,0.152v0.41c0,0.074,0.013,0.127,0.038,0.161c0.026,0.033,0.073,0.063,0.144,0.091
-					c0.208,0.09,0.43,0.174,0.669,0.252c0.238,0.078,0.516,0.145,0.834,0.202c0.319,0.057,0.622,0.085,0.911,0.085
-					c0.406,0,0.772-0.047,1.096-0.141s0.59-0.227,0.797-0.398s0.367-0.392,0.48-0.662S115.077,734.696,115.077,734.333
-					L115.077,734.333z"/>
-				<path id="path5306" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M97.999,731.149
-					c0-7.859,6.372-14.232,14.231-14.232c7.861,0,14.233,6.373,14.233,14.232c0,7.86-6.372,14.232-14.233,14.232
-					C104.371,745.381,97.999,739.009,97.999,731.149z"/>
-				<path id="path5310" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M109.774,745.432l6.209-6.188"/>
-				<path id="path5314" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M109.774,745.432l6.811,5.755"/>
-			</g>
-			<g id="M4">
-				<path id="path3490" fill="#231F20" d="M76.905,730.073c0-0.066-0.023-0.118-0.068-0.155c-0.045-0.037-0.098-0.056-0.161-0.056
-					h-1.043v-2.139c0-0.066-0.019-0.123-0.056-0.17s-0.087-0.07-0.149-0.07h-0.697c-0.137,0-0.205,0.08-0.205,0.24v2.139h-3.469
-					c-0.176,0-0.302,0.035-0.378,0.105s-0.114,0.189-0.114,0.357v0.457c0,0.168,0.049,0.316,0.146,0.445l3.551,4.98
-					c0.082,0.129,0.199,0.194,0.352,0.194h0.703c0.211,0,0.316-0.088,0.316-0.264v-5.367h1.043c0.066,0,0.121-0.019,0.164-0.059
-					c0.043-0.039,0.064-0.091,0.064-0.158V730.073z M74.537,730.771v4.107c0,0.047-0.016,0.07-0.047,0.07h-0.012
-					c-0.031,0-0.063-0.023-0.094-0.07l-2.771-3.938c-0.027-0.031-0.041-0.064-0.041-0.099c0-0.047,0.033-0.07,0.1-0.07H74.537z"/>
-				<path id="path5318" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M88.879,731.149
-					c0-7.859-6.372-14.232-14.232-14.232c-7.861,0-14.233,6.373-14.233,14.232c0,7.86,6.372,14.232,14.233,14.232
-					C82.507,745.381,88.879,739.009,88.879,731.149z"/>
-				<path id="path5322" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M69.541,744.851l-8.708,0.996"/>
-				<path id="path5326" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M69.541,744.851l-1.769-8.742"/>
-			</g>
-			<g id="M1">
-				<path id="path3484" fill="#231F20" d="M113.514,690.631c0-0.07-0.02-0.128-0.059-0.173c-0.039-0.045-0.091-0.068-0.158-0.068
-					h-0.656c-0.066,0-0.119,0.023-0.158,0.07s-0.059,0.104-0.059,0.17v7.547l-1.547-0.674c-0.063-0.023-0.115-0.035-0.158-0.035
-					c-0.07,0-0.105,0.045-0.105,0.135v0.609c0,0.063,0.039,0.115,0.117,0.158l1.81,0.862c0.098,0.051,0.182,0.076,0.252,0.076h0.492
-					c0.063,0,0.116-0.02,0.161-0.061c0.045-0.041,0.068-0.097,0.068-0.167V690.631z"/>
-				<path id="path5330" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M97.999,694.71
-					c0,7.859,6.372,14.232,14.231,14.232c7.861,0,14.233-6.373,14.233-14.232c0-7.861-6.372-14.232-14.233-14.232
-					C104.371,680.478,97.999,686.849,97.999,694.71z"/>
-				<path id="path5334" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M114.102,680.756l7.877-3.845"/>
-				<path id="path5338" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M114.102,680.756l4.584,7.65"/>
-			</g>
-		</g>
-	</g>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:#231F20;">
+	<!ENTITY st3 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="quadx-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="89.13px" height="96.6px"
+	 viewBox="0 0 89.13 96.6" xml:space="preserve">
+<g id="FrontArrow">
+	<path id="path5094" style="&st3;" d="M46.54,60.76V48.38"/>
+	<path id="path5098" style="&st1;" d="M55.84,51.12l-9.35-16.19l-9.35,16.19H55.84z"/>
+</g>
+<g id="M3">
+	<path id="path3488" style="&st2;" d="M22.69,77.97c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.04-0.15-0.08-0.18-0.12c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		c0.36,0.08,0.76,0.12,1.18,0.12c0.81,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.86,0.52-1.58v-0.31c0-0.29-0.06-0.57-0.17-0.85
+		c-0.11-0.28-0.3-0.51-0.56-0.7c-0.27-0.18-0.61-0.28-1.03-0.28h-2.72c-0.19,0-0.29-0.09-0.29-0.27v-0.52
+		c0-0.08,0.03-0.15,0.08-0.21s0.12-0.08,0.21-0.08h2.73c0.45,0,0.8-0.09,1.06-0.26c0.26-0.18,0.44-0.4,0.54-0.67
+		c0.1-0.27,0.15-0.55,0.15-0.85v-0.21c0-0.43-0.07-0.77-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.13-0.77-0.19-1.33-0.19
+		c-0.42,0-0.82,0.04-1.19,0.12c-0.38,0.08-0.85,0.19-1.41,0.34c-0.2,0.06-0.3-0.01-0.3-0.21v-0.51c0-0.09,0.02-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.17-0.11c0.33-0.14,0.75-0.27,1.25-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67
+		c0.61,0.45,0.91,1.2,0.91,2.26v0.21c0,0.26-0.03,0.5-0.09,0.73c-0.06,0.23-0.15,0.44-0.27,0.64c-0.12,0.2-0.27,0.39-0.45,0.55
+		c-0.18,0.17-0.38,0.31-0.61,0.42c0.49,0.24,0.85,0.56,1.08,0.98c0.23,0.42,0.35,0.88,0.35,1.37v0.31c0,1.09-0.32,1.9-0.95,2.42
+		C24.71,77.71,23.83,77.97,22.69,77.97L22.69,77.97z"/>
+	<path id="path5294" style="&st0;" d="M40.27,72.47c0-9.82-7.96-17.79-17.79-17.79c-9.83,0-17.79,7.97-17.79,17.79
+		c0,9.83,7.96,17.79,17.79,17.79C32.31,90.26,40.27,82.3,40.27,72.47z"/>
+	<path id="path5298" style="&st4;" d="M13.02,87.54l-0.94-10.92"/>
+	<path id="path5302" style="&st4;" d="M13.02,87.54H1.87"/>
+</g>
+<g id="M2">
+	<path id="path3486" style="&st2;" d="M73.02,22.94c0,0.4-0.07,0.76-0.2,1.07c-0.13,0.31-0.34,0.61-0.62,0.9
+		c-0.28,0.29-0.66,0.59-1.14,0.92l-1.44,0.97c-0.54,0.37-0.97,0.71-1.28,1.03c-0.31,0.32-0.52,0.65-0.64,0.99
+		c-0.12,0.34-0.18,0.73-0.18,1.17v0.32h5.05c0.2,0,0.3,0.09,0.3,0.26v0.66c0,0.09-0.03,0.16-0.09,0.2
+		c-0.06,0.05-0.13,0.07-0.21,0.07h-5.96c-0.08,0-0.15-0.03-0.21-0.08c-0.06-0.06-0.09-0.12-0.09-0.2v-1.22
+		c0-0.52,0.08-1.02,0.24-1.48c0.16-0.47,0.41-0.9,0.75-1.31s0.78-0.79,1.32-1.15l1.51-1.02c0.63-0.42,1.04-0.76,1.24-1.03
+		c0.2-0.27,0.3-0.62,0.3-1.06c0-0.36-0.07-0.66-0.21-0.88c-0.14-0.23-0.35-0.39-0.63-0.5c-0.28-0.11-0.63-0.16-1.06-0.16
+		c-0.34,0-0.68,0.03-1.02,0.09c-0.35,0.06-0.69,0.14-1.03,0.24c-0.34,0.09-0.62,0.17-0.85,0.24c-0.09,0.03-0.17,0.03-0.22-0.01
+		c-0.05-0.04-0.08-0.1-0.08-0.19v-0.51c0-0.09,0.02-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.18-0.11c0.26-0.11,0.54-0.22,0.84-0.32
+		c0.3-0.1,0.64-0.18,1.04-0.25c0.4-0.07,0.78-0.11,1.14-0.11c0.51,0,0.96,0.06,1.37,0.18c0.41,0.12,0.74,0.28,1,0.5
+		c0.26,0.21,0.46,0.49,0.6,0.83C72.95,22.1,73.02,22.49,73.02,22.94L73.02,22.94z"/>
+	<path id="path5306" style="&st0;" d="M51.67,26.92c0,9.82,7.96,17.79,17.79,17.79c9.83,0,17.79-7.97,17.79-17.79
+		c0-9.83-7.96-17.79-17.79-17.79C59.64,9.13,51.67,17.1,51.67,26.92z"/>
+	<path id="path5310" style="&st4;" d="M66.39,9.07l7.76,7.74"/>
+	<path id="path5314" style="&st4;" d="M66.39,9.07l8.51-7.19"/>
+</g>
+<g id="M4">
+	<path id="path3490" style="&st2;" d="M25.3,28.27c0,0.08-0.03,0.15-0.08,0.19c-0.06,0.05-0.12,0.07-0.2,0.07h-1.3v2.67
+		c0,0.08-0.02,0.15-0.07,0.21c-0.05,0.06-0.11,0.09-0.19,0.09h-0.87c-0.17,0-0.26-0.1-0.26-0.3v-2.67h-4.34
+		c-0.22,0-0.38-0.04-0.47-0.13c-0.09-0.09-0.14-0.24-0.14-0.45v-0.57c0-0.21,0.06-0.4,0.18-0.56L22,20.6
+		c0.1-0.16,0.25-0.24,0.44-0.24h0.88c0.26,0,0.4,0.11,0.4,0.33v6.71h1.3c0.08,0,0.15,0.02,0.21,0.07c0.05,0.05,0.08,0.11,0.08,0.2
+		L25.3,28.27L25.3,28.27z M22.34,27.39v-5.13c0-0.06-0.02-0.09-0.06-0.09h-0.02c-0.04,0-0.08,0.03-0.12,0.09l-3.46,4.92
+		c-0.03,0.04-0.05,0.08-0.05,0.12c0,0.06,0.04,0.09,0.13,0.09H22.34z"/>
+	<path id="path5318" style="&st0;" d="M40.27,26.92c0,9.82-7.96,17.79-17.79,17.79c-9.83,0-17.79-7.97-17.79-17.79
+		c0-9.83,7.96-17.79,17.79-17.79C32.31,9.13,40.27,17.1,40.27,26.92z"/>
+	<path id="path5322" style="&st4;" d="M16.1,9.8L5.21,8.55"/>
+	<path id="path5326" style="&st4;" d="M16.1,9.8l-2.21,10.93"/>
+</g>
+<g id="M1">
+	<path id="path3484" style="&st2;" d="M71.06,77.57c0,0.09-0.03,0.16-0.07,0.22s-0.11,0.08-0.2,0.08h-0.82
+		c-0.08,0-0.15-0.03-0.2-0.09c-0.05-0.06-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04
+		c-0.09,0-0.13-0.06-0.13-0.17v-0.76c0-0.08,0.05-0.14,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.09,0.32-0.09h0.62
+		c0.08,0,0.15,0.03,0.2,0.08c0.06,0.05,0.08,0.12,0.08,0.21V77.57L71.06,77.57z"/>
+	<path id="path5330" style="&st0;" d="M51.67,72.47c0-9.82,7.96-17.79,17.79-17.79c9.83,0,17.79,7.97,17.79,17.79
+		c0,9.83-7.96,17.79-17.79,17.79C59.64,90.26,51.67,82.3,51.67,72.47z"/>
+	<path id="path5334" style="&st4;" d="M71.8,89.91l9.85,4.81"/>
+	<path id="path5338" style="&st4;" d="M71.8,89.91l5.73-9.56"/>
 </g>
 </svg>
diff --git a/images/motor_order/tri.svg b/images/motor_order/tri.svg
index bbbe1f23ef..cb8abc24a6 100644
--- a/images/motor_order/tri.svg
+++ b/images/motor_order/tri.svg
@@ -1,94 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg3742" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="117.723px"
-	 height="111.328px" viewBox="0 0 117.723 111.328" xml:space="preserve">
-<g id="layer1" transform="translate(-316.13881,-449.29394)">
-	<g id="TriCopter" transform="matrix(1.25,0,0,-1.25,-51.466488,1404.5132)">
-		<g id="MotorOrderGraphic">
-			<g id="FrontArrow">
-				<path id="path5270" fill="none" stroke="#ED1C24" stroke-width="5" stroke-miterlimit="10" d="M343.701,715.623v9.902"/>
-				<path id="path5274" fill="#ED1C24" d="M351.139,723.337l-7.479,12.953l-7.479-12.953H351.139z"/>
-			</g>
-			<g id="S1">
-				<path id="path5276" fill="none" stroke="#BF1B2C" stroke-width="3" stroke-miterlimit="10" d="M383.636,682.441h-20.213v20.212
-					h20.213V682.441z"/>
-				<path id="path3952" fill="#231F20" d="M373.396,690.615c0-0.676-0.219-1.245-0.659-1.706c-0.439-0.461-1.175-0.691-2.206-0.691
-					c-0.383,0-0.789,0.049-1.219,0.147s-0.783,0.212-1.06,0.345c-0.102,0.051-0.165,0.094-0.191,0.129
-					c-0.025,0.035-0.038,0.1-0.038,0.194v0.492c0,0.156,0.08,0.203,0.241,0.141c0.352-0.121,0.736-0.227,1.154-0.316
-					s0.801-0.135,1.148-0.135c0.406,0,0.737,0.056,0.991,0.17c0.254,0.113,0.434,0.274,0.542,0.483
-					c0.107,0.209,0.161,0.459,0.161,0.748c0,0.301-0.098,0.559-0.293,0.776c-0.195,0.217-0.574,0.495-1.137,0.835l-1.16,0.709
-					c-0.578,0.352-0.999,0.698-1.262,1.04c-0.264,0.341-0.396,0.743-0.396,1.204c0,0.465,0.108,0.858,0.323,1.178
-					s0.523,0.557,0.923,0.712c0.401,0.154,0.87,0.231,1.409,0.231c0.426,0,0.841-0.048,1.248-0.144
-					c0.406-0.095,0.713-0.192,0.92-0.29c0.063-0.023,0.113-0.051,0.149-0.082c0.038-0.031,0.056-0.076,0.056-0.134v-0.609
-					c0-0.145-0.077-0.194-0.229-0.147c-0.277,0.09-0.524,0.164-0.741,0.223c-0.216,0.059-0.447,0.106-0.691,0.144
-					c-0.244,0.037-0.481,0.055-0.712,0.055c-0.539,0-0.933-0.085-1.18-0.255c-0.248-0.17-0.372-0.464-0.372-0.882
-					c0-0.273,0.096-0.511,0.29-0.712c0.193-0.202,0.534-0.448,1.023-0.741l1.102-0.662c0.688-0.402,1.17-0.791,1.45-1.163
-					C373.256,691.527,373.396,691.099,373.396,690.615L373.396,690.615z"/>
-				<path id="path3954" fill="#231F20" d="M378.186,688.541c0-0.07-0.02-0.128-0.059-0.173c-0.039-0.045-0.091-0.067-0.158-0.067
-					h-0.656c-0.066,0-0.12,0.023-0.159,0.07s-0.059,0.104-0.059,0.17v7.547l-1.547-0.674c-0.063-0.023-0.115-0.035-0.158-0.035
-					c-0.07,0-0.105,0.044-0.105,0.134v0.609c0,0.063,0.039,0.116,0.117,0.159l1.81,0.861c0.098,0.051,0.182,0.077,0.252,0.077h0.492
-					c0.063,0,0.116-0.02,0.161-0.062c0.045-0.041,0.067-0.097,0.067-0.167V688.541z"/>
-			</g>
-			<g id="M3">
-				<path id="path3933" fill="#231F20" d="M312.311,738.455c-0.383,0-0.776,0.048-1.178,0.144c-0.402,0.095-0.738,0.198-1.008,0.308
-					c-0.07,0.035-0.117,0.068-0.141,0.099s-0.035,0.082-0.035,0.152v0.41c0,0.16,0.08,0.217,0.241,0.17
-					c0.473-0.125,0.854-0.219,1.145-0.281c0.291-0.063,0.605-0.094,0.941-0.094c0.645,0,1.105,0.13,1.383,0.392
-					s0.416,0.684,0.416,1.266v0.252c0,0.23-0.044,0.458-0.132,0.682c-0.087,0.225-0.238,0.412-0.451,0.56
-					c-0.213,0.148-0.488,0.223-0.823,0.223h-2.18c-0.152,0-0.228,0.072-0.228,0.216v0.416c0,0.066,0.021,0.121,0.064,0.164
-					s0.098,0.064,0.164,0.064h2.18c0.359,0,0.644,0.07,0.852,0.211c0.209,0.141,0.354,0.32,0.434,0.536
-					c0.08,0.217,0.12,0.445,0.12,0.683v0.17c0,0.34-0.056,0.612-0.17,0.817c-0.113,0.205-0.302,0.357-0.566,0.457
-					c-0.264,0.099-0.618,0.149-1.063,0.149c-0.336,0-0.655-0.031-0.955-0.094s-0.677-0.154-1.13-0.275
-					c-0.16-0.047-0.241,0.009-0.241,0.17v0.405c0,0.074,0.013,0.127,0.038,0.161c0.025,0.033,0.071,0.063,0.137,0.091
-					c0.266,0.113,0.598,0.218,0.996,0.313c0.398,0.096,0.795,0.144,1.19,0.144c0.949,0,1.666-0.177,2.153-0.533
-					c0.486-0.355,0.73-0.957,0.73-1.805v-0.17c0-0.207-0.025-0.402-0.073-0.583c-0.049-0.182-0.122-0.354-0.22-0.516
-					c-0.098-0.163-0.219-0.309-0.363-0.442s-0.307-0.245-0.487-0.334c0.391-0.188,0.679-0.45,0.864-0.788
-					c0.186-0.337,0.279-0.702,0.279-1.092v-0.252c0-0.871-0.253-1.516-0.759-1.937C313.929,738.666,313.222,738.455,312.311,738.455
-					L312.311,738.455z"/>
-				<path id="path5390" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M326.301,742.558
-					c0,7.859-6.372,14.232-14.232,14.232c-7.861,0-14.233-6.373-14.233-14.232c0-7.861,6.372-14.232,14.233-14.232
-					C319.929,728.326,326.301,734.698,326.301,742.558z"/>
-				<path id="path5394" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M304.502,730.505l-0.752,8.733"/>
-				<path id="path5398" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M304.502,730.505h-8.918"/>
-			</g>
-			<g id="M2">
-				<path id="path3937" fill="#231F20" d="M375.721,744.823c0-0.32-0.052-0.607-0.158-0.859c-0.105-0.252-0.271-0.492-0.495-0.721
-					c-0.225-0.228-0.528-0.474-0.911-0.735l-1.148-0.779c-0.434-0.293-0.775-0.569-1.023-0.827c-0.248-0.258-0.42-0.521-0.516-0.791
-					c-0.096-0.27-0.144-0.582-0.144-0.938v-0.252h4.043c0.16,0,0.241-0.068,0.241-0.205v-0.527c0-0.07-0.023-0.124-0.07-0.162
-					c-0.047-0.037-0.104-0.056-0.17-0.056h-4.763c-0.063,0-0.119,0.023-0.167,0.067c-0.049,0.045-0.073,0.099-0.073,0.162v0.973
-					c0,0.418,0.063,0.813,0.191,1.186c0.127,0.373,0.326,0.723,0.598,1.049c0.271,0.326,0.622,0.632,1.052,0.917l1.213,0.82
-					c0.5,0.336,0.83,0.61,0.99,0.823c0.16,0.213,0.241,0.498,0.241,0.853c0,0.289-0.056,0.524-0.167,0.706
-					c-0.112,0.182-0.278,0.316-0.501,0.401s-0.504,0.129-0.844,0.129c-0.27,0-0.542-0.024-0.818-0.073
-					c-0.275-0.048-0.548-0.111-0.82-0.188c-0.271-0.076-0.497-0.139-0.677-0.19c-0.074-0.023-0.133-0.02-0.176,0.012
-					c-0.043,0.03-0.064,0.081-0.064,0.152v0.41c0,0.074,0.012,0.127,0.037,0.161c0.026,0.033,0.073,0.063,0.144,0.091
-					c0.207,0.09,0.43,0.174,0.668,0.252s0.516,0.145,0.835,0.202c0.318,0.057,0.622,0.085,0.911,0.085
-					c0.406,0,0.772-0.047,1.096-0.141s0.59-0.227,0.797-0.398s0.367-0.392,0.48-0.662S375.721,745.187,375.721,744.823
-					L375.721,744.823z"/>
-				<path id="path5402" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M358.297,742.637
-					c0-7.86,6.372-14.232,14.232-14.232c7.861,0,14.233,6.372,14.233,14.232c0,7.86-6.372,14.232-14.233,14.232
-					C364.669,756.869,358.297,750.498,358.297,742.637z"/>
-				<path id="path5406" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M370.072,756.919l6.211-6.187"/>
-				<path id="path5410" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M370.072,756.919l6.813,5.756"/>
-			</g>
-			<g id="M1">
-				<path id="path3935" fill="#231F20" d="M343.307,687.226c0-0.07-0.02-0.128-0.059-0.173c-0.039-0.045-0.092-0.067-0.159-0.067
-					h-0.656c-0.066,0-0.119,0.023-0.158,0.07s-0.059,0.103-0.059,0.169v7.547l-1.547-0.673c-0.063-0.023-0.116-0.035-0.159-0.035
-					c-0.07,0-0.105,0.044-0.105,0.134v0.609c0,0.063,0.039,0.116,0.117,0.159l1.811,0.861c0.098,0.051,0.181,0.077,0.252,0.077
-					h0.492c0.063,0,0.116-0.021,0.161-0.062c0.045-0.041,0.068-0.097,0.068-0.167V687.226z"/>
-				<path id="path5414" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M356.174,690.845
-					c0,7.859-6.372,14.232-14.232,14.232c-7.861,0-14.233-6.373-14.233-14.232c0-7.861,6.372-14.232,14.233-14.232
-					C349.802,676.613,356.174,682.984,356.174,690.845z"/>
-				<path id="path5418" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M334.375,678.793l-0.752,8.732"/>
-				<path id="path5422" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M334.375,678.793h-8.918"/>
-			</g>
-		</g>
-	</g>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:none;stroke:#BF1B2C;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st3 "fill:#231F20;">
+	<!ENTITY st4 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st5 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="tri-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="116.97px"
+	 height="110.58px" viewBox="0.37 0.38 116.97 110.58" xml:space="preserve">
+<g id="S1">
+	<path id="path5276" style="&st2;" d="M111.94,102.17H86.67V76.9h25.27V102.17z"/>
+	<path id="path3952" style="&st3;" d="M99.14,91.95c0,0.84-0.27,1.56-0.82,2.13c-0.55,0.58-1.47,0.86-2.76,0.86
+		c-0.48,0-0.99-0.06-1.52-0.18c-0.54-0.12-0.98-0.27-1.33-0.43c-0.13-0.06-0.21-0.12-0.24-0.16c-0.03-0.04-0.05-0.13-0.05-0.24
+		v-0.62c0-0.19,0.1-0.25,0.3-0.18c0.44,0.15,0.92,0.28,1.44,0.39s1,0.17,1.43,0.17c0.51,0,0.92-0.07,1.24-0.21
+		c0.32-0.14,0.54-0.34,0.68-0.6c0.13-0.26,0.2-0.57,0.2-0.94c0-0.38-0.12-0.7-0.37-0.97c-0.24-0.27-0.72-0.62-1.42-1.04l-1.45-0.89
+		c-0.72-0.44-1.25-0.87-1.58-1.3c-0.33-0.43-0.5-0.93-0.5-1.51c0-0.58,0.14-1.07,0.4-1.47c0.27-0.4,0.65-0.7,1.15-0.89
+		c0.5-0.19,1.09-0.29,1.76-0.29c0.53,0,1.05,0.06,1.56,0.18c0.51,0.12,0.89,0.24,1.15,0.36c0.08,0.03,0.14,0.06,0.19,0.1
+		c0.05,0.04,0.07,0.09,0.07,0.17v0.76c0,0.18-0.1,0.24-0.29,0.18c-0.35-0.11-0.66-0.21-0.93-0.28c-0.27-0.07-0.56-0.13-0.86-0.18
+		c-0.3-0.05-0.6-0.07-0.89-0.07c-0.67,0-1.17,0.11-1.48,0.32c-0.31,0.21-0.46,0.58-0.46,1.1c0,0.34,0.12,0.64,0.36,0.89
+		c0.24,0.25,0.67,0.56,1.28,0.93l1.38,0.83c0.86,0.5,1.46,0.99,1.81,1.45C98.97,90.81,99.14,91.35,99.14,91.95L99.14,91.95z"/>
+	<path id="path3954" style="&st3;" d="M105.13,94.54c0,0.09-0.03,0.16-0.07,0.22c-0.05,0.06-0.11,0.08-0.2,0.08h-0.82
+		c-0.08,0-0.15-0.03-0.2-0.09s-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04c-0.09,0-0.13-0.06-0.13-0.17
+		v-0.76c0-0.08,0.05-0.14,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.1,0.32-0.1h0.62c0.08,0,0.14,0.03,0.2,0.08
+		c0.06,0.05,0.08,0.12,0.08,0.21L105.13,94.54L105.13,94.54z"/>
+</g>
+<g id="M3">
+	<path id="path3933" style="&st3;" d="M22.78,32.15c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.39
+		c-0.09-0.04-0.15-0.08-0.18-0.12c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		c0.36,0.08,0.76,0.12,1.18,0.12c0.81,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.85,0.52-1.58v-0.31c0-0.29-0.05-0.57-0.17-0.85
+		c-0.11-0.28-0.3-0.51-0.56-0.7c-0.27-0.19-0.61-0.28-1.03-0.28h-2.72c-0.19,0-0.29-0.09-0.29-0.27v-0.52
+		c0-0.08,0.03-0.15,0.08-0.21s0.12-0.08,0.21-0.08h2.72c0.45,0,0.81-0.09,1.07-0.26c0.26-0.18,0.44-0.4,0.54-0.67
+		c0.1-0.27,0.15-0.56,0.15-0.85v-0.21c0-0.42-0.07-0.77-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.12-0.77-0.19-1.33-0.19
+		c-0.42,0-0.82,0.04-1.19,0.12s-0.85,0.19-1.41,0.34c-0.2,0.06-0.3-0.01-0.3-0.21v-0.51c0-0.09,0.02-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.17-0.11c0.33-0.14,0.75-0.27,1.25-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67
+		c0.61,0.44,0.91,1.2,0.91,2.26v0.21c0,0.26-0.03,0.5-0.09,0.73c-0.06,0.23-0.15,0.44-0.28,0.65c-0.12,0.2-0.27,0.39-0.45,0.55
+		c-0.18,0.17-0.38,0.31-0.61,0.42c0.49,0.23,0.85,0.56,1.08,0.98c0.23,0.42,0.35,0.88,0.35,1.36v0.31c0,1.09-0.32,1.9-0.95,2.42
+		C24.81,31.89,23.92,32.15,22.78,32.15L22.78,32.15z"/>
+	<path id="path5390" style="&st0;" d="M40.27,27.02c0-9.82-7.96-17.79-17.79-17.79c-9.83,0-17.79,7.97-17.79,17.79
+		c0,9.83,7.96,17.79,17.79,17.79C32.31,44.81,40.27,36.85,40.27,27.02z"/>
+	<path id="path5394" style="&st5;" d="M13.02,42.09l-0.94-10.92"/>
+	<path id="path5398" style="&st5;" d="M13.02,42.09H1.87"/>
+</g>
+<g id="M2">
+	<path id="path3937" style="&st3;" d="M102.05,24.19c0,0.4-0.07,0.76-0.2,1.07s-0.34,0.62-0.62,0.9c-0.28,0.29-0.66,0.59-1.14,0.92
+		l-1.44,0.97c-0.54,0.37-0.97,0.71-1.28,1.03c-0.31,0.32-0.53,0.65-0.64,0.99c-0.12,0.34-0.18,0.73-0.18,1.17v0.31h5.05
+		c0.2,0,0.3,0.08,0.3,0.26v0.66c0,0.09-0.03,0.16-0.09,0.2c-0.06,0.05-0.13,0.07-0.21,0.07h-5.95c-0.08,0-0.15-0.03-0.21-0.08
+		c-0.06-0.06-0.09-0.12-0.09-0.2v-1.22c0-0.52,0.08-1.02,0.24-1.48c0.16-0.47,0.41-0.9,0.75-1.31c0.34-0.41,0.78-0.79,1.31-1.15
+		l1.52-1.02c0.63-0.42,1.04-0.76,1.24-1.03s0.3-0.62,0.3-1.07c0-0.36-0.07-0.65-0.21-0.88c-0.14-0.23-0.35-0.4-0.63-0.5
+		c-0.28-0.11-0.63-0.16-1.05-0.16c-0.34,0-0.68,0.03-1.02,0.09c-0.34,0.06-0.68,0.14-1.03,0.23c-0.34,0.1-0.62,0.17-0.85,0.24
+		c-0.09,0.03-0.17,0.02-0.22-0.02c-0.05-0.04-0.08-0.1-0.08-0.19v-0.51c0-0.09,0.01-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.18-0.11
+		c0.26-0.11,0.54-0.22,0.83-0.31c0.3-0.1,0.65-0.18,1.04-0.25c0.4-0.07,0.78-0.11,1.14-0.11c0.51,0,0.96,0.06,1.37,0.18
+		s0.74,0.28,1,0.5s0.46,0.49,0.6,0.83C101.98,23.34,102.05,23.74,102.05,24.19L102.05,24.19z"/>
+	<path id="path5402" style="&st0;" d="M80.27,26.92c0,9.83,7.96,17.79,17.79,17.79c9.83,0,17.79-7.96,17.79-17.79
+		c0-9.82-7.96-17.79-17.79-17.79C88.23,9.13,80.27,17.1,80.27,26.92z"/>
+	<path id="path5406" style="&st5;" d="M94.98,9.07l7.76,7.73"/>
+	<path id="path5410" style="&st5;" d="M94.98,9.07l8.52-7.19"/>
+</g>
+<g id="M1">
+	<path id="path3935" style="&st3;" d="M61.53,96.19c0,0.09-0.03,0.16-0.07,0.22c-0.05,0.06-0.11,0.08-0.2,0.08h-0.82
+		c-0.08,0-0.15-0.03-0.2-0.09c-0.05-0.06-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04
+		c-0.09,0-0.13-0.05-0.13-0.17v-0.76c0-0.08,0.05-0.15,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.1,0.32-0.1h0.62
+		c0.08,0,0.14,0.03,0.2,0.08c0.06,0.05,0.08,0.12,0.08,0.21L61.53,96.19L61.53,96.19z"/>
+	<path id="path5414" style="&st0;" d="M77.61,91.66c0-9.82-7.97-17.79-17.79-17.79c-9.83,0-17.79,7.97-17.79,17.79
+		c0,9.83,7.97,17.79,17.79,17.79C69.65,109.45,77.61,101.49,77.61,91.66z"/>
+	<path id="path5418" style="&st5;" d="M50.36,106.73l-0.94-10.92"/>
+	<path id="path5422" style="&st5;" d="M50.36,106.73H39.22"/>
+</g>
+<g id="FrontArrow">
+	<path id="path5270" style="&st4;" d="M62.02,60.69V48.31"/>
+	<path id="path5274" style="&st1;" d="M71.32,51.05l-9.35-16.19l-9.35,16.19H71.32z"/>
 </g>
 </svg>
diff --git a/images/motor_order/vtail.svg b/images/motor_order/vtail.svg
new file mode 100644
index 0000000000..86e3984e54
--- /dev/null
+++ b/images/motor_order/vtail.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:#231F20;">
+	<!ENTITY st3 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="Vtail-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="90.56px" height="85.29px"
+	 viewBox="0.69 6.47 90.56 85.29" xml:space="preserve">
+<g id="M4">
+	<path id="path3490" style="&st2;" d="M22.8,28.27c0,0.08-0.03,0.15-0.09,0.19c-0.06,0.05-0.12,0.07-0.2,0.07h-1.3v2.67
+		c0,0.08-0.02,0.15-0.07,0.21c-0.05,0.06-0.11,0.09-0.19,0.09h-0.87c-0.17,0-0.26-0.1-0.26-0.3v-2.67h-4.34
+		c-0.22,0-0.38-0.05-0.47-0.13c-0.1-0.09-0.14-0.23-0.14-0.44v-0.57c0-0.21,0.06-0.4,0.18-0.56l4.44-6.23
+		c0.1-0.16,0.25-0.24,0.44-0.24h0.88c0.26,0,0.39,0.11,0.39,0.33v6.71h1.3c0.08,0,0.15,0.02,0.21,0.07c0.05,0.05,0.08,0.11,0.08,0.2
+		V28.27L22.8,28.27L22.8,28.27z M19.84,27.4v-5.13c0-0.06-0.02-0.09-0.06-0.09h-0.01c-0.04,0-0.08,0.03-0.12,0.09l-3.46,4.92
+		c-0.03,0.04-0.05,0.08-0.05,0.12c0,0.06,0.04,0.09,0.13,0.09H19.84z"/>
+	<path id="path5318" style="&st0;" d="M37.77,26.92c0,9.82-7.96,17.79-17.79,17.79c-9.83,0-17.79-7.97-17.79-17.79
+		c0-9.82,7.96-17.79,17.79-17.79C29.81,9.13,37.77,17.1,37.77,26.92z"/>
+	<path id="path5322" style="&st4;" d="M13.6,9.79L2.71,8.55"/>
+	<path id="path5326" style="&st4;" d="M13.6,9.79l-2.21,10.93"/>
+</g>
+<g id="M3_1_">
+	<path id="path5330" style="&st0;" d="M41.67,72.47c0-9.82,7.97-17.79,17.79-17.79c9.83,0,17.79,7.97,17.79,17.79
+		c0,9.83-7.96,17.79-17.79,17.79C49.64,90.26,41.67,82.3,41.67,72.47z"/>
+	<path id="path5334" style="&st4;" d="M69.01,87.25l10.96,0.15"/>
+	<path id="path5338" style="&st4;" d="M69.01,87.25l1.11-11.09"/>
+	<path id="path3488" style="&st2;" d="M59.35,77.97c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.05-0.15-0.09-0.18-0.12c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		c0.36,0.08,0.76,0.12,1.18,0.12c0.81,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.85,0.52-1.58v-0.31c0-0.29-0.06-0.57-0.17-0.85
+		c-0.11-0.28-0.3-0.52-0.56-0.7c-0.27-0.19-0.61-0.28-1.03-0.28h-2.73c-0.19,0-0.29-0.09-0.29-0.27v-0.52c0-0.08,0.03-0.15,0.08-0.2
+		c0.05-0.06,0.12-0.08,0.21-0.08h2.73c0.45,0,0.81-0.09,1.07-0.26c0.26-0.18,0.44-0.4,0.54-0.67c0.1-0.27,0.15-0.56,0.15-0.85v-0.21
+		c0-0.43-0.07-0.77-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.13-0.77-0.19-1.33-0.19c-0.42,0-0.82,0.04-1.19,0.12
+		s-0.85,0.19-1.41,0.35c-0.2,0.06-0.3-0.01-0.3-0.21V67.5c0-0.09,0.01-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.17-0.11
+		c0.33-0.14,0.75-0.27,1.24-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67c0.61,0.44,0.91,1.19,0.91,2.26v0.21
+		c0,0.26-0.03,0.5-0.09,0.73c-0.06,0.23-0.15,0.44-0.27,0.65c-0.12,0.2-0.27,0.39-0.46,0.55c-0.18,0.17-0.38,0.31-0.61,0.42
+		c0.49,0.23,0.85,0.56,1.08,0.98c0.23,0.42,0.35,0.88,0.35,1.37v0.31c0,1.09-0.32,1.9-0.95,2.42
+		C61.37,77.71,60.48,77.97,59.35,77.97L59.35,77.97z"/>
+</g>
+<g id="M2">
+	<path id="path3486" style="&st2;" d="M75.52,22.94c0,0.4-0.06,0.76-0.2,1.07c-0.13,0.31-0.34,0.61-0.62,0.9
+		c-0.28,0.29-0.66,0.59-1.14,0.92l-1.44,0.97c-0.54,0.37-0.97,0.71-1.28,1.03c-0.31,0.32-0.52,0.65-0.65,0.99s-0.18,0.73-0.18,1.17
+		v0.31h5.05c0.2,0,0.3,0.09,0.3,0.26v0.66c0,0.09-0.03,0.16-0.09,0.2c-0.06,0.05-0.13,0.07-0.21,0.07h-5.96
+		c-0.08,0-0.15-0.03-0.21-0.08c-0.06-0.06-0.09-0.12-0.09-0.2V30c0-0.52,0.08-1.02,0.24-1.48c0.16-0.47,0.41-0.9,0.75-1.31
+		c0.34-0.41,0.78-0.79,1.31-1.15l1.52-1.02c0.63-0.42,1.04-0.77,1.24-1.03c0.2-0.27,0.3-0.62,0.3-1.06c0-0.36-0.07-0.66-0.21-0.88
+		c-0.14-0.23-0.35-0.4-0.63-0.5c-0.28-0.1-0.63-0.16-1.06-0.16c-0.34,0-0.68,0.03-1.02,0.09c-0.35,0.06-0.69,0.14-1.02,0.23
+		c-0.34,0.1-0.62,0.17-0.85,0.24c-0.1,0.03-0.17,0.03-0.22-0.01c-0.05-0.04-0.08-0.1-0.08-0.19v-0.51c0-0.09,0.02-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.18-0.11c0.26-0.11,0.54-0.22,0.84-0.31c0.3-0.1,0.65-0.18,1.04-0.25c0.4-0.07,0.78-0.11,1.14-0.11
+		c0.51,0,0.97,0.06,1.37,0.18c0.41,0.12,0.74,0.28,1,0.5c0.26,0.21,0.46,0.49,0.6,0.83C75.45,22.1,75.52,22.49,75.52,22.94
+		L75.52,22.94z"/>
+	<path id="path5306" style="&st0;" d="M54.17,26.92c0,9.82,7.97,17.79,17.79,17.79c9.83,0,17.79-7.97,17.79-17.79
+		c0-9.82-7.96-17.79-17.79-17.79C62.14,9.13,54.17,17.1,54.17,26.92z"/>
+	<path id="path5310" style="&st4;" d="M78.24,9.93l2.84,10.58"/>
+	<path id="path5314" style="&st4;" d="M78.24,9.93l10.97-1.96"/>
+</g>
+<g id="M1">
+	<path id="path3484" style="&st2;" d="M34.29,77.57c0,0.09-0.02,0.16-0.07,0.22c-0.05,0.06-0.11,0.08-0.2,0.08H33.2
+		c-0.08,0-0.15-0.03-0.2-0.09c-0.05-0.06-0.07-0.13-0.07-0.21v-9.43l-1.94,0.84c-0.08,0.03-0.14,0.04-0.2,0.04
+		c-0.09,0-0.13-0.06-0.13-0.17v-0.76c0-0.08,0.05-0.14,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.09,0.32-0.09H34
+		c0.08,0,0.15,0.02,0.2,0.08s0.08,0.12,0.08,0.21L34.29,77.57L34.29,77.57L34.29,77.57z"/>
+	<path id="path5294" style="&st0;" d="M50.27,72.47c0-9.82-7.96-17.79-17.79-17.79s-17.79,7.97-17.79,17.79
+		c0,9.83,7.96,17.79,17.79,17.79S50.27,82.3,50.27,72.47z"/>
+	<path id="path5298" style="&st4;" d="M23.02,87.54l-0.94-10.92"/>
+	<path id="path5302" style="&st4;" d="M23.02,87.54H11.87"/>
+</g>
+<g id="FrontArrow">
+	<path id="path5094" style="&st3;" d="M46.02,53.94V41.56"/>
+	<path id="path5098" style="&st1;" d="M55.32,44.3l-9.35-16.19L36.62,44.3H55.32z"/>
+</g>
+</svg>
diff --git a/images/motor_order/y4.svg b/images/motor_order/y4.svg
index b8a3542d9b..5260ae955f 100644
--- a/images/motor_order/y4.svg
+++ b/images/motor_order/y4.svg
@@ -1,86 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg3882" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="113.578px"
-	 height="139.248px" viewBox="0 0 113.578 139.248" xml:space="preserve">
-<g id="layer1" transform="translate(-318.21087,-449.76084)">
-	<g id="Y4" transform="matrix(1.25,0,0,-1.25,-223.4348,1407.1481)">
-		<g id="FrontArrow">
-			<path id="path5198" fill="none" stroke="#ED1C24" stroke-width="5" stroke-miterlimit="10" d="M479.44,717v9.901"/>
-			<path id="path5202" fill="#ED1C24" d="M486.878,724.713l-7.48,12.953l-7.479-12.953H486.878z"/>
-		</g>
-		<g id="M4">
-			<path id="path3443" fill="#231F20" d="M452.366,744.393c0-0.066-0.023-0.118-0.068-0.155s-0.098-0.055-0.161-0.055h-1.043v-2.139
-				c0-0.066-0.019-0.123-0.056-0.17s-0.087-0.07-0.149-0.07h-0.697c-0.137,0-0.205,0.08-0.205,0.24v2.139h-3.469
-				c-0.176,0-0.302,0.035-0.378,0.105s-0.114,0.189-0.114,0.357v0.457c0,0.168,0.049,0.316,0.146,0.445l3.551,4.98
-				c0.082,0.129,0.199,0.193,0.352,0.193h0.703c0.211,0,0.316-0.088,0.316-0.264v-5.367h1.043c0.066,0,0.121-0.02,0.164-0.059
-				c0.043-0.039,0.064-0.092,0.064-0.158V744.393z M449.999,745.09v4.107c0,0.047-0.016,0.07-0.047,0.07h-0.012
-				c-0.031,0-0.063-0.023-0.094-0.07l-2.771-3.938c-0.027-0.031-0.041-0.064-0.041-0.1c0-0.047,0.033-0.07,0.1-0.07H449.999z"/>
-			<path id="path5570" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M463.281,746.326
-				c0-7.86-6.372-14.232-14.232-14.232c-7.861,0-14.233,6.372-14.233,14.232c0,7.86,6.372,14.232,14.233,14.232
-				C456.91,760.558,463.281,754.186,463.281,746.326z"/>
-			<path id="path5574" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-				M443.943,760.027l-8.708,0.996"/>
-			<path id="path5578" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-				M443.943,760.027l-1.769-8.74"/>
-		</g>
-		<g id="M2">
-			<path id="path3986" fill="#231F20" d="M510.758,747.133c0-0.32-0.052-0.606-0.159-0.858c-0.105-0.252-0.27-0.492-0.495-0.721
-				c-0.224-0.229-0.529-0.474-0.912-0.736l-1.148-0.779c-0.433-0.293-0.773-0.568-1.022-0.826c-0.248-0.258-0.42-0.521-0.516-0.791
-				c-0.095-0.27-0.144-0.582-0.144-0.938v-0.252h4.043c0.16,0,0.24-0.068,0.24-0.205V740.5c0-0.07-0.023-0.124-0.07-0.161
-				s-0.103-0.056-0.17-0.056h-4.763c-0.063,0-0.119,0.023-0.167,0.068c-0.048,0.045-0.073,0.098-0.073,0.161v0.973
-				c0,0.418,0.064,0.814,0.191,1.187c0.127,0.373,0.327,0.723,0.598,1.049c0.271,0.326,0.622,0.632,1.052,0.917l1.213,0.82
-				c0.5,0.336,0.83,0.611,0.99,0.823s0.24,0.497,0.24,0.852c0,0.289-0.055,0.525-0.166,0.706c-0.112,0.182-0.279,0.315-0.501,0.401
-				c-0.223,0.086-0.505,0.129-0.844,0.129c-0.27,0-0.542-0.024-0.817-0.073c-0.276-0.049-0.549-0.111-0.82-0.188
-				c-0.272-0.076-0.498-0.14-0.677-0.191c-0.074-0.023-0.133-0.02-0.176,0.012s-0.064,0.082-0.064,0.152v0.41
-				c0,0.074,0.013,0.128,0.038,0.161c0.026,0.033,0.073,0.063,0.144,0.091c0.207,0.09,0.43,0.174,0.668,0.252
-				s0.516,0.146,0.835,0.202c0.319,0.057,0.622,0.085,0.911,0.085c0.406,0,0.772-0.047,1.095-0.141
-				c0.325-0.094,0.591-0.227,0.797-0.398c0.208-0.172,0.367-0.393,0.481-0.662C510.701,747.813,510.758,747.496,510.758,747.133
-				L510.758,747.133z"/>
-			<path id="path5582" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M494.214,744.371
-				c0-7.86,6.373-14.232,14.232-14.232c7.862,0,14.233,6.372,14.233,14.232c0,7.86-6.371,14.232-14.233,14.232
-				C500.587,758.604,494.214,752.232,494.214,744.371z"/>
-			<path id="path5586" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-				M505.99,758.653l6.209-6.186"/>
-			<path id="path5590" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-				M505.99,758.653l6.812,5.757"/>
-		</g>
-		<g id="M3">
-			<path id="path3988" fill="#231F20" d="M478.369,666.198c-0.383,0-0.775,0.048-1.178,0.143c-0.402,0.096-0.738,0.198-1.008,0.308
-				c-0.07,0.035-0.117,0.068-0.141,0.099s-0.035,0.083-0.035,0.153v0.409c0,0.161,0.08,0.217,0.24,0.17
-				c0.473-0.125,0.854-0.219,1.145-0.281s0.605-0.094,0.941-0.094c0.645,0,1.105,0.131,1.383,0.392
-				c0.277,0.263,0.416,0.684,0.416,1.266v0.252c0,0.23-0.044,0.459-0.132,0.683s-0.238,0.411-0.451,0.559
-				c-0.213,0.148-0.487,0.223-0.823,0.223h-2.18c-0.152,0-0.229,0.072-0.229,0.217v0.416c0,0.066,0.021,0.121,0.064,0.164
-				s0.098,0.064,0.164,0.064h2.18c0.359,0,0.644,0.07,0.852,0.211s0.354,0.32,0.434,0.537s0.12,0.445,0.12,0.682v0.17
-				c0,0.34-0.056,0.613-0.17,0.817c-0.113,0.205-0.302,0.358-0.566,0.458c-0.263,0.099-0.618,0.148-1.063,0.148
-				c-0.336,0-0.654-0.031-0.955-0.094s-0.678-0.154-1.131-0.275c-0.16-0.047-0.24,0.01-0.24,0.17v0.404
-				c0,0.074,0.012,0.128,0.038,0.162c0.025,0.033,0.072,0.063,0.138,0.091c0.266,0.112,0.598,0.217,0.996,0.313
-				s0.794,0.143,1.189,0.143c0.949,0,1.667-0.177,2.153-0.533c0.487-0.355,0.73-0.957,0.73-1.805v-0.17
-				c0-0.206-0.024-0.401-0.073-0.583c-0.048-0.181-0.122-0.353-0.219-0.516c-0.098-0.162-0.219-0.309-0.364-0.442
-				c-0.144-0.133-0.306-0.244-0.486-0.334c0.391-0.188,0.678-0.45,0.864-0.787s0.278-0.702,0.278-1.093v-0.252
-				c0-0.87-0.253-1.516-0.759-1.936S479.279,666.198,478.369,666.198L478.369,666.198z"/>
-			<path id="path5594" fill="none" stroke="#293D9B" stroke-width="3" stroke-miterlimit="10" d="M486.045,658.237
-				c6.634,4.219,8.591,13.016,4.372,19.647c-4.22,6.633-13.016,8.589-19.647,4.372c-6.633-4.219-8.589-13.016-4.37-19.649
-				C470.617,655.975,479.413,654.018,486.045,658.237z"/>
-			<path id="path5598" fill="none" stroke="#293D9B" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-				M467.676,660.508l1.887,8.559"/>
-			<path id="path5602" fill="none" stroke="#293D9B" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-				M467.676,660.508l-8.513,2.656"/>
-		</g>
-		<g id="M1">
-			<path id="path3441" fill="#231F20" d="M480.479,690.082c0-0.07-0.019-0.127-0.058-0.172c-0.039-0.045-0.092-0.068-0.159-0.068
-				h-0.656c-0.066,0-0.12,0.023-0.159,0.07s-0.058,0.104-0.058,0.169v7.547l-1.547-0.673c-0.063-0.023-0.115-0.035-0.158-0.035
-				c-0.07,0-0.105,0.044-0.105,0.135v0.609c0,0.063,0.039,0.115,0.117,0.158l1.811,0.861c0.097,0.052,0.181,0.077,0.252,0.077h0.492
-				c0.063,0,0.116-0.02,0.161-0.061c0.045-0.041,0.067-0.097,0.067-0.167V690.082z"/>
-			<path id="path5678" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M473.199,681.792
-				c-6.989,3.595-9.742,12.177-6.146,19.166c3.595,6.991,12.175,9.742,19.166,6.147c6.99-3.595,9.741-12.177,6.147-19.167
-				C488.77,680.948,480.188,678.197,473.199,681.792z"/>
-			<path id="path5682" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-				M494.229,692.721l4.868,7.288"/>
-			<path id="path5686" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-				M494.229,692.721l-6.964,5.57"/>
-		</g>
-	</g>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:#231F20;">
+	<!ENTITY st3 "fill:none;stroke:#293D9B;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st5 "fill:none;stroke:#293D9B;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st6 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="Y4-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="112.83px"
+	 height="138.5px" viewBox="0.37 0.37 112.83 138.5" xml:space="preserve">
+<g id="M4">
+	<path id="path3443" style="&st2;" d="M23.81,26.9c0,0.08-0.03,0.15-0.09,0.19c-0.06,0.05-0.12,0.07-0.2,0.07h-1.3v2.67
+		c0,0.08-0.02,0.15-0.07,0.21c-0.05,0.06-0.11,0.09-0.19,0.09h-0.87c-0.17,0-0.26-0.1-0.26-0.3v-2.67H16.5
+		c-0.22,0-0.38-0.04-0.47-0.13c-0.09-0.09-0.14-0.24-0.14-0.45v-0.57c0-0.21,0.06-0.4,0.18-0.56l4.44-6.23
+		c0.1-0.16,0.25-0.24,0.44-0.24h0.88c0.26,0,0.4,0.11,0.4,0.33v6.71h1.3c0.08,0,0.15,0.03,0.21,0.07c0.05,0.05,0.08,0.12,0.08,0.2
+		L23.81,26.9L23.81,26.9z M20.85,26.02v-5.13c0-0.06-0.02-0.09-0.06-0.09h-0.02c-0.04,0-0.08,0.03-0.12,0.09l-3.46,4.92
+		c-0.03,0.04-0.05,0.08-0.05,0.13c0,0.06,0.04,0.09,0.13,0.09L20.85,26.02L20.85,26.02z"/>
+	<path id="path5570" style="&st0;" d="M37.46,24.48c0,9.83-7.96,17.79-17.79,17.79c-9.83,0-17.79-7.96-17.79-17.79
+		c0-9.82,7.96-17.79,17.79-17.79S37.46,14.65,37.46,24.48z"/>
+	<path id="path5574" style="&st6;" d="M13.28,7.35L2.4,6.11"/>
+	<path id="path5578" style="&st6;" d="M13.28,7.35l-2.21,10.92"/>
+</g>
+<g id="M2">
+	<path id="path3986" style="&st2;" d="M96.8,23.47c0,0.4-0.07,0.76-0.2,1.07c-0.13,0.31-0.34,0.61-0.62,0.9
+		c-0.28,0.29-0.66,0.59-1.14,0.92l-1.43,0.97c-0.54,0.37-0.97,0.71-1.28,1.03c-0.31,0.32-0.52,0.65-0.65,0.99
+		c-0.12,0.34-0.18,0.73-0.18,1.17v0.31h5.05c0.2,0,0.3,0.08,0.3,0.26v0.66c0,0.09-0.03,0.15-0.09,0.2
+		c-0.06,0.05-0.13,0.07-0.21,0.07h-5.95c-0.08,0-0.15-0.03-0.21-0.09c-0.06-0.06-0.09-0.12-0.09-0.2v-1.22
+		c0-0.52,0.08-1.02,0.24-1.48c0.16-0.47,0.41-0.9,0.75-1.31c0.34-0.41,0.78-0.79,1.32-1.15l1.52-1.03c0.63-0.42,1.04-0.76,1.24-1.03
+		c0.2-0.27,0.3-0.62,0.3-1.07c0-0.36-0.07-0.66-0.21-0.88c-0.14-0.23-0.35-0.39-0.63-0.5c-0.28-0.11-0.63-0.16-1.05-0.16
+		c-0.34,0-0.68,0.03-1.02,0.09c-0.34,0.06-0.69,0.14-1.02,0.23c-0.34,0.1-0.62,0.18-0.85,0.24c-0.09,0.03-0.17,0.03-0.22-0.02
+		c-0.05-0.04-0.08-0.1-0.08-0.19v-0.51c0-0.09,0.02-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.18-0.11c0.26-0.11,0.54-0.22,0.84-0.31
+		c0.3-0.1,0.64-0.18,1.04-0.25c0.4-0.07,0.78-0.11,1.14-0.11c0.51,0,0.97,0.06,1.37,0.18c0.41,0.12,0.74,0.28,1,0.5
+		c0.26,0.21,0.46,0.49,0.6,0.83C96.73,22.62,96.8,23.02,96.8,23.47L96.8,23.47z"/>
+	<path id="path5582" style="&st0;" d="M76.12,26.92c0,9.83,7.97,17.79,17.79,17.79c9.83,0,17.79-7.96,17.79-17.79
+		c0-9.82-7.96-17.79-17.79-17.79C84.09,9.13,76.12,17.1,76.12,26.92z"/>
+	<path id="path5586" style="&st6;" d="M90.84,9.07l7.76,7.73"/>
+	<path id="path5590" style="&st6;" d="M90.84,9.07l8.52-7.2"/>
+</g>
+<g id="M3">
+	<path id="path3988" style="&st2;" d="M56.32,124.64c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.04-0.15-0.08-0.18-0.12s-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		s0.76,0.12,1.18,0.12c0.81,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.86,0.52-1.58v-0.32c0-0.29-0.05-0.57-0.17-0.85
+		c-0.11-0.28-0.3-0.51-0.56-0.7c-0.27-0.18-0.61-0.28-1.03-0.28h-2.73c-0.19,0-0.29-0.09-0.29-0.27v-0.52
+		c0-0.08,0.03-0.15,0.08-0.21s0.12-0.08,0.21-0.08h2.73c0.45,0,0.8-0.09,1.07-0.26c0.26-0.18,0.44-0.4,0.54-0.67
+		c0.1-0.27,0.15-0.56,0.15-0.85v-0.21c0-0.42-0.07-0.77-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.12-0.77-0.18-1.33-0.18
+		c-0.42,0-0.82,0.04-1.19,0.12c-0.38,0.08-0.85,0.19-1.41,0.34c-0.2,0.06-0.3-0.01-0.3-0.21v-0.5c0-0.09,0.02-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.17-0.11c0.33-0.14,0.75-0.27,1.25-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67
+		c0.61,0.44,0.91,1.2,0.91,2.26v0.21c0,0.26-0.03,0.5-0.09,0.73c-0.06,0.23-0.15,0.44-0.27,0.64c-0.12,0.2-0.27,0.39-0.46,0.55
+		c-0.18,0.17-0.38,0.31-0.61,0.42c0.49,0.23,0.85,0.56,1.08,0.98s0.35,0.88,0.35,1.37v0.32c0,1.09-0.32,1.9-0.95,2.42
+		C58.34,124.38,57.45,124.64,56.32,124.64L56.32,124.64z"/>
+	<path id="path5594" style="&st5;" d="M65.91,134.59c8.29-5.27,10.74-16.27,5.46-24.56c-5.27-8.29-16.27-10.74-24.56-5.46
+		c-8.29,5.27-10.74,16.27-5.46,24.56C46.63,137.42,57.62,139.86,65.91,134.59z"/>
+	<path id="path5598" style="&st3;" d="M42.95,131.75l2.36-10.7"/>
+	<path id="path5602" style="&st3;" d="M42.95,131.75l-10.64-3.32"/>
+</g>
+<g id="M1">
+	<path id="path3441" style="&st2;" d="M58.95,94.78c0,0.09-0.02,0.16-0.07,0.22c-0.05,0.06-0.12,0.08-0.2,0.08h-0.82
+		c-0.08,0-0.15-0.03-0.2-0.09s-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04c-0.09,0-0.13-0.05-0.13-0.17
+		v-0.76c0-0.08,0.05-0.14,0.15-0.2l2.26-1.08c0.12-0.07,0.23-0.1,0.31-0.1h0.62c0.08,0,0.14,0.03,0.2,0.08
+		c0.06,0.05,0.08,0.12,0.08,0.21V94.78z"/>
+	<path id="path5678" style="&st0;" d="M49.85,105.15c-8.74-4.49-12.18-15.22-7.68-23.96c4.49-8.74,15.22-12.18,23.96-7.68
+		C74.87,78,78.3,88.73,73.81,97.46C69.32,106.2,58.59,109.64,49.85,105.15z"/>
+	<path id="path5682" style="&st6;" d="M76.14,91.49l6.08-9.11"/>
+	<path id="path5686" style="&st6;" d="M76.14,91.49l-8.71-6.96"/>
+</g>
+<g id="FrontArrow">
+	<path id="path5198" style="&st4;" d="M57.65,61.14V48.76"/>
+	<path id="path5202" style="&st1;" d="M66.95,51.5L57.6,35.3L48.25,51.5H66.95z"/>
 </g>
 </svg>
diff --git a/images/motor_order/y6.svg b/images/motor_order/y6.svg
index 80c5affd37..1d68fbd451 100644
--- a/images/motor_order/y6.svg
+++ b/images/motor_order/y6.svg
@@ -1,130 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014.  All rights reserved.  Used with permission for Baseflight Configurator -->
-<svg version="1.2" baseProfile="tiny"
-	 id="svg4602" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="158.436px"
-	 height="157.094px" viewBox="0 0 158.436 157.094" xml:space="preserve">
-<g id="layer1" transform="translate(-295.7821,-441.82894)">
-	<g id="Y6" transform="matrix(1.25,0,0,-1.25,-183.46958,1221.9047)">
-		<g id="MotorOrderGraphic">
-			<g id="FrontArrow">
-				<path id="path5134" fill="none" stroke="#ED1C24" stroke-width="5" stroke-miterlimit="10" d="M448.082,561.936v9.901"/>
-				<path id="path5138" fill="#ED1C24" d="M455.519,569.649l-7.478,12.953l-7.479-12.953H455.519z"/>
-			</g>
-			<g id="M4">
-				<path id="path4060" fill="#231F20" d="M448.612,513.135c0-0.066-0.023-0.118-0.067-0.156c-0.045-0.037-0.098-0.055-0.161-0.055
-					h-1.043v-2.139c0-0.066-0.019-0.123-0.056-0.17c-0.037-0.047-0.087-0.07-0.149-0.07h-0.697c-0.137,0-0.205,0.08-0.205,0.24
-					v2.139h-3.469c-0.176,0-0.302,0.035-0.378,0.105c-0.076,0.07-0.114,0.189-0.114,0.357v0.457c0,0.168,0.049,0.316,0.147,0.445
-					l3.551,4.98c0.082,0.129,0.199,0.194,0.352,0.194h0.703c0.211,0,0.316-0.088,0.316-0.264v-5.367h1.043
-					c0.066,0,0.121-0.02,0.164-0.059s0.064-0.091,0.064-0.158V513.135z M446.245,513.832v4.108c0,0.047-0.016,0.07-0.047,0.07
-					h-0.012c-0.031,0-0.063-0.023-0.094-0.07l-2.771-3.938c-0.027-0.031-0.041-0.065-0.041-0.1c0-0.047,0.034-0.07,0.1-0.07H446.245
-					z"/>
-				<path id="path5606" fill="none" stroke="#293D9B" stroke-width="3" stroke-miterlimit="10" d="M457.003,522.885
-					c4.842-6.191,3.746-15.137-2.446-19.979c-6.191-4.841-15.137-3.746-19.979,2.447c-4.841,6.191-3.746,15.136,2.446,19.978
-					C443.217,530.171,452.161,529.076,457.003,522.885z"/>
-				<path id="path5610" fill="none" stroke="#293D9B" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M433.328,521.766l-7.473-4.579"/>
-				<path id="path5614" fill="none" stroke="#293D9B" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M433.328,521.766l3.991-7.975"/>
-			</g>
-			<g id="M6">
-				<path id="path4064" fill="#231F20" d="M405.973,601.614v0.07c0,0.406-0.085,0.734-0.255,0.982
-					c-0.17,0.248-0.394,0.423-0.671,0.524s-0.588,0.152-0.931,0.152c-0.27,0-0.582-0.023-0.938-0.067
-					c-0.355-0.045-0.647-0.095-0.873-0.15v-1.142c0-0.641,0.07-1.145,0.208-1.512c0.139-0.367,0.341-0.627,0.607-0.78
-					s0.602-0.228,1.008-0.228c0.285,0,0.541,0.039,0.77,0.117c0.228,0.078,0.422,0.198,0.58,0.36
-					c0.159,0.163,0.28,0.385,0.366,0.668C405.93,600.893,405.973,601.228,405.973,601.614z M404.355,607.661
-					c0.738,0,1.459-0.148,2.162-0.445c0.07-0.027,0.117-0.055,0.141-0.085c0.023-0.029,0.034-0.084,0.035-0.166v-0.434
-					c0-0.156-0.08-0.211-0.241-0.164c-0.504,0.133-0.887,0.229-1.148,0.29c-0.262,0.06-0.578,0.091-0.949,0.091
-					c-0.582,0-1.023-0.107-1.324-0.322s-0.497-0.51-0.589-0.885c-0.091-0.375-0.137-0.859-0.137-1.453v-0.134
-					c0.707,0.16,1.311,0.24,1.811,0.24c0.555,0,1.052-0.078,1.491-0.234c0.44-0.156,0.791-0.42,1.055-0.791
-					c0.264-0.371,0.396-0.866,0.396-1.483v-0.07c0-0.641-0.109-1.188-0.326-1.641c-0.216-0.453-0.543-0.798-0.978-1.037
-					c-0.436-0.238-0.977-0.358-1.626-0.358c-0.453,0-0.859,0.07-1.216,0.208c-0.357,0.139-0.661,0.346-0.911,0.621
-					c-0.25,0.276-0.442,0.63-0.577,1.064c-0.134,0.434-0.202,0.938-0.202,1.512v2.103c0,0.848,0.117,1.534,0.352,2.057
-					s0.584,0.907,1.048,1.151C403.086,607.539,403.664,607.661,404.355,607.661L404.355,607.661z"/>
-				<path id="path5618" fill="none" stroke="#293D9B" stroke-width="3" stroke-miterlimit="10" d="M411.784,591.574
-					c6.633,4.219,8.59,13.016,4.371,19.647c-4.219,6.633-13.016,8.589-19.647,4.372c-6.634-4.219-8.589-13.016-4.37-19.648
-					C396.355,589.312,405.152,587.355,411.784,591.574z"/>
-				<path id="path5622" fill="none" stroke="#293D9B" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M393.414,593.845l1.887,8.559"/>
-				<path id="path5626" fill="none" stroke="#293D9B" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M393.414,593.845l-8.513,2.656"/>
-			</g>
-			<g id="M5">
-				<path id="path4062" fill="#231F20" d="M494.416,598.435c-0.387,0-0.78,0.048-1.18,0.144c-0.4,0.095-0.735,0.198-1.005,0.307
-					c-0.074,0.04-0.123,0.073-0.147,0.103c-0.023,0.029-0.035,0.079-0.035,0.149v0.41c0,0.164,0.08,0.22,0.241,0.17
-					c0.832-0.25,1.533-0.375,2.103-0.375c0.672,0,1.166,0.159,1.48,0.475c0.315,0.316,0.472,0.787,0.472,1.412v0.182
-					c0,0.59-0.192,1.005-0.577,1.245c-0.384,0.24-1.028,0.36-1.93,0.36h-1.436c-0.055,0-0.1,0.023-0.137,0.067
-					c-0.037,0.045-0.055,0.091-0.055,0.137v0.012l0.334,3.996c0.009,0.063,0.035,0.113,0.082,0.15
-					c0.047,0.037,0.1,0.055,0.159,0.055h4.13c0.066,0,0.123-0.019,0.17-0.055c0.047-0.037,0.07-0.088,0.07-0.15v-0.527
-					c0-0.129-0.08-0.193-0.241-0.193h-3.445l-0.193-2.59h0.563c0.781,0,1.437-0.078,1.966-0.234c0.53-0.156,0.937-0.42,1.222-0.791
-					s0.427-0.865,0.427-1.482v-0.182c0-0.891-0.264-1.579-0.794-2.065C496.129,598.678,495.381,598.435,494.416,598.435
-					L494.416,598.435z"/>
-				<path id="path5630" fill="none" stroke="#293D9B" stroke-width="3" stroke-miterlimit="10" d="M480.213,603.735
-					c-0.496-7.845,5.462-14.605,13.307-15.102c7.845-0.495,14.605,5.462,15.101,13.307c0.495,7.846-5.463,14.607-13.308,15.102
-					C487.47,617.537,480.709,611.58,480.213,603.735z"/>
-				<path id="path5634" fill="none" stroke="#293D9B" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M492.865,617.245l5.807-6.564"/>
-				<path id="path5638" fill="none" stroke="#293D9B" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M492.865,617.245l7.159,5.316"/>
-			</g>
-			<g id="M3">
-				<path id="path4066" fill="#231F20" d="M418.683,585.763c-0.383,0-0.776,0.048-1.178,0.144c-0.402,0.095-0.738,0.198-1.008,0.307
-					c-0.07,0.035-0.117,0.069-0.141,0.1s-0.035,0.082-0.035,0.152v0.41c0,0.16,0.08,0.216,0.241,0.17
-					c0.473-0.125,0.855-0.219,1.145-0.281c0.291-0.063,0.605-0.094,0.941-0.094c0.645,0,1.105,0.131,1.383,0.393
-					s0.416,0.684,0.416,1.266v0.252c0,0.23-0.044,0.459-0.131,0.683c-0.088,0.225-0.238,0.411-0.452,0.559
-					c-0.213,0.148-0.488,0.223-0.823,0.223h-2.18c-0.152,0-0.228,0.073-0.228,0.217v0.416c0,0.066,0.021,0.121,0.064,0.164
-					s0.098,0.065,0.164,0.065h2.18c0.359,0,0.644,0.07,0.853,0.211c0.209,0.141,0.353,0.32,0.434,0.536
-					c0.08,0.217,0.12,0.444,0.12,0.683v0.17c0,0.34-0.056,0.613-0.17,0.818c-0.113,0.205-0.302,0.357-0.566,0.457
-					c-0.263,0.099-0.618,0.149-1.063,0.149c-0.336,0-0.655-0.031-0.955-0.094s-0.677-0.154-1.13-0.275
-					c-0.16-0.047-0.241,0.009-0.241,0.169v0.405c0,0.074,0.013,0.127,0.038,0.161c0.026,0.033,0.071,0.063,0.137,0.091
-					c0.266,0.113,0.598,0.218,0.996,0.313c0.398,0.096,0.795,0.144,1.19,0.144c0.949,0,1.667-0.177,2.153-0.533
-					c0.487-0.355,0.73-0.957,0.73-1.805v-0.17c0-0.207-0.024-0.401-0.073-0.583c-0.048-0.182-0.122-0.354-0.22-0.516
-					c-0.098-0.162-0.219-0.309-0.363-0.442s-0.307-0.245-0.487-0.334c0.391-0.188,0.679-0.45,0.865-0.788
-					c0.185-0.338,0.278-0.702,0.278-1.092v-0.252c0-0.871-0.253-1.516-0.759-1.937C420.301,585.974,419.593,585.763,418.683,585.763
-					L418.683,585.763z"/>
-				<path id="path5642" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M419.12,576.199
-					c-7.86,0-14.232,6.373-14.232,14.232c0,7.863,6.372,14.233,14.232,14.234c7.86-0.001,14.232-6.372,14.232-14.234
-					C433.352,582.573,426.98,576.201,419.12,576.199z"/>
-				<path id="path5646" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M432.823,595.538l0.995,8.708"/>
-				<path id="path5650" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M432.823,595.538l-8.74,1.769"/>
-			</g>
-			<g id="M2">
-				<path id="path4070" fill="#231F20" d="M480.088,591.123c0-0.32-0.052-0.606-0.158-0.859c-0.105-0.252-0.271-0.492-0.495-0.72
-					c-0.225-0.229-0.528-0.473-0.911-0.735l-1.148-0.78c-0.434-0.293-0.775-0.568-1.023-0.826c-0.248-0.258-0.42-0.522-0.516-0.791
-					c-0.096-0.27-0.144-0.582-0.144-0.938v-0.252h4.043c0.16,0,0.241-0.069,0.241-0.206v-0.527c0-0.07-0.023-0.124-0.07-0.161
-					c-0.047-0.037-0.104-0.055-0.17-0.055h-4.763c-0.063,0-0.119,0.022-0.167,0.067c-0.049,0.045-0.073,0.098-0.073,0.161v0.973
-					c0,0.418,0.063,0.813,0.191,1.187c0.127,0.373,0.326,0.723,0.598,1.048c0.271,0.327,0.622,0.632,1.052,0.917l1.213,0.82
-					c0.5,0.336,0.83,0.61,0.99,0.823c0.16,0.213,0.241,0.497,0.241,0.852c0,0.289-0.056,0.524-0.167,0.706
-					c-0.112,0.181-0.278,0.316-0.501,0.402c-0.223,0.085-0.504,0.129-0.844,0.129c-0.27,0-0.542-0.025-0.818-0.073
-					c-0.275-0.049-0.548-0.112-0.82-0.188c-0.271-0.077-0.497-0.14-0.677-0.191c-0.074-0.023-0.133-0.02-0.176,0.012
-					s-0.064,0.082-0.064,0.152v0.41c0,0.074,0.013,0.128,0.038,0.161c0.026,0.034,0.073,0.064,0.144,0.091
-					c0.207,0.09,0.43,0.173,0.668,0.252s0.516,0.145,0.835,0.202c0.318,0.056,0.622,0.085,0.911,0.085
-					c0.406,0,0.772-0.047,1.096-0.141s0.59-0.227,0.797-0.398s0.367-0.393,0.48-0.663S480.088,591.486,480.088,591.123
-					L480.088,591.123z"/>
-				<path id="path5654" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M462.787,587.882
-					c0,7.859,6.372,14.232,14.232,14.232c7.861,0,14.233-6.373,14.233-14.232c0-7.861-6.372-14.232-14.233-14.232
-					C469.159,573.65,462.787,580.021,462.787,587.882z"/>
-				<path id="path5658" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M478.891,573.928l7.877-3.846"/>
-				<path id="path5662" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M478.891,573.928l4.585,7.649"/>
-			</g>
-			<g id="M1">
-				<path id="path4068" fill="#231F20" d="M447.674,533.526c0-0.07-0.02-0.128-0.059-0.173c-0.039-0.045-0.092-0.067-0.159-0.067
-					h-0.656c-0.066,0-0.119,0.023-0.158,0.07s-0.059,0.104-0.059,0.17v7.547l-1.547-0.674c-0.063-0.023-0.116-0.035-0.159-0.035
-					c-0.07,0-0.105,0.044-0.105,0.134v0.609c0,0.063,0.039,0.116,0.117,0.159l1.811,0.861c0.098,0.051,0.181,0.077,0.252,0.077
-					h0.492c0.063,0,0.116-0.02,0.161-0.062c0.045-0.041,0.068-0.097,0.068-0.167V533.526z"/>
-				<path id="path5666" fill="none" stroke="#8D198F" stroke-width="3" stroke-miterlimit="10" d="M432.148,538.154
-					c0-7.859,6.372-14.232,14.232-14.232c7.861,0,14.233,6.373,14.233,14.232c0,7.861-6.372,14.233-14.233,14.233
-					C438.52,552.387,432.148,546.015,432.148,538.154z"/>
-				<path id="path5670" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M443.922,552.436l6.211-6.188"/>
-				<path id="path5674" fill="none" stroke="#8D198F" stroke-width="3" stroke-linecap="round" stroke-miterlimit="10" d="
-					M443.922,552.436l6.813,5.755"/>
-			</g>
-		</g>
-	</g>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#8D198F;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st1 "fill:#ED1C24;">
+	<!ENTITY st2 "fill:#231F20;">
+	<!ENTITY st3 "fill:none;stroke:#293D9B;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+	<!ENTITY st4 "fill:none;stroke:#ED1C24;stroke-width:5;stroke-miterlimit:10;">
+	<!ENTITY st5 "fill:none;stroke:#293D9B;stroke-width:3;stroke-miterlimit:10;">
+	<!ENTITY st6 "fill:none;stroke:#8D198F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;">
+]>
+<svg version="1.1" baseProfile="basic"
+	 id="Y6-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="157.69px"
+	 height="156.34px" viewBox="0.37 0.37 157.69 156.34" xml:space="preserve">
+<g id="M4">
+	<path id="path4060" style="&st2;" d="M81.51,138.66c0,0.08-0.03,0.15-0.08,0.2c-0.06,0.05-0.12,0.07-0.2,0.07h-1.3v2.67
+		c0,0.08-0.02,0.15-0.07,0.21c-0.05,0.06-0.11,0.09-0.19,0.09H78.8c-0.17,0-0.26-0.1-0.26-0.3v-2.67H74.2
+		c-0.22,0-0.38-0.04-0.47-0.13c-0.09-0.09-0.14-0.24-0.14-0.45v-0.57c0-0.21,0.06-0.39,0.18-0.56l4.44-6.23
+		c0.1-0.16,0.25-0.24,0.44-0.24h0.88c0.26,0,0.4,0.11,0.4,0.33v6.71h1.3c0.08,0,0.15,0.03,0.21,0.07s0.08,0.11,0.08,0.2
+		L81.51,138.66L81.51,138.66z M78.55,137.79v-5.13c0-0.06-0.02-0.09-0.06-0.09h-0.01c-0.04,0-0.08,0.03-0.12,0.09l-3.46,4.92
+		c-0.03,0.04-0.05,0.08-0.05,0.13c0,0.06,0.04,0.09,0.13,0.09H78.55z"/>
+	<path id="path5606" style="&st5;" d="M92,126.47c6.05,7.74,4.68,18.92-3.06,24.97c-7.74,6.05-18.92,4.68-24.97-3.06
+		c-6.05-7.74-4.68-18.92,3.06-24.97C74.77,117.36,85.95,118.73,92,126.47z"/>
+	<path id="path5610" style="&st3;" d="M62.41,127.87l-9.34,5.72"/>
+	<path id="path5614" style="&st3;" d="M62.41,127.87l4.99,9.97"/>
+</g>
+<g id="M6">
+	<path id="path4064" style="&st2;" d="M28.21,28.06v-0.09c0-0.51-0.11-0.92-0.32-1.23s-0.49-0.53-0.84-0.65
+		c-0.35-0.13-0.73-0.19-1.16-0.19c-0.34,0-0.73,0.03-1.17,0.08c-0.44,0.06-0.81,0.12-1.09,0.19v1.43c0,0.8,0.09,1.43,0.26,1.89
+		c0.17,0.46,0.43,0.78,0.76,0.97c0.33,0.19,0.75,0.29,1.26,0.29c0.36,0,0.68-0.05,0.96-0.15c0.29-0.1,0.53-0.25,0.73-0.45
+		c0.2-0.2,0.35-0.48,0.46-0.83C28.16,28.96,28.21,28.54,28.21,28.06z M26.19,20.5c0.92,0,1.82,0.19,2.7,0.56
+		c0.09,0.03,0.15,0.07,0.18,0.11c0.03,0.04,0.04,0.1,0.04,0.21v0.54c0,0.19-0.1,0.26-0.3,0.21c-0.63-0.17-1.11-0.29-1.44-0.36
+		c-0.33-0.07-0.72-0.11-1.19-0.11c-0.73,0-1.28,0.13-1.65,0.4c-0.38,0.27-0.62,0.64-0.74,1.11c-0.11,0.47-0.17,1.07-0.17,1.82v0.17
+		c0.88-0.2,1.64-0.3,2.26-0.3c0.69,0,1.31,0.1,1.86,0.29c0.55,0.19,0.99,0.52,1.32,0.99c0.33,0.46,0.5,1.08,0.5,1.85v0.09
+		c0,0.8-0.14,1.49-0.41,2.05c-0.27,0.57-0.68,1-1.22,1.3c-0.54,0.3-1.22,0.45-2.03,0.45c-0.57,0-1.07-0.09-1.52-0.26
+		c-0.45-0.17-0.83-0.43-1.14-0.78c-0.31-0.34-0.55-0.79-0.72-1.33c-0.17-0.54-0.25-1.17-0.25-1.89v-2.63c0-1.06,0.15-1.92,0.44-2.57
+		s0.73-1.13,1.31-1.44C24.61,20.65,25.33,20.5,26.19,20.5L26.19,20.5z"/>
+	<path id="path5618" style="&st5;" d="M35.48,40.61c8.29-5.27,10.74-16.27,5.46-24.56c-5.27-8.29-16.27-10.74-24.56-5.46
+		c-8.29,5.27-10.74,16.27-5.46,24.56C16.19,43.44,27.19,45.88,35.48,40.61z"/>
+	<path id="path5622" style="&st3;" d="M12.52,37.77l2.36-10.7"/>
+	<path id="path5626" style="&st3;" d="M12.52,37.77L1.87,34.45"/>
+</g>
+<g id="M5">
+	<path id="path4062" style="&st2;" d="M138.77,32.03c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.05-0.15-0.09-0.18-0.13c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.21,0.1-0.27,0.3-0.21c1.04,0.31,1.92,0.47,2.63,0.47
+		c0.84,0,1.46-0.2,1.85-0.59c0.39-0.4,0.59-0.98,0.59-1.77v-0.23c0-0.74-0.24-1.26-0.72-1.56c-0.48-0.3-1.29-0.45-2.41-0.45h-1.79
+		c-0.07,0-0.13-0.03-0.17-0.08c-0.05-0.06-0.07-0.11-0.07-0.17v-0.01l0.42-5c0.01-0.08,0.04-0.14,0.1-0.19s0.13-0.07,0.2-0.07h5.16
+		c0.08,0,0.15,0.02,0.21,0.07c0.06,0.05,0.09,0.11,0.09,0.19v0.66c0,0.16-0.1,0.24-0.3,0.24h-4.31l-0.24,3.24h0.7
+		c0.98,0,1.8,0.1,2.46,0.29c0.66,0.19,1.17,0.52,1.53,0.99c0.36,0.46,0.53,1.08,0.53,1.85v0.23c0,1.11-0.33,1.97-0.99,2.58
+		C140.91,31.73,139.97,32.03,138.77,32.03L138.77,32.03z"/>
+	<path id="path5630" style="&st5;" d="M121.01,25.41c-0.62,9.81,6.83,18.26,16.63,18.88c9.81,0.62,18.26-6.83,18.88-16.63
+		c0.62-9.81-6.83-18.26-16.63-18.88C130.09,8.15,121.64,15.6,121.01,25.41z"/>
+	<path id="path5634" style="&st3;" d="M136.83,8.52l7.26,8.21"/>
+	<path id="path5638" style="&st3;" d="M136.83,8.52l8.95-6.65"/>
+</g>
+<g id="M3">
+	<path id="path4066" style="&st2;" d="M44.1,47.87c-0.48,0-0.97-0.06-1.47-0.18c-0.5-0.12-0.92-0.25-1.26-0.38
+		c-0.09-0.04-0.15-0.09-0.18-0.13c-0.03-0.04-0.04-0.1-0.04-0.19v-0.51c0-0.2,0.1-0.27,0.3-0.21c0.59,0.16,1.07,0.27,1.43,0.35
+		c0.36,0.08,0.76,0.12,1.18,0.12c0.81,0,1.38-0.16,1.73-0.49c0.35-0.33,0.52-0.85,0.52-1.58v-0.31c0-0.29-0.05-0.57-0.16-0.85
+		c-0.11-0.28-0.3-0.51-0.56-0.7c-0.27-0.19-0.61-0.28-1.03-0.28h-2.72c-0.19,0-0.29-0.09-0.29-0.27v-0.52
+		c0-0.08,0.03-0.15,0.08-0.21c0.05-0.05,0.12-0.08,0.21-0.08h2.72c0.45,0,0.81-0.09,1.07-0.26c0.26-0.18,0.44-0.4,0.54-0.67
+		c0.1-0.27,0.15-0.56,0.15-0.85v-0.21c0-0.42-0.07-0.77-0.21-1.02c-0.14-0.26-0.38-0.45-0.71-0.57c-0.33-0.12-0.77-0.19-1.33-0.19
+		c-0.42,0-0.82,0.04-1.19,0.12c-0.38,0.08-0.85,0.19-1.41,0.34c-0.2,0.06-0.3-0.01-0.3-0.21V37.4c0-0.09,0.02-0.16,0.05-0.2
+		c0.03-0.04,0.09-0.08,0.17-0.11c0.33-0.14,0.75-0.27,1.25-0.39c0.5-0.12,0.99-0.18,1.49-0.18c1.19,0,2.08,0.22,2.69,0.67
+		c0.61,0.44,0.91,1.2,0.91,2.26v0.21c0,0.26-0.03,0.5-0.09,0.73c-0.06,0.23-0.15,0.44-0.27,0.65c-0.12,0.2-0.27,0.39-0.45,0.55
+		c-0.18,0.17-0.38,0.31-0.61,0.42c0.49,0.23,0.85,0.56,1.08,0.98c0.23,0.42,0.35,0.88,0.35,1.36v0.32c0,1.09-0.32,1.89-0.95,2.42
+		C46.12,47.61,45.24,47.87,44.1,47.87L44.1,47.87z"/>
+	<path id="path5642" style="&st0;" d="M44.65,59.83c-9.83,0-17.79-7.97-17.79-17.79c0-9.83,7.96-17.79,17.79-17.79
+		c9.82,0,17.79,7.96,17.79,17.79C62.44,51.86,54.47,59.82,44.65,59.83z"/>
+	<path id="path5646" style="&st6;" d="M61.78,35.65l1.24-10.89"/>
+	<path id="path5650" style="&st6;" d="M61.78,35.65l-10.92-2.21"/>
+</g>
+<g id="M2">
+	<path id="path4070" style="&st2;" d="M120.86,41.17c0,0.4-0.07,0.76-0.2,1.07c-0.13,0.31-0.34,0.62-0.62,0.9
+		c-0.28,0.29-0.66,0.59-1.14,0.92l-1.44,0.98c-0.54,0.37-0.97,0.71-1.28,1.03c-0.31,0.32-0.53,0.65-0.65,0.99
+		c-0.12,0.34-0.18,0.73-0.18,1.17v0.31h5.05c0.2,0,0.3,0.09,0.3,0.26v0.66c0,0.09-0.03,0.16-0.09,0.2
+		c-0.06,0.05-0.13,0.07-0.21,0.07h-5.95c-0.08,0-0.15-0.03-0.21-0.08c-0.06-0.06-0.09-0.12-0.09-0.2v-1.22
+		c0-0.52,0.08-1.02,0.24-1.48c0.16-0.47,0.41-0.9,0.75-1.31c0.34-0.41,0.78-0.79,1.32-1.15l1.52-1.02c0.63-0.42,1.04-0.76,1.24-1.03
+		c0.2-0.27,0.3-0.62,0.3-1.06c0-0.36-0.07-0.65-0.21-0.88c-0.14-0.23-0.35-0.4-0.63-0.5c-0.28-0.11-0.63-0.16-1.05-0.16
+		c-0.34,0-0.68,0.03-1.02,0.09c-0.34,0.06-0.68,0.14-1.03,0.23c-0.34,0.1-0.62,0.18-0.85,0.24c-0.09,0.03-0.17,0.02-0.22-0.02
+		c-0.05-0.04-0.08-0.1-0.08-0.19v-0.51c0-0.09,0.02-0.16,0.05-0.2c0.03-0.04,0.09-0.08,0.18-0.11c0.26-0.11,0.54-0.22,0.83-0.31
+		c0.3-0.1,0.64-0.18,1.04-0.25c0.4-0.07,0.78-0.11,1.14-0.11c0.51,0,0.97,0.06,1.37,0.18c0.41,0.12,0.74,0.28,1,0.5
+		c0.26,0.21,0.46,0.49,0.6,0.83S120.86,40.72,120.86,41.17L120.86,41.17z"/>
+	<path id="path5654" style="&st0;" d="M99.23,45.22c0-9.82,7.97-17.79,17.79-17.79c9.83,0,17.79,7.97,17.79,17.79
+		c0,9.83-7.97,17.79-17.79,17.79C107.2,63.01,99.23,55.05,99.23,45.22z"/>
+	<path id="path5658" style="&st6;" d="M119.36,62.67l9.85,4.81"/>
+	<path id="path5662" style="&st6;" d="M119.36,62.67l5.73-9.56"/>
+</g>
+<g id="M1">
+	<path id="path4068" style="&st2;" d="M80.34,113.17c0,0.09-0.03,0.16-0.07,0.22c-0.05,0.06-0.12,0.08-0.2,0.08h-0.82
+		c-0.08,0-0.15-0.03-0.2-0.09s-0.07-0.13-0.07-0.21v-9.43l-1.93,0.84c-0.08,0.03-0.14,0.04-0.2,0.04c-0.09,0-0.13-0.06-0.13-0.17
+		v-0.76c0-0.08,0.05-0.14,0.15-0.2l2.26-1.08c0.12-0.06,0.23-0.1,0.32-0.1h0.61c0.08,0,0.15,0.03,0.2,0.08
+		c0.06,0.05,0.08,0.12,0.08,0.21L80.34,113.17L80.34,113.17z"/>
+	<path id="path5666" style="&st0;" d="M60.93,107.38c0,9.82,7.97,17.79,17.79,17.79c9.83,0,17.79-7.97,17.79-17.79
+		c0-9.83-7.96-17.79-17.79-17.79C68.9,89.59,60.93,97.56,60.93,107.38z"/>
+	<path id="path5670" style="&st6;" d="M75.65,89.53l7.76,7.73"/>
+	<path id="path5674" style="&st6;" d="M75.65,89.53l8.52-7.19"/>
+</g>
+<g id="FrontArrow">
+	<path id="path5134" style="&st4;" d="M80.85,77.66V65.28"/>
+	<path id="path5138" style="&st1;" d="M90.15,68.01L80.8,51.82l-9.35,16.19H90.15z"/>
 </g>
 </svg>
diff --git a/tabs/initial_setup.css b/tabs/initial_setup.css
index 20c0791098..767e98d902 100644
--- a/tabs/initial_setup.css
+++ b/tabs/initial_setup.css
@@ -70,6 +70,11 @@
         height: 30%; /* interactive_block height set to inherit */
     }
 
+    #interactive_block .modelMixAirplane { /* Position airplane correctly */
+        height: 35%;
+        padding-left: 0px;
+    }
+
     #interactive_block .modelMixCustom { /* Position question mark correctly */
         height: 20%; /* resize question mark */
         padding-left: 25px;
diff --git a/tabs/initial_setup.js b/tabs/initial_setup.js
index b9eb129b39..916b7c7f21 100644
--- a/tabs/initial_setup.js
+++ b/tabs/initial_setup.js
@@ -140,9 +140,13 @@ tabs.initial_setup.initialize = function(callback) {
             case 5: // GIMBAL
             case 8: // FLYING_WING
             case 14: // AIRPLANE
+                $(".modelMixDiagram").attr("src","./images/motor_order/airplane.svg").addClass('modelMixAirplane');
+                break;
             case 15: // Heli 120
             case 16: // Heli 90
             case 17: // Vtail
+                $(".modelMixDiagram").attr("src","./images/motor_order/vtail.svg").addClass('modelMixVtail');
+                break;
             case 18: // HEX6 H
             case 19: // PPM to SERVO
             case 20: // Dualcopter