diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 17cd160e70e..3becf27cbd0 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -41,16 +41,16 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
+     inkscape:window-width="1837"
+     inkscape:window-height="962"
      id="namedview34335"
      showgrid="false"
-     inkscape:zoom="32.000001"
-     inkscape:cx="386.92187"
-     inkscape:cy="586.82811"
-     inkscape:window-x="1912"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
+     inkscape:zoom="2"
+     inkscape:cx="256"
+     inkscape:cy="185"
+     inkscape:window-x="56"
+     inkscape:window-y="31"
+     inkscape:window-maximized="0"
      inkscape:current-layer="layer8"
      inkscape:showpageshadow="2"
      inkscape:deskcolor="#808080"
@@ -13847,26 +13847,6 @@
          style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new"
          id="path10313" />
     </g>
-    <g
-       id="g12836"
-       style="display:inline;fill:#ffffff;enable-background:new"
-       transform="translate(-123,459)"
-       inkscape:export-filename="blender_icons.png"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96"
-       inkscape:label="M-26">
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 540.5,263 c -2.47936,0 -4.5,2.02064 -4.5,4.5 0,2.47936 2.02064,4.5 4.5,4.5 2.47936,0 4.5,-2.02064 4.5,-4.5 0,-2.47936 -2.02064,-4.5 -4.5,-4.5 z m 0,1 c 1.93892,0 3.5,1.56108 3.5,3.5 0,1.40621 -0.82672,2.60476 -2.01758,3.16211 -0.16784,-2.48561 -2.15892,-4.47669 -4.64453,-4.64453 C 537.89524,264.82672 539.09379,264 540.5,264 Z"
-         transform="translate(123,-459)"
-         id="path12830"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 657.50195,-192.93359 a 0.50004997,0.50004997 0 0 0 -0.22656,0.0508 c -2.27231,1.07327 -3.57921,3.51034 -3.21484,5.99609 0.36436,2.48575 2.31598,4.44563 4.80078,4.82227 2.48479,0.37663 4.92837,-0.91763 6.01367,-3.1836 a 0.50013262,0.50013262 0 1 0 -0.90234,-0.43164 c -0.89704,1.8729 -2.90867,2.93833 -4.96289,2.62696 -2.05422,-0.31138 -3.6598,-1.92406 -3.96094,-3.97852 -0.30115,-2.05446 0.77387,-4.06001 2.65234,-4.94727 a 0.50004997,0.50004997 0 0 0 -0.19922,-0.95507 z"
-         id="path12834"
-         inkscape:connector-curvature="0" />
-    </g>
     <g
        style="display:inline;fill:#ffffff;enable-background:new"
        id="g22255"
@@ -17439,7 +17419,7 @@
          sodipodi:nodetypes="cccccccsccccccccc" />
     </g>
     <g
-       transform="translate(-0.389343,-189.06)"
+       transform="translate(-0.389343,-189.14839)"
        style="display:inline;enable-background:new"
        id="g4917"
        inkscape:label="E-6">
@@ -17459,6 +17439,22 @@
          d="m 122.93095,287.85344 c 1.65093,0 3,1.34907 3,3 0,1.65093 -1.34907,3 -3,3 -1.65093,0 -3,-1.34907 -3,-3 0,-1.65093 1.34907,-3 3,-3 z m 0,1 c -1.11049,0 -2,0.88951 -2,2 0,1.11049 0.88951,2 2,2 1.11049,0 2,-0.88951 2,-2 0,-1.11049 -0.88951,-2 -2,-2 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" />
     </g>
