diff --git a/README.md b/README.md
index a691ed70..6c994e91 100644
--- a/README.md
+++ b/README.md
@@ -15,3 +15,5 @@ The "object-fit-basics" directory contains a simple page demonstrating typical u
The "object-fit-gallery" directory contains a fun image gallery that uses object-fit
to display the images more nicely, both in thumbnail and full size view. [Run the example live](http://mdn.github.io/css-examples/object-fit-gallery/).
The "overscroll-behavior" directory contains a simple page demonstrating typical usage of different overscroll-behavior
values. [Run example live](http://mdn.github.io/css-examples/overscroll-behavior/).
+
+The "tools" directory contains various tools for working with CSS, including a [color picker](http://mdn.github.io/css-examples/tools/color-picker/) and a [box shadow generator](http://mdn.github.io/css-examples/tools/box-shadow-generator/).
diff --git a/tools/border-image-generator/arrow-down-white.png b/tools/border-image-generator/arrow-down-white.png
new file mode 100644
index 00000000..ab65bddb
Binary files /dev/null and b/tools/border-image-generator/arrow-down-white.png differ
diff --git a/tools/border-image-generator/arrow-right-white.png b/tools/border-image-generator/arrow-right-white.png
new file mode 100644
index 00000000..81210232
Binary files /dev/null and b/tools/border-image-generator/arrow-right-white.png differ
diff --git a/tools/border-image-generator/arrow-up-white.png b/tools/border-image-generator/arrow-up-white.png
new file mode 100644
index 00000000..74749e5c
Binary files /dev/null and b/tools/border-image-generator/arrow-up-white.png differ
diff --git a/tools/border-image-generator/arrows.png b/tools/border-image-generator/arrows.png
new file mode 100644
index 00000000..30d630fd
Binary files /dev/null and b/tools/border-image-generator/arrows.png differ
diff --git a/tools/border-image-generator/border-image-1.png b/tools/border-image-generator/border-image-1.png
new file mode 100644
index 00000000..3e2e1e81
Binary files /dev/null and b/tools/border-image-generator/border-image-1.png differ
diff --git a/tools/border-image-generator/border-image-2.png b/tools/border-image-generator/border-image-2.png
new file mode 100644
index 00000000..64f16111
Binary files /dev/null and b/tools/border-image-generator/border-image-2.png differ
diff --git a/tools/border-image-generator/border-image-3.png b/tools/border-image-generator/border-image-3.png
new file mode 100644
index 00000000..847675cb
Binary files /dev/null and b/tools/border-image-generator/border-image-3.png differ
diff --git a/tools/border-image-generator/border-image-4.png b/tools/border-image-generator/border-image-4.png
new file mode 100644
index 00000000..c11d34b0
Binary files /dev/null and b/tools/border-image-generator/border-image-4.png differ
diff --git a/tools/border-image-generator/border-image-5.png b/tools/border-image-generator/border-image-5.png
new file mode 100644
index 00000000..05984183
Binary files /dev/null and b/tools/border-image-generator/border-image-5.png differ
diff --git a/tools/border-image-generator/border-image-6.svg b/tools/border-image-generator/border-image-6.svg
new file mode 100644
index 00000000..f208646b
--- /dev/null
+++ b/tools/border-image-generator/border-image-6.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/tools/border-image-generator/checked.png b/tools/border-image-generator/checked.png
new file mode 100644
index 00000000..cd8e8654
Binary files /dev/null and b/tools/border-image-generator/checked.png differ
diff --git a/tools/border-image-generator/close.png b/tools/border-image-generator/close.png
new file mode 100644
index 00000000..78bf9d7a
Binary files /dev/null and b/tools/border-image-generator/close.png differ
diff --git a/tools/border-image-generator/config.png b/tools/border-image-generator/config.png
new file mode 100644
index 00000000..bd4c549b
Binary files /dev/null and b/tools/border-image-generator/config.png differ
diff --git a/tools/border-image-generator/disabled.png b/tools/border-image-generator/disabled.png
new file mode 100644
index 00000000..1dd2c4c2
Binary files /dev/null and b/tools/border-image-generator/disabled.png differ
diff --git a/tools/border-image-generator/drop_arrow_icon.png b/tools/border-image-generator/drop_arrow_icon.png
new file mode 100644
index 00000000..b4dffa3f
Binary files /dev/null and b/tools/border-image-generator/drop_arrow_icon.png differ
diff --git a/tools/border-image-generator/grain.png b/tools/border-image-generator/grain.png
new file mode 100644
index 00000000..6aec29d1
Binary files /dev/null and b/tools/border-image-generator/grain.png differ
diff --git a/tools/border-image-generator/index.html b/tools/border-image-generator/index.html
new file mode 100644
index 00000000..5d7d2847
--- /dev/null
+++ b/tools/border-image-generator/index.html
@@ -0,0 +1,155 @@
+
+
+
+