diff --git a/datacenter/dtr/2.3/guides/architecture.md b/datacenter/dtr/2.3/guides/architecture.md
index 699f63fbf3..9d179ae552 100644
--- a/datacenter/dtr/2.3/guides/architecture.md
+++ b/datacenter/dtr/2.3/guides/architecture.md
@@ -31,12 +31,12 @@ When you install DTR on a node, the following containers are started:
 | dtr-api-<replica_id>           | Executes the DTR business logic. It serves the DTR web application, and API                                                        |
 | dtr-garant-<replica_id>        | Manages DTR authentication                                                                                                         |
 | dtr-jobrunner-<replica_id>     | Runs cleanup jobs in the background                                                                                                |
-| dtr-scanningstore-<replica_id> | Stores security scanning data                                                                                                      |
 | dtr-nginx-<replica_id>         | Receives http and https requests and proxies them to other DTR components. By default it listens to ports 80 and 443 of the host   |
 | dtr-notary-server-<replica_id> | Receives, validates, and serves content trust metadata, and is consulted when pushing or pulling to DTR with content trust enabled |
 | dtr-notary-signer-<replica_id> | Performs server-side timestamp and snapshot signing for content trust metadata                                                     |
 | dtr-registry-<replica_id>      | Implements the functionality for pulling and pushing Docker images. It also handles how images are stored                          |
 | dtr-rethinkdb-<replica_id>     | A database for persisting repository metadata                                                                                      |
+| dtr-scanningstore-<replica_id> | Stores security scanning data                                                                                                      |
 
 All these components are for internal use of DTR. Don't use them in your applications.
 
@@ -54,14 +54,14 @@ are created:
 
 DTR uses these named volumes for persisting data:
 
-| Volume name                           | Description                                                                      |
-|:--------------------------------------|:---------------------------------------------------------------------------------|
-| dtr-ca-<replica_id>             | Root key material for the DTR root CA that issues certificates                   |
-| dtr-notary-<replica_id>         | Certificate and keys for the Notary components                                   |
-| dtr-postgres-<replica_id>       | Vulnerability scans data                                                         |
-| dtr-registry-<replica_id>       | Docker images data, if DTR is configured to store images on the local filesystem |
-| dtr-rethink-<replica_id>        | Repository metadata                                                              |
-| dtr-nfs-registry-<replica_id>   | Docker images data, if DTR is configured to store images on NFS                  |
+| Volume name                         | Description                                                                      |
+|:------------------------------------|:---------------------------------------------------------------------------------|
+| dtr-ca-<replica_id>           | Root key material for the DTR root CA that issues certificates                   |
+| dtr-notary-<replica_id>       | Certificate and keys for the Notary components                                   |
+| dtr-postgres-<replica_id>     | Vulnerability scans data                                                         |
+| dtr-registry-<replica_id>     | Docker images data, if DTR is configured to store images on the local filesystem |
+| dtr-rethink-<replica_id>      | Repository metadata                                                              |
+| dtr-nfs-registry-<replica_id> | Docker images data, if DTR is configured to store images on NFS                  |
 
 You can customize the volume driver used for these volumes, by creating the
 volumes before installing DTR. During the installation, DTR checks which volumes
diff --git a/datacenter/dtr/2.3/guides/images/architecture-1.svg b/datacenter/dtr/2.3/guides/images/architecture-1.svg
index 8f63e29679..2543230711 100644
--- a/datacenter/dtr/2.3/guides/images/architecture-1.svg
+++ b/datacenter/dtr/2.3/guides/images/architecture-1.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="740px" height="250px" viewBox="0 0 740 250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
     <title>architecture-1</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -30,8 +30,8 @@
                     </g>
                     <g id="docker" transform="translate(0.000000, 76.000000)">
                         <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="524" height="34" rx="2"></rect>
-                        <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="14" font-weight="normal" fill="#FFFFFF">
-                            <tspan x="205.464355" y="23">CS Docker Engine</tspan>
+                        <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="14" font-weight="normal" fill="#FFFFFF">
+                            <tspan x="205.936035" y="23">Docker Engine EE</tspan>
                         </text>
                     </g>
                     <g id="ucp" transform="translate(0.000000, 38.000000)">
diff --git a/datacenter/dtr/2.3/guides/images/architecture-2.svg b/datacenter/dtr/2.3/guides/images/architecture-2.svg
index e8de51d858..c75df0b051 100644
--- a/datacenter/dtr/2.3/guides/images/architecture-2.svg
+++ b/datacenter/dtr/2.3/guides/images/architecture-2.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="740px" height="250px" viewBox="0 0 740 250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
     <title>architecture-2</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -22,8 +22,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -45,8 +45,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -70,8 +70,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -99,8 +99,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -128,8 +128,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -159,8 +159,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -182,8 +182,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -205,8 +205,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
diff --git a/datacenter/dtr/2.3/guides/images/architecture-3.svg b/datacenter/dtr/2.3/guides/images/architecture-3.svg
index 7656909ea1..9741c337a5 100644
--- a/datacenter/dtr/2.3/guides/images/architecture-3.svg
+++ b/datacenter/dtr/2.3/guides/images/architecture-3.svg
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="740px" height="250px" viewBox="0 0 740 250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
     <title>architecture-3</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <circle id="path-1" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-1" fill="black"></use>