+    <g
+       transform="translate(83.289453,-189.18163)"
+       style="display:inline;enable-background:new"
+       id="g4917-5"
+       inkscape:label="E-6">
+      <path
+         inkscape:connector-curvature="0"
+         id="circle14295-0-3-0-1-6"
+         d="m 115.59493,291.64794 c 1.65093,0 3,1.34907 3,3 0,1.65093 -1.34907,3 -3,3 -1.65093,0 -3,-1.34907 -3,-3 0,-1.65093 1.34907,-3 3,-3 z m 0,1 c -1.11049,0 -2,0.88951 -2,2 0,1.11049 0.88951,2 2,2 1.11049,0 2,-0.88951 2,-2 0,-1.11049 -0.88951,-2 -2,-2 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" />
+      <path
+         inkscape:connector-curvature="0"
+         id="circle14295-0-3-6-4"
+         d="m 122.93095,287.85344 c 1.65093,0 3,1.34907 3,3 0,1.65093 -1.34907,3 -3,3 -1.65093,0 -3,-1.34907 -3,-3 0,-1.65093 1.34907,-3 3,-3 z m 0,1 c -1.11049,0 -2,0.88951 -2,2 0,1.11049 0.88951,2 2,2 1.11049,0 2,-0.88951 2,-2 0,-1.11049 -0.88951,-2 -2,-2 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" />
+    </g>
     <g
        transform="translate(-0.389343,-189.06)"
        style="display:inline;enable-background:new"
@@ -19273,6 +19269,112 @@
        id="path20467-8"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccccccccccccccccccccc" />
