diff --git a/hack/make/.go-autogen b/hack/make/.go-autogen
index ef5c6a40f2..2df015b14f 100644
--- a/hack/make/.go-autogen
+++ b/hack/make/.go-autogen
@@ -44,8 +44,7 @@ DVEOF
 
 # Compile the Windows resources into the sources
 if [ "$(go env GOOS)" = "windows" ]; then
-	mkdir -p autogen/winresources/tmp autogen/winresources/docker autogen/winresources/dockerd
-	cp hack/make/.resources-windows/resources.go autogen/winresources/docker/
+	mkdir -p autogen/winresources/tmp autogen/winresources/dockerd
 	cp hack/make/.resources-windows/resources.go autogen/winresources/dockerd/
 
 	if [ "$(go env GOHOSTOS)" == "windows" ]; then
@@ -81,8 +80,6 @@ if [ "$(go env GOOS)" = "windows" ]; then
 		-h autogen/winresources/tmp \
 		-r autogen/winresources/tmp
 
-	makeres docker.rc pe-x86-64 autogen/winresources/docker/rsrc_amd64.syso
-	makeres docker.rc pe-i386 autogen/winresources/docker/rsrc_386.syso
 	makeres dockerd.rc pe-x86-64 autogen/winresources/dockerd/rsrc_amd64.syso
 
 	rm -r autogen/winresources/tmp
diff --git a/hack/make/.go-autogen.ps1 b/hack/make/.go-autogen.ps1
index 35c311bb2a..6cc658b510 100644
--- a/hack/make/.go-autogen.ps1
+++ b/hack/make/.go-autogen.ps1
@@ -60,9 +60,7 @@ const (
     [System.IO.File]::WriteAllText($outputFile, $fileContents, (New-Object System.Text.UTF8Encoding($False)))
 
     New-Item -ItemType Directory -Path "autogen\winresources\tmp" | Out-Null
-    New-Item -ItemType Directory -Path "autogen\winresources\docker" | Out-Null
     New-Item -ItemType Directory -Path "autogen\winresources\dockerd" | Out-Null
-    Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\docker"
     Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\dockerd"
 
     # Generate a version in the form major,minor,patch,build
@@ -77,12 +75,6 @@ const (
     $env:_ag_dockerVersion=$DockerVersion
     $env:_ag_gitCommit=$CommitString
 
-    windres -i hack/make/.resources-windows/docker.rc  -o autogen/winresources/docker/rsrc_amd64.syso  -F pe-x86-64 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client 64-bit resources" }
-
-    windres -i hack/make/.resources-windows/docker.rc  -o autogen/winresources/docker/rsrc_386.syso    -F pe-i386   --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client 32-bit resources" }
-
     windres -i hack/make/.resources-windows/dockerd.rc -o autogen/winresources/dockerd/rsrc_amd64.syso -F pe-x86-64 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
     if ($LASTEXITCODE -ne 0) { Throw "Failed to compile daemon resources" }
 }
diff --git a/hack/make/.resources-windows/common.rc b/hack/make/.resources-windows/common.rc
index 000fb35367..3524d9bf48 100644
--- a/hack/make/.resources-windows/common.rc
+++ b/hack/make/.resources-windows/common.rc
@@ -1,8 +1,8 @@
 // Application icon
-1 ICON "docker.ico"
+1 ICON "dockerd.ico"
 
 // Windows executable manifest
-1 24 /* RT_MANIFEST */ "docker.exe.manifest"
+1 24 /* RT_MANIFEST */ "dockerd.exe.manifest"
 
 // Version information
 1 VERSIONINFO
diff --git a/hack/make/.resources-windows/docker.rc b/hack/make/.resources-windows/docker.rc
deleted file mode 100644
index 40c645ad1d..0000000000
--- a/hack/make/.resources-windows/docker.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-#define DOCKER_NAME "Docker Client"
-
-#include "common.rc"
diff --git a/hack/make/.resources-windows/docker.exe.manifest b/hack/make/.resources-windows/dockerd.exe.manifest
similarity index 100%
rename from hack/make/.resources-windows/docker.exe.manifest
rename to hack/make/.resources-windows/dockerd.exe.manifest
diff --git a/hack/make/.resources-windows/docker.ico b/hack/make/.resources-windows/dockerd.ico
similarity index 100%
rename from hack/make/.resources-windows/docker.ico
rename to hack/make/.resources-windows/dockerd.ico
diff --git a/hack/make/.resources-windows/docker.png b/hack/make/.resources-windows/dockerd.png
similarity index 100%
rename from hack/make/.resources-windows/docker.png
rename to hack/make/.resources-windows/dockerd.png
diff --git a/hack/make/.resources-windows/resources.go b/hack/make/.resources-windows/resources.go
index b171259f83..3ade4eadd9 100644
--- a/hack/make/.resources-windows/resources.go
+++ b/hack/make/.resources-windows/resources.go
@@ -1,6 +1,6 @@
 /*
 
-Package winresources is used to embed Windows resources into docker.exe.
+Package winresources is used to embed Windows resources into dockerd.exe.
 These resources are used to provide
 
     * Version information