-        </mask>
+        <circle id="path-2" cx="4" cy="4" r="4"></circle>
         <circle id="path-3" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-3" fill="black"></use>
-        </mask>
-        <circle id="path-5" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-6" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-5" fill="black"></use>
-        </mask>
     </defs>
     <g id="dtr-diagrams" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="architecture-3">
@@ -38,21 +26,21 @@
                             <path d="M2,4 L33,4" id="Line" stroke="#FFB463" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                             <g id="Oval">
                                 <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-1"></use>
-                                <use stroke="#F7F8F9" mask="url(#mask-2)" stroke-width="4" xlink:href="#path-1"></use>
+                                <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                             </g>
                         </g>
                         <g id="arrow-copy-3" transform="translate(111.500000, 17.000000) rotate(-90.000000) translate(-111.500000, -17.000000) translate(95.000000, 13.000000)">
                             <path d="M2,4 L33,4" id="Line" stroke="#FFB463" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                             <g id="Oval">
-                                <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-3"></use>
-                                <use stroke="#F7F8F9" mask="url(#mask-4)" stroke-width="4" xlink:href="#path-3"></use>
+                                <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-2"></use>
+                                <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                             </g>
                         </g>
                         <g id="arrow-copy-4" transform="translate(4.500000, 17.000000) rotate(-90.000000) translate(-4.500000, -17.000000) translate(-12.000000, 13.000000)">
                             <path d="M2,4 L33,4" id="Line" stroke="#FFB463" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                             <g id="Oval">
-                                <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-5"></use>
-                                <use stroke="#F7F8F9" mask="url(#mask-6)" stroke-width="4" xlink:href="#path-5"></use>
+                                <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-3"></use>
+                                <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                             </g>
                         </g>
                     </g>
@@ -68,8 +56,8 @@
                             </g>
                             <g id="engine" transform="translate(1.000000, 79.000000)">
                                 <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                    <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                 </text>
                             </g>
                             <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -97,8 +85,8 @@
                             </g>
                             <g id="engine" transform="translate(1.000000, 79.000000)">
                                 <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                    <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                 </text>
                             </g>
                             <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -126,8 +114,8 @@
                             </g>
                             <g id="engine" transform="translate(1.000000, 79.000000)">
                                 <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                    <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                 </text>
                             </g>
                             <g id="ucp" transform="translate(1.000000, 56.000000)">
diff --git a/datacenter/dtr/2.3/guides/images/architecture-4.svg b/datacenter/dtr/2.3/guides/images/architecture-4.svg
index 056ab55076..4f28043a93 100644
--- a/datacenter/dtr/2.3/guides/images/architecture-4.svg
+++ b/datacenter/dtr/2.3/guides/images/architecture-4.svg
@@ -1,39 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="740px" height="350px" viewBox="0 0 740 350" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
     <title>architecture-4</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <circle id="path-1" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-1" fill="black"></use>
-        </mask>
+        <circle id="path-2" cx="4" cy="4" r="4"></circle>
         <circle id="path-3" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-3" fill="black"></use>
-        </mask>
+        <circle id="path-4" cx="4" cy="4" r="4"></circle>
         <circle id="path-5" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-6" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-5" fill="black"></use>
-        </mask>
-        <circle id="path-7" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-8" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-7" fill="black"></use>
-        </mask>
-        <circle id="path-9" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-10" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-9" fill="black"></use>
-        </mask>
-        <circle id="path-11" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-12" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-11" fill="black"></use>
-        </mask>
+        <circle id="path-6" cx="4" cy="4" r="4"></circle>
     </defs>
     <g id="dtr-diagrams" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="architecture-4">
@@ -57,21 +33,21 @@
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
                                     <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-1"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-2)" stroke-width="4" xlink:href="#path-1"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy" transform="translate(111.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-111.500000, -17.000000) translate(95.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-3"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-4)" stroke-width="4" xlink:href="#path-3"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-2"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy-2" transform="translate(4.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-4.500000, -17.000000) translate(-12.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-5"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-6)" stroke-width="4" xlink:href="#path-5"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-3"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                         </g>
@@ -87,22 +63,22 @@
                             <g id="arrow-copy-3" transform="translate(218.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-218.500000, -17.000000) translate(202.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-7"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-8)" stroke-width="4" xlink:href="#path-7"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-4"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy" transform="translate(111.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-111.500000, -17.000000) translate(95.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-9"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-10)" stroke-width="4" xlink:href="#path-9"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-5"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy-2" transform="translate(4.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-4.500000, -17.000000) translate(-12.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-11"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-12)" stroke-width="4" xlink:href="#path-11"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-6"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                         </g>
@@ -122,8 +98,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#A1CFE8" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -145,8 +121,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#A1CFE8" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -170,8 +146,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -199,8 +175,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -228,8 +204,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -259,8 +235,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -282,8 +258,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -305,8 +281,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">