+    <g
+       id="g4304-7"
+       style="display:inline;enable-background:new"
+       inkscape:label="H-17"
+       transform="translate(188.99437,104.97791)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 342.5,158 c -0.27613,3e-5 -0.49997,0.22387 -0.5,0.5 v 13 c 3e-5,0.27613 0.22387,0.49997 0.5,0.5 h 13 c 0.27613,-3e-5 0.49997,-0.22387 0.5,-0.5 v -13 c -3e-5,-0.27613 -0.22387,-0.49997 -0.5,-0.5 z m 6.5,3 c 2.20237,0 4,1.79764 4,4 0,2.20237 -1.79763,4 -4,4 -2.20236,0 -4,-1.79763 -4,-4 0,-2.20236 1.79764,-4 4,-4 z"
+         id="rect13348-1" />
+    </g>
+    <g
+       style="display:inline;fill:none;enable-background:new"
+       id="g12"
+       transform="translate(405.99511,10.009244)"
+       inkscape:label="A-21">
+      <path
+         d="m 6,10 c -0.55228,0 -1,0.4477 -1,1 0,0.3701 0.2011,0.6933 0.5,0.8662 V 13 c 0,0.2761 0.22386,0.5 0.5,0.5 0.27614,0 0.5,-0.2239 0.5,-0.5 V 11.8662 C 6.7989,11.6933 7,11.3701 7,11 7,10.4477 6.55228,10 6,10 Z"
+         fill="#ffffff"
+         id="path1-6" />
+      <path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="M 6,1 C 3.79086,1 2,2.79086 2,5 v 2 h 9.5 C 11.7761,7 12,7.22386 12,7.5 v 8 C 12,15.7761 11.7761,16 11.5,16 H 0.5 C 0.223858,16 0,15.7761 0,15.5 v -8 C 0,7.22386 0.223858,7 0.5,7 H 1 V 5 C 1,2.23858 3.23858,0 6,0 8.2179,0 10.0985,1.44407 10.7529,3.44327 10.8321,3.68519 10.6888,3.93708 10.4473,4.01757 10.1662,4.11127 9.86854,3.93654 9.76912,3.65743 9.2174,2.10867 7.73817,1 6,1 Z M 1,8 v 7 H 11 V 8 Z"
+         fill="#ffffff"
+         id="path2-9" />
+    </g>
+    <g
+       style="display:inline;fill:none;enable-background:new"
+       id="g2-6"
+       transform="translate(427.02199,10.010043)"
+       inkscape:label="A-19">
+      <path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="M 1,7 V 5 C 1,2.23858 3.23858,0 6,0 c 2.76142,0 5,2.23858 5,5 v 2 h 0.5 C 11.7761,7 12,7.22386 12,7.5 v 8 C 12,15.7761 11.7761,16 11.5,16 H 0.5 C 0.223858,16 0,15.7761 0,15.5 v -8 C 0,7.22386 0.223858,7 0.5,7 Z M 2,5 C 2,2.79086 3.79086,1 6,1 8.20914,1 10,2.79086 10,5 V 7 H 2 Z m 4,5 c -0.55228,0 -1,0.4477 -1,1 0,0.3701 0.2011,0.6933 0.5,0.8662 V 13 c 0,0.2761 0.22386,0.5 0.5,0.5 0.27614,0 0.5,-0.2239 0.5,-0.5 V 11.8662 C 6.7989,11.6933 7,11.3701 7,11 7,10.4477 6.55228,10 6,10 Z"
+         fill="#ffffff"
+         id="path1-4" />
+    </g>
+    <g
+       style="display:inline;fill:none;enable-background:new"
+       id="g15"
+       transform="translate(383.03883,10.007582)"
+       inkscape:label="A-21">
+      <path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="M 4,12 V 10.5 C 4,10.2239 4.22386,10 4.5,10 h 6 c 0.2761,0 0.5,0.2239 0.5,0.5 v 5 C 11,15.7761 10.7761,16 10.5,16 H 5.70711 C 5.5745,16 5.44732,15.9473 5.35355,15.8536 L 4.14645,14.6464 C 4.05268,14.5527 4,14.4255 4,14.2929 V 13 H 3 v 0.5 C 3,13.7761 2.77614,14 2.5,14 2.22386,14 2,13.7761 2,13.5 v -2 C 2,11.2239 2.22386,11 2.5,11 2.77614,11 3,11.2239 3,11.5 V 12 Z M 5.91421,15 5,14.0858 V 11 h 5 v 4 z"
+         fill="#ffffff"
+         id="path1-52" />
+      <path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="M 13.2154,13.5 15,14.5917 v -2.1834 z m 1.931,2.3536 C 15.2369,15.944 15.3619,16 15.5,16 15.7761,16 16,15.7761 16,15.5 v -4 C 16,11.2239 15.7761,11 15.5,11 c -0.1381,0 -0.2631,0.056 -0.3536,0.1464 l -3.1022,1.8978 C 11.8707,13.1226 11.75,13.2972 11.75,13.5 c 0,0.2028 0.1207,0.3774 0.2942,0.4558 z"
+         fill="#ffffff"
+         id="path2-5" />
+      <path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="M 6.3849,4.22363 C 6.02407,4.30023 5.65038,4.17199 5.41263,3.88997 4.95248,3.34412 4.26691,3 3.5,3 2.11929,3 1,4.11929 1,5.5 1,6.88071 2.11929,8 3.5,8 h 7 C 12.433,8 14,6.433 14,4.5 14,2.567 12.433,1 10.5,1 8.90711,1 7.56034,2.06492 7.13771,3.5237 7.03507,3.878 6.74572,4.14702 6.3849,4.22363 Z M 6.60573,2.2436 C 6.42451,2.5557 6.27972,2.89159 6.17721,3.24543 5.94409,2.96889 5.6689,2.72898 5.36151,2.53555 4.82233,2.19626 4.18409,2 3.5,2 1.567,2 0,3.56701 0,5.5 0,7.43299 1.567,9 3.5,9 h 7 C 12.9853,9 15,6.98528 15,4.5 15,2.01472 12.9853,0 10.5,0 8.83701,0 7.38471,0.902078 6.60573,2.2436 Z"
+         fill="#ffffff"
+         id="path3-6" />
+      <path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         d="M 10.5,5 C 10.7761,5 11,4.77614 11,4.5 11,4.22386 10.7761,4 10.5,4 10.2239,4 10,4.22386 10,4.5 10,4.77614 10.2239,5 10.5,5 Z m 0,1 C 11.3284,6 12,5.32843 12,4.5 12,3.67157 11.3284,3 10.5,3 9.67157,3 9,3.67157 9,4.5 9,5.32843 9.67157,6 10.5,6 Z"
+         fill="#ffffff"
+         id="path4-7" />
+      <path
+         d="m 4.5,5.5 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         fill="#ffffff"
+         id="path5-0" />
+    </g>
+    <path
+       sodipodi:nodetypes="sssss"
+       inkscape:connector-curvature="0"
+       id="circle13367-9-8"
+       d="m 197.49219,94.596621 c 1.65093,0 3,1.34907 3,3 0,1.65093 -1.34907,2.999999 -3,2.999999 -1.65093,0 -3,-1.349069 -3,-2.999999 0,-1.65093 1.34907,-3 3,-3 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" />
+    <g
+       id="g56">
+      <g
+         id="g165467-7"
+         style="display:inline;enable-background:new"
+         inkscape:label="I-3"
+         transform="translate(440.99177,20.983957)">
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+           d="m 52.49219,179.00781 c -0.1326,4e-5 -0.25976,0.0527 -0.35352,0.1465 l -2.980087,2.96444 c -0.12064,0.11597 -0.14648,0.22852 -0.14648,0.35352 v 2.53315 h 1 l 0.003,-2.32915 2.684077,-2.66846 h 8.29297 v 8.29298 l -2.730276,2.69699 -2.262334,0.003 v 1 h 2.466854 c 0.11717,0 0.23766,-0.0261 0.3457,-0.13867 l 3.033606,-3.00033 c 0.0938,-0.0938 0.14646,-0.22091 0.14649,-0.35352 v -9 c -3e-5,-0.27612 -0.22387,-0.49996 -0.5,-0.5 z"
+           id="path5236-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccscccccccccscccccc" />
+      </g>
+      <g
+         id="g19381-2"
+         style="display:inline;enable-background:new"
+         inkscape:label="F-1"
+         transform="translate(483.00515,84.044245)">
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+           d="m 6.4818091,122.96135 c -0.1592654,-10e-4 -0.516986,0.087 -0.4960937,0.48465 l -0.00781,6.03971 c 2.76e-5,0.27613 0.2238691,0.49997 0.5,0.5 h 6.0356916 c 0.235331,0.002 0.481037,-0.17264 0.475555,-0.49925 -0.0029,-0.17416 -0.0016,-1.65682 3.16e-4,-1.94881 0.0029,-0.44725 -0.236518,-0.47226 -0.460246,-0.47182 -0.223728,4.4e-4 -3.5227115,-0.004 -3.5227115,-0.004 0,0 -0.00434,-2.02425 0.00601,-3.62304 0.00284,-0.43846 -0.2571116,-0.47024 -0.5021009,-0.4681 -0.6989961,0.007 -1.4515221,-0.005 -2.0286105,-0.009 z"
+           id="path13927-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccsszcssss" />
+      </g>
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/release/datafiles/blender_icons16/icon16_face_corner.dat b/release/datafiles/blender_icons16/icon16_face_corner.dat
new file mode 100644
index 00000000000..6480d3ea405
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_face_corner.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_mod_mask.dat b/release/datafiles/blender_icons16/icon16_mod_mask.dat
index b3105bb7183..d0e28be9de4 100644
Binary files a/release/datafiles/blender_icons16/icon16_mod_mask.dat and b/release/datafiles/blender_icons16/icon16_mod_mask.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_pointcloud_data.dat b/release/datafiles/blender_icons16/icon16_pointcloud_data.dat
index 81f06f3f9d2..1cee0b8a86f 100644
Binary files a/release/datafiles/blender_icons16/icon16_pointcloud_data.dat and b/release/datafiles/blender_icons16/icon16_pointcloud_data.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_pointcloud_point.dat b/release/datafiles/blender_icons16/icon16_pointcloud_point.dat
new file mode 100644
index 00000000000..f9038659b2a
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_pointcloud_point.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_view_camera_unselected.dat b/release/datafiles/blender_icons16/icon16_view_camera_unselected.dat
new file mode 100644
index 00000000000..d0c4c40359e
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_view_camera_unselected.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_view_locked.dat b/release/datafiles/blender_icons16/icon16_view_locked.dat
new file mode 100644
index 00000000000..3114429e846
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_view_locked.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_view_unlocked.dat b/release/datafiles/blender_icons16/icon16_view_unlocked.dat
new file mode 100644
index 00000000000..e5dda74c94c
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_view_unlocked.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_face_corner.dat b/release/datafiles/blender_icons32/icon32_face_corner.dat
new file mode 100644
index 00000000000..c62ef1360c7
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_face_corner.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_mod_explode.dat b/release/datafiles/blender_icons32/icon32_mod_explode.dat
index 07fbbbd8bdb..62fd9d7ee5a 100644
Binary files a/release/datafiles/blender_icons32/icon32_mod_explode.dat and b/release/datafiles/blender_icons32/icon32_mod_explode.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_mod_mask.dat b/release/datafiles/blender_icons32/icon32_mod_mask.dat
index c581df6982c..ffe01834321 100644
Binary files a/release/datafiles/blender_icons32/icon32_mod_mask.dat and b/release/datafiles/blender_icons32/icon32_mod_mask.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_pointcloud_data.dat b/release/datafiles/blender_icons32/icon32_pointcloud_data.dat
index eb5d2855260..633a4891ad6 100644
Binary files a/release/datafiles/blender_icons32/icon32_pointcloud_data.dat and b/release/datafiles/blender_icons32/icon32_pointcloud_data.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_pointcloud_point.dat b/release/datafiles/blender_icons32/icon32_pointcloud_point.dat
new file mode 100644
index 00000000000..d75510ea4d5
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_pointcloud_point.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_view_camera_unselected.dat b/release/datafiles/blender_icons32/icon32_view_camera_unselected.dat
new file mode 100644
index 00000000000..033c1bfb086
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_view_camera_unselected.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_view_locked.dat b/release/datafiles/blender_icons32/icon32_view_locked.dat
new file mode 100644
index 00000000000..411cf773083
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_view_locked.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_view_unlocked.dat b/release/datafiles/blender_icons32/icon32_view_unlocked.dat
new file mode 100644
index 00000000000..28951fd796b
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_view_unlocked.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index f1356e82ed2..aaf873be126 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -514,6 +514,7 @@ set(ICON_NAMES
   ipo_ease_in_out
   normalize_fcurves
   orientation_parent
+  face_corner
   vertexsel
   edgesel
   facesel
@@ -611,6 +612,7 @@ set(ICON_NAMES
   outliner_ob_volume
   outliner_data_volume
   volume_data
+  pointcloud_point
   current_file
   home
   documents
@@ -694,6 +696,9 @@ set(ICON_NAMES
   handle_aligned
   handle_vector
   handle_free
+  view_camera_unselected
+  view_unlocked
+  view_locked
   view_perspective
   view_ortho
   view_camera
diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh
index d3acda9a376..49a7e34acef 100644
--- a/source/blender/editors/include/UI_icons.hh
+++ b/source/blender/editors/include/UI_icons.hh
@@ -620,7 +620,7 @@ DEF_ICON(IPO_EASE_OUT)
 DEF_ICON(IPO_EASE_IN_OUT)
 DEF_ICON(NORMALIZE_FCURVES)
 DEF_ICON(ORIENTATION_PARENT)
-DEF_ICON_BLANK(636)
+DEF_ICON(FACE_CORNER)
 DEF_ICON_BLANK(637)
 DEF_ICON_BLANK(638)
 
@@ -746,7 +746,7 @@ DEF_ICON_OBJECT_DATA(POINTCLOUD_DATA)
 DEF_ICON_OBJECT(OUTLINER_OB_VOLUME)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_VOLUME)
 DEF_ICON_OBJECT_DATA(VOLUME_DATA)
-DEF_ICON_BLANK(267)
+DEF_ICON_OBJECT_DATA(POINTCLOUD_POINT)
 DEF_ICON_BLANK(268)
 DEF_ICON_BLANK(269)
 DEF_ICON_BLANK(270)
@@ -867,9 +867,9 @@ DEF_ICON(HANDLE_AUTO)
 DEF_ICON(HANDLE_ALIGNED)
 DEF_ICON(HANDLE_VECTOR)
 DEF_ICON(HANDLE_FREE)
-DEF_ICON_BLANK(882)
-DEF_ICON_BLANK(883)
-DEF_ICON_BLANK(884)
+DEF_ICON(VIEW_CAMERA_UNSELECTED)
+DEF_ICON(VIEW_UNLOCKED)
+DEF_ICON(VIEW_LOCKED)
 DEF_ICON(VIEW_PERSPECTIVE)
 DEF_ICON(VIEW_ORTHO)
 DEF_ICON(VIEW_CAMERA)