Fix download and save icons.

docs/static/fonts/icons/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
 	font-family: "iconfont";
-	src: url("iconfont.eot?8d461ad14fbdc5b48a8749a696d345dd?#iefix") format("embedded-opentype"),
+	src: url("iconfont.eot?6e1ef95090bc1e1acc3a7e6bb86172de?#iefix") format("embedded-opentype"),
-url("iconfont.woff2?8d461ad14fbdc5b48a8749a696d345dd") format("woff2"),
+url("iconfont.woff2?6e1ef95090bc1e1acc3a7e6bb86172de") format("woff2"),
-url("iconfont.woff?8d461ad14fbdc5b48a8749a696d345dd") format("woff");
+url("iconfont.woff?6e1ef95090bc1e1acc3a7e6bb86172de") format("woff");
 }
 
 .icon {

docs/static/fonts/icons/iconfont.svg

@@ -66,10 +66,10 @@
       horiz-adv-x="40" d=" M4209.2 23456H4231.3V23452.3H4209.2V23456z M4201.2 23463.4H4204.9V23452.3H4201.2V23463.4z" />
     <glyph glyph-name="download"
       unicode="&#xF114;"
-      horiz-adv-x="40" d=" M5.2 15.7H36.5V1.7H5.2V15.7z M19.1 36.5H22.6V19.1H19.1V36.5z M18803.9 -5968.6H18811.3V-5971.1H18803.9V-5968.6z M18798.7 -5963.7H18801.2V-5971.1H18798.7V-5963.7z" />
+      horiz-adv-x="40" d=" M5.2 15.7H36.5V1.7H5.2V15.7z M28.5 24.2L26.1 26.6L22.6 23.1L22.6 36.5L19.1 36.5L19.1 23.5L16 26.6L13.6 24.2L20.9 16.7L21 16.9L21.2 16.7z" />
     <glyph glyph-name="save"
       unicode="&#xF115;"
-      horiz-adv-x="40" d=" M4.2 19.2V33.8C4.2 34.9 4.3 35 5.4 35H12.3C13.4 35 13.6 34.9 13.6 33.8V26.7C13.6 25.8 13.7 25.6 14.6 25.6H25C25.9 25.6 26.1 25.8 26.1 26.7V34C26.1 34.9 26.3 35 27.1 35C29.2 35 29.2 35 30.6 33.6C32.2 32.1 33.6 30.7 35.1 29.1C35.5 28.8 35.7 28.4 35.7 27.9V4.4C35.7 3.6 35.5 3.2 34.6 3.2H5.2C4.3 3.2 4.2 3.4 4.2 4.4C4.2 9.5 4.2 14.3 4.2 19.2zM20 6.7H31.5C32.5 6.7 32.7 6.9 32.7 7.9V21.3C32.7 22.2 32.5 22.5 31.5 22.5H8.5C7.7 22.5 7.3 22.3 7.3 21.3V7.9C7.3 6.9 7.5 6.7 8.5 6.7H20z M24 31.9C24 31.2 24 30.3 24 29.6C24 28.9 23.7 28.8 23.1 28.8C22.6 28.8 22.1 28.8 21.7 28.8C21.4 28.8 20.9 28.9 20.9 29.5C20.9 29.5 20.9 29.6 20.9 29.6V34.2C20.9 34.5 21 34.9 21.6 35C21.6 35 21.6 35 21.7 35C22.3 35 22.8 35 23.3 35C23.8 35 24.2 34.7 24.2 34.3C24.2 34.3 24.2 34.3 24.2 34.2C24 33.5 24 32.6 24 31.9z M6.7 23.6H33.5V5.7H6.7V23.6z M7.6 22.8H32.6V6.6H7.6V22.8z" />
+      horiz-adv-x="40" d=" M2.3 20.1V36.6C2.3 37.8 2.4 38 3.7 38H11.5C12.7 38 12.9 37.8 12.9 36.6V28.6C12.9 27.6 13 27.4 14.1 27.4H25.9C27 27.4 27.1 27.6 27.1 28.6V36.8C27.1 37.8 27.3 38 28.3 38C30.8 38 30.8 38 32.3 36.4C34.1 34.7 35.7 33.1 37.4 31.4C37.7 31 37.9 30.5 37.9 30V3.6C37.9 2.5 37.7 2.2 36.7 2.2H3.5C2.4 2.2 2.3 2.3 2.3 3.6C2.3 9.1 2.3 14.7 2.3 20.1zM20.2 6H33C34.3 6 34.4 6.2 34.4 7.4V22.5C34.4 23.6 34.3 23.9 33 23.9H7.1C6.1 23.9 5.7 23.7 5.7 22.5V7.4C5.7 6.2 5.9 6 7.1 6H20.2z M24.7 34.5C24.7 33.6 24.7 32.8 24.7 31.9C24.7 31 24.3 30.9 23.7 30.9C23.1 30.9 22.4 30.9 22.1 30.9S21 31 21 31.7V31.9V36.9C21 37.3 21.2 37.8 21.9 38C21.9 38 21.9 38 22.1 38C22.6 38 23.3 38 23.8 38C24.3 38 24.9 37.6 24.9 37.1C24.9 37.1 24.9 37.1 24.9 36.9C24.7 36.3 24.7 35.2 24.7 34.5z M5.1 25H35.4V4.8H5.1V25z M6.2 24.1H34.5V5.9H6.2V24.1z" />
     <glyph glyph-name="advancedcollapsed"
       unicode="&#xF116;"
       horiz-adv-x="40" d=" M39.7 28.2L36.2 31.5L20 15.3L3.8 31.5L0.3 28.2L18.3 10.3L18.3 10.3L20 8.5L20.5 9L20.5 9z" />

libs/core/_locales/core-strings.json

@@ -35,7 +35,7 @@
   "brick.buttonUp|block": "up",
   "brick.clearScreen|block": "clear screen",
   "brick.lightPattern|block": "%pattern",
-  "brick.printLine|block": "print %text| at line: %line",
+  "brick.printLine|block": "print %text| at line %line",
   "brick.printPorts|block": "print ports",
   "brick.setLight|block": "set light to %pattern=led_pattern",
   "brick.showImage|block": "show image %image=screen_image_picker",

svgicons/icons/download.svg

@@ -8,12 +8,7 @@
 <title>color</title>
 <g id="menu_icn_download" transform="translate(-9563 11322)">
 	<rect id="Rectangle_167" x="9566" y="-11308" class="st0" width="18" height="8"/>
-	<g id="arrow" transform="translate(6 -5)">
+	<polygon class="st0" points="9579.4,-11312.9 9578,-11314.3 9576,-11312.3 9576,-11320 9574,-11320 9574,-11312.5 9572.2,-11314.3 
-		<rect id="Rectangle_168" x="9568" y="-11315" class="st0" width="2" height="10"/>
+		9570.8,-11312.9 9575,-11308.6 9575.1,-11308.7 9575.2,-11308.6 	"/>
-		
-			<rect id="Rectangle_169" x="9567.6" y="-11307.6" transform="matrix(0.7071 -0.7071 0.7071 0.7071 10798.123 3455.804)" class="st0" width="6" height="2"/>
-		
-			<rect id="Rectangle_170" x="9566.6" y="-11309.6" transform="matrix(0.7071 -0.7071 0.7071 0.7071 10797.2441 3453.6824)" class="st0" width="2" height="6"/>
-	</g>
 </g>
 </svg>

svgicons/icons/save.svg

@@ -9,16 +9,17 @@
 </style>
 <title>color</title>
 <g id="menu_icn_savedisc" transform="translate(-8886 12201.056)">
-	<path id="Path_116" class="st0" d="M8888.4-12189.1v-8.4c0-0.6,0.1-0.7,0.7-0.7h4c0.6,0,0.7,0.1,0.7,0.7v4.1c0,0.5,0.1,0.6,0.6,0.6
+	<path id="Path_116" class="st0" d="M8887.3-12189.6v-9.5c0-0.7,0.1-0.8,0.8-0.8h4.5c0.7,0,0.8,0.1,0.8,0.8v4.6
-		h6c0.5,0,0.6-0.1,0.6-0.6v-4.2c0-0.5,0.1-0.6,0.6-0.6c1.2,0,1.2,0,2,0.8c0.9,0.9,1.7,1.7,2.6,2.6c0.2,0.2,0.3,0.4,0.3,0.7v13.5
+		c0,0.6,0.1,0.7,0.7,0.7h6.8c0.6,0,0.7-0.1,0.7-0.7v-4.7c0-0.6,0.1-0.7,0.7-0.7c1.4,0,1.4,0,2.3,0.9c1,1,1.9,1.9,2.9,2.9
-		c0,0.5-0.1,0.7-0.6,0.7h-16.9c-0.5,0-0.6-0.1-0.6-0.7C8888.4-12183.5,8888.4-12186.3,8888.4-12189.1z M8897.5-12181.9h6.6
+		c0.2,0.2,0.3,0.5,0.3,0.8v15.2c0,0.6-0.1,0.8-0.7,0.8H8888c-0.6,0-0.7-0.1-0.7-0.8C8887.3-12183.3,8887.3-12186.5,8887.3-12189.6z
-		c0.6,0,0.7-0.1,0.7-0.7v-7.7c0-0.5-0.1-0.7-0.7-0.7h-13.2c-0.5,0-0.7,0.1-0.7,0.7v7.7c0,0.6,0.1,0.7,0.7,0.7H8897.5z"/>
+		 M8897.6-12181.5h7.4c0.7,0,0.8-0.1,0.8-0.8v-8.7c0-0.6-0.1-0.8-0.8-0.8h-14.9c-0.6,0-0.8,0.1-0.8,0.8v8.7c0,0.7,0.1,0.8,0.8,0.8
-	<path id="Path_117" class="st0" d="M8899.8-12196.4c0,0.4,0,0.9,0,1.3c0,0.4-0.2,0.5-0.5,0.5c-0.3,0-0.6,0-0.8,0
+		H8897.6z"/>
-		c-0.2,0-0.5-0.1-0.5-0.4c0,0,0-0.1,0-0.1v-2.6c0-0.2,0.1-0.4,0.4-0.5c0,0,0,0,0.1,0c0.3,0,0.6,0,0.9,0c0.3,0,0.5,0.2,0.5,0.4
+	<path id="Path_117" class="st0" d="M8900.2-12197.9c0,0.5,0,1,0,1.5c0,0.5-0.2,0.6-0.6,0.6c-0.3,0-0.7,0-0.9,0s-0.6-0.1-0.6-0.5
-		c0,0,0,0,0,0.1C8899.8-12197.3,8899.8-12196.8,8899.8-12196.4z"/>
+		v-0.1v-2.9c0-0.2,0.1-0.5,0.5-0.6c0,0,0,0,0.1,0c0.3,0,0.7,0,1,0c0.3,0,0.6,0.2,0.6,0.5c0,0,0,0,0,0.1
+		C8900.2-12198.9,8900.2-12198.3,8900.2-12197.9z"/>
 	<g id="Rectangle_166" transform="translate(1.445 6.558)">
-		<rect x="8888.4" y="-12198.2" class="st1" width="15.4" height="10.3"/>
+		<rect x="8887.5" y="-12199" class="st1" width="17.4" height="11.6"/>
-		<rect x="8888.9" y="-12197.7" class="st2" width="14.4" height="9.3"/>
+		<rect x="8888.1" y="-12198.5" class="st2" width="16.3" height="10.5"/>
 	</g>
 </g>
 </svg>

theme/blockly.less

@@ -125,19 +125,27 @@ span.blocklyTreeIcon.blocklyTreeIconadvancedexpanded::before {
     content: "\f117";
 }
 
-.save-editortools-btn .icon.save::before {
+.save-editortools-btn .icon.save,
-    content: "\f115"
+    .download-button .icon.download.icon-and-text,
+    .button.approve.positive .i.icon.checkmark,
+    .button.approve.cancel .i.icon.cancel
+{
+    font-family: 'legoIcons';
 }
 
-.download-button .icon.download.icon-and-text::before {
+.save-editortools-btn .icon.save:before {
-    content: "\f114"
+    content: "\f115";
 }
 
-.button.approve.positive .checkmark.icon::before {
+.download-button .icon.download.icon-and-text:before {
-    content: "\f113"
+    content: "\f114";
 }
 
-.button.approve.cancel .cancel.icon::before {
+.button.approve.positive .i.icon.checkmark:before {
-    content: "\f112"
+    content: "\f113";
+}
+
+.button.approve.cancel .i.icon.cancel:before {
+    content: "\f112";
 }