diff --git a/_scripts/fetch-upstream-resources.sh b/_scripts/fetch-upstream-resources.sh
index 2946f53751..18ed33aad9 100755
--- a/_scripts/fetch-upstream-resources.sh
+++ b/_scripts/fetch-upstream-resources.sh
@@ -29,6 +29,9 @@ svn co "https://github.com/docker/compose-cli/${compose_cli_svn_branch}/docs"
svn co "https://github.com/docker/distribution/${distribution_svn_branch}/docs/spec" ./registry/spec || (echo "Failed registry/spec download" && exit 1)
svn co "https://github.com/mirantis/compliance/trunk/docs/compliance" ./compliance || (echo "Failed docker/compliance download" && exit 1)
+# Fix up URls in swagger files
+find ./engine/api -type f -name '*.yaml' | while read i; do sed -i 's#https://docs.docker.com/#/#g' "$i"; done;
+
# Cleanup svn directories
find . -name ".svn" -print0 | xargs -0 /bin/rm -rf
diff --git a/css/api-reference.css b/css/api-reference.css
deleted file mode 100644
index bd67b28405..0000000000
--- a/css/api-reference.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Styles for the Swagger API documentation (engine/api/v1.x/index.html)
- */
-
-
-/* ReDoc doesn't change outer page styles */
-body {
- margin: 0;
- padding: 0;
-}
-api-logo {
- background-image: linear-gradient(0deg, #15A4D7 0%, #1488C6 100%);
- height: 100px;
- text-align: left !important;
-}
-api-logo img {
- width: 136px !important;
- margin: 32px 0 0 50px;
-}
-/**
- * Disable request-type badges, see https://github.com/Rebilly/ReDoc/issues/61
- */
-redoc .operation-type {
- display: none !important;
-}
diff --git a/css/api-reference.scss b/css/api-reference.scss
new file mode 100644
index 0000000000..4dced86411
--- /dev/null
+++ b/css/api-reference.scss
@@ -0,0 +1,51 @@
+---
+# Docker Documentation Theme
+---
+
+@import "variables";
+@import "typography";
+
+/**
+ * Styles for the Swagger API documentation (engine/api/v1.x/index.html)
+ */
+
+
+/* ReDoc doesn't change outer page styles */
+body {
+ margin: 0;
+ padding: 0;
+}
+api-logo {
+ background-color: $bg-header;
+ height: 60px;
+ text-align: left !important;
+
+ img {
+ width: 160px !important;
+ margin: 15px 20px;
+ }
+}
+
+redoc {
+ h1 {
+ font-size: 32px !important;
+ }
+ h1,h2,h3,h4,h5,h6 {
+ font-family: $headings !important;
+ color: inherit !important;
+ }
+ p, a, .menu-item-title {
+ font-family: $font !important;
+ }
+ a, .menu-item-title {
+ color: $primary-links !important;
+ }
+ .menu-item-title {
+ text-transform: none;
+ }
+ // Disable request-type badges, see https://github.com/Rebilly/ReDoc/issues/61
+ .operation-type {
+ display: none !important;
+ }
+}
+
diff --git a/images/logo-docker-main.png b/images/logo-docker-main.png
index 536690d660..3893049f05 100644
Binary files a/images/logo-docker-main.png and b/images/logo-docker-main.png differ
diff --git a/images/logo-docker-main.svg b/images/logo-docker-main.svg
index 43ce91e41d..bd11ae5718 100644
--- a/images/logo-docker-main.svg
+++ b/images/logo-docker-main.svg
@@ -1,53 +1,14 @@
-
-
-
-
+
+