diff --git a/src/Icons/.dockerignore b/src/Icons/.dockerignore
new file mode 100644
index 0000000000..7e37ce5d99
--- /dev/null
+++ b/src/Icons/.dockerignore
@@ -0,0 +1,4 @@
+*
+!obj/Docker/publish/*
+!obj/Docker/empty/
+!entrypoint.sh
diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile
new file mode 100644
index 0000000000..66c96c6132
--- /dev/null
+++ b/src/Icons/Dockerfile
@@ -0,0 +1,9 @@
+FROM microsoft/aspnetcore:2.0.0
+
+WORKDIR /app
+EXPOSE 80
+COPY obj/Docker/publish .
+
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/src/Icons/build.ps1 b/src/Icons/build.ps1
new file mode 100644
index 0000000000..2a6db79540
--- /dev/null
+++ b/src/Icons/build.ps1
@@ -0,0 +1,14 @@
+$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
+
+echo "`n## Building Icons"
+
+echo "`nBuilding app"
+echo ".NET Core version $(dotnet --version)"
+echo "Clean"
+dotnet clean $dir\Icons.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+echo "Publish"
+dotnet publish $dir\Icons.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
+
+echo "`nBuilding docker image"
+docker --version
+docker build -t bitwarden/icons $dir\.
diff --git a/src/Icons/build.sh b/src/Icons/build.sh
new file mode 100644
index 0000000000..994c92f6ee
--- /dev/null
+++ b/src/Icons/build.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+echo -e "\n## Building Icons"
+
+echo -e "\nBuilding app"
+echo ".NET Core version $(dotnet --version)"
+echo "Clean"
+dotnet clean $DIR/Icons.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+echo "Publish"
+dotnet publish $DIR/Icons.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+
+echo -e "\nBuilding docker image"
+docker --version
+docker build -t bitwarden/icons $DIR/.
diff --git a/src/Icons/entrypoint.sh b/src/Icons/entrypoint.sh
new file mode 100644
index 0000000000..339ac9a2ea
--- /dev/null
+++ b/src/Icons/entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+dotnet /app/Icons.dll