diff --git a/static/atomicons.woff b/static/atomicons.woff
new file mode 100755
index 000000000..c4fc20cea
Binary files /dev/null and b/static/atomicons.woff differ
diff --git a/static/octicons.less b/static/octicons.less
index 87e8dab9a..a9aaf05eb 100644
--- a/static/octicons.less
+++ b/static/octicons.less
@@ -11,6 +11,31 @@
 // Find: @([a-z-]+): "[^"]+";
 // Replace: .make-icon(\1);
 
+
+// Atomicons (private)
+
+.make-icon(type-array);
+.make-icon(type-boolean);
+.make-icon(type-class);
+.make-icon(type-constant);
+.make-icon(type-constructor);
+.make-icon(type-enum);
+.make-icon(type-field);
+.make-icon(type-file);
+.make-icon(type-function);
+.make-icon(type-interface);
+.make-icon(type-method);
+.make-icon(type-module);
+.make-icon(type-namespace);
+.make-icon(type-number);
+.make-icon(type-package);
+.make-icon(type-property);
+.make-icon(type-string);
+.make-icon(type-variable);
+
+
+// Octicons
+
 .make-icon(alert);
 .make-icon(alignment-align);
 .make-icon(alignment-aligned-to);
diff --git a/static/scaffolding.less b/static/scaffolding.less
index e2b337d00..ecc79b6e2 100644
--- a/static/scaffolding.less
+++ b/static/scaffolding.less
@@ -2,11 +2,12 @@
 @import "octicon-mixins";
 
 //
-// Octicon font
+// Icon fonts
 // --------------------------------------------------
 
 @font-face { .octicon-font-legacy(); } // keep for backwards compatibility
 @font-face { .octicon-font(); }
+@font-face { .atomicon-font(); } // Private
 
 
 //
diff --git a/static/variables/octicon-mixins.less b/static/variables/octicon-mixins.less
index 672a2cef6..8a47b6e81 100644
--- a/static/variables/octicon-mixins.less
+++ b/static/variables/octicon-mixins.less
@@ -46,3 +46,10 @@
   font-weight: normal;
   font-style: normal;
 }
+
+.atomicon-font() {
+  font-family: 'Octicons Regular';
+  src: url('atomicons.woff') format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/static/variables/octicon-utf-codes.less b/static/variables/octicon-utf-codes.less
index 18c859737..95691175d 100644
--- a/static/variables/octicon-utf-codes.less
+++ b/static/variables/octicon-utf-codes.less
@@ -1,3 +1,28 @@
+
+// Atomicons (private)
+
+@type-array: "\e900";
+@type-boolean: "\e901";
+@type-class: "\e902";
+@type-constant: "\e903";
+@type-constructor: "\e904";
+@type-enum: "\e905";
+@type-field: "\e906";
+@type-file: "\e907";
+@type-function: "\e908";
+@type-interface: "\e909";
+@type-method: "\e90a";
+@type-module: "\e90b";
+@type-namespace: "\e90c";
+@type-number: "\e90d";
+@type-package: "\e90e";
+@type-property: "\e90f";
+@type-string: "\e910";
+@type-variable: "\e911";
+
+
+// Octicons
+
 @alert: "\f02d";
 @alignment-align: "\f08a";
 @alignment-aligned-to: "\f08e";