diff --git a/Fonts/Octicons.ttf b/Fonts/Octicons.ttf
index ff0dda1..5b1f7d6 100644
Binary files a/Fonts/Octicons.ttf and b/Fonts/Octicons.ttf differ
diff --git a/Octicons.js b/Octicons.js
index 163510e..4422bc9 100644
--- a/Octicons.js
+++ b/Octicons.js
@@ -6,7 +6,7 @@
 import createIconSet from './lib/create-icon-set';
 import glyphMap from './glyphmaps/Octicons.json';
 
-const iconSet = createIconSet(glyphMap, 'octicons', 'Octicons.ttf');
+const iconSet = createIconSet(glyphMap, 'Octicons', 'Octicons.ttf');
 
 export default iconSet;
 
diff --git a/README.md b/README.md
index 3e027db..5993bb7 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Perfect for buttons, logos and nav/tab bars. Easy to extend, style and integrate
 * [`Ionicons`](http://ionicframework.com/docs/v2/ionicons/) by Ben Sperry (v3.0.0, **859** icons)
 * [`MaterialIcons`](https://www.google.com/design/icons/) by Google, Inc. (v3.0.1, **932** icons)
 * [`MaterialCommunityIcons`](https://materialdesignicons.com/) by MaterialDesignIcons.com (v1.7.22, **1722** icons)
-* [`Octicons`](http://octicons.github.com) by Github, Inc. (v4.4.0, **172** icons)
+* [`Octicons`](http://octicons.github.com) by Github, Inc. (v5.0.1, **176** icons)
 * [`Zocial`](http://zocial.smcllns.com/) by Sam Collins (v1.0, **100** icons)
 * [`SimpleLineIcons`](http://simplelineicons.com/) by Sabbir & Contributors (v2.4.1, **189** icons)
 
diff --git a/glyphmaps/Octicons.json b/glyphmaps/Octicons.json
index b19b6eb..e40e267 100644
--- a/glyphmaps/Octicons.json
+++ b/glyphmaps/Octicons.json
@@ -1,174 +1,178 @@
 {
-  "alert": 61485,
-  "arrow-down": 61503,
-  "arrow-left": 61504,
-  "arrow-right": 61502,
-  "arrow-small-down": 61600,
-  "arrow-small-left": 61601,
-  "arrow-small-right": 61553,
-  "arrow-small-up": 61599,
-  "arrow-up": 61501,
-  "beaker": 61661,
-  "bell": 61662,
-  "bold": 61666,
-  "book": 61447,
-  "bookmark": 61563,
-  "briefcase": 61651,
-  "broadcast": 61512,
-  "browser": 61637,
-  "bug": 61585,
-  "calendar": 61544,
-  "check": 61498,
-  "checklist": 61558,
-  "chevron-down": 61603,
-  "chevron-left": 61604,
-  "chevron-right": 61560,
-  "chevron-up": 61602,
-  "circle-slash": 61572,
-  "circuit-board": 61654,
-  "clippy": 61493,
-  "clock": 61510,
-  "cloud-download": 61451,
-  "cloud-upload": 61452,
-  "code": 61535,
-  "comment-discussion": 61519,
-  "comment": 61483,
-  "credit-card": 61509,
-  "dash": 61642,
-  "dashboard": 61565,
-  "database": 61590,
-  "desktop-download": 61660,
-  "device-camera-video": 61527,
-  "device-camera": 61526,
-  "device-desktop": 62076,
-  "device-mobile": 61496,
-  "diff-added": 61547,
-  "diff-ignored": 61593,
-  "diff-modified": 61549,
-  "diff-removed": 61548,
-  "diff-renamed": 61550,
-  "diff": 61517,
-  "ellipses": 61697,
-  "ellipsis": 61594,
-  "eye": 61518,
-  "file-binary": 61588,
-  "file-code": 61456,
-  "file-directory": 61462,
-  "file-media": 61458,
-  "file-pdf": 61460,
-  "file-submodule": 61463,
-  "file-symlink-directory": 61617,
-  "file-symlink-file": 61616,
-  "file-text": 61457,
-  "file-zip": 61459,
-  "file": 61698,
-  "flame": 61650,
-  "fold": 61644,
-  "gear": 61487,
-  "gift": 61506,
-  "gist-secret": 61580,
-  "gist": 61454,
-  "git-branch": 61472,
-  "git-commit": 61471,
-  "git-compare": 61612,
-  "git-merge": 61475,
-  "git-pull-request": 61449,
-  "globe": 61622,
-  "grabber": 61699,
-  "graph": 61507,
-  "heart": 9829,
-  "history": 61566,
-  "home": 61581,
-  "horizontal-rule": 61552,
-  "hubot": 61597,
-  "inbox": 61647,
-  "info": 61529,
-  "issue-closed": 61480,
-  "issue-opened": 61478,
-  "issue-reopened": 61479,
-  "italic": 61668,
-  "jersey": 61465,
-  "key": 61513,
-  "keyboard": 61453,
-  "law": 61656,
-  "light-bulb": 61440,
-  "link-external": 61567,
-  "link": 61532,
-  "list-ordered": 61538,
-  "list-unordered": 61537,
-  "location": 61536,
-  "lock": 61546,
-  "logo-gist": 61613,
-  "logo-github": 61586,
-  "mail-read": 61500,
-  "mail-reply": 61521,
-  "mail": 61499,
-  "mark-github": 61450,
-  "markdown": 61641,
-  "megaphone": 61559,
-  "mention": 61630,
-  "milestone": 61557,
-  "mirror": 61476,
-  "mortar-board": 61655,
-  "mute": 61568,
-  "no-newline": 61596,
-  "octoface": 61448,
-  "organization": 61495,
-  "package": 61636,
-  "paintcan": 61649,
-  "pencil": 61528,
-  "person": 61464,
-  "pin": 61505,
-  "plug": 61652,
-  "plus-small": 61700,
-  "plus": 61533,
-  "primitive-dot": 61522,
-  "primitive-square": 61523,
-  "pulse": 61573,
-  "question": 61484,
-  "quote": 61539,
-  "radio-tower": 61488,
-  "reply": 61701,
-  "repo-clone": 61516,
-  "repo-force-push": 61514,
-  "repo-forked": 61442,
-  "repo-pull": 61446,
-  "repo-push": 61445,
-  "repo": 61441,
-  "rocket": 61491,
-  "rss": 61492,
-  "ruby": 61511,
-  "search": 61486,
-  "server": 61591,
-  "settings": 61564,
-  "shield": 61665,
-  "sign-in": 61494,
-  "sign-out": 61490,
-  "smiley": 61671,
-  "squirrel": 61618,
-  "star": 61482,
-  "stop": 61583,
-  "sync": 61575,
-  "tag": 61461,
-  "tasklist": 61669,
-  "telescope": 61576,
-  "terminal": 61640,
-  "text-size": 61667,
-  "three-bars": 61534,
-  "thumbsdown": 61659,
-  "thumbsup": 61658,
-  "tools": 61489,
-  "trashcan": 61648,
-  "triangle-down": 61531,
-  "triangle-left": 61508,
-  "triangle-right": 61530,
-  "triangle-up": 61610,
-  "unfold": 61497,
-  "unmute": 61626,
-  "unverified": 61672,
-  "verified": 61670,
-  "versions": 61540,
-  "watch": 61664,
-  "x": 61569,
-  "zap": 9889
+  "alert": 61696,
+  "arrow-down": 61697,
+  "arrow-left": 61698,
+  "arrow-right": 61699,
+  "arrow-small-down": 61700,
+  "arrow-small-left": 61701,
+  "arrow-small-right": 61702,
+  "arrow-small-up": 61703,
+  "arrow-up": 61704,
+  "beaker": 61705,
+  "bell": 61706,
+  "bold": 61707,
+  "book": 61708,
+  "bookmark": 61709,
+  "briefcase": 61710,
+  "broadcast": 61711,
+  "browser": 61712,
+  "bug": 61713,
+  "calendar": 61714,
+  "check": 61715,
+  "checklist": 61716,
+  "chevron-down": 61717,
+  "chevron-left": 61718,
+  "chevron-right": 61719,
+  "chevron-up": 61720,
+  "circle-slash": 61721,
+  "circuit-board": 61722,
+  "clippy": 61723,
+  "clock": 61724,
+  "cloud-download": 61725,
+  "cloud-upload": 61726,
+  "code": 61727,
+  "comment": 61728,
+  "comment-discussion": 61729,
+  "credit-card": 61730,
+  "dash": 61731,
+  "dashboard": 61732,
+  "database": 61733,
+  "desktop-download": 61734,
+  "device-camera": 61735,
+  "device-camera-video": 61736,
+  "device-desktop": 61737,
+  "device-mobile": 61738,
+  "diff": 61739,
+  "diff-added": 61740,
+  "diff-ignored": 61741,
+  "diff-modified": 61742,
+  "diff-removed": 61743,
+  "diff-renamed": 61744,
+  "ellipses": 61745,
+  "ellipsis": 61746,
+  "eye": 61747,
+  "file": 61748,
+  "file-binary": 61749,
+  "file-code": 61750,
+  "file-directory": 61751,
+  "file-media": 61752,
+  "file-pdf": 61753,
+  "file-submodule": 61754,
+  "file-symlink-directory": 61755,
+  "file-symlink-file": 61756,
+  "file-text": 61757,
+  "file-zip": 61758,
+  "flame": 61759,
+  "fold": 61760,
+  "gear": 61761,
+  "gift": 61762,
+  "gist": 61763,
+  "gist-secret": 61764,
+  "git-branch": 61765,
+  "git-commit": 61766,
+  "git-compare": 61767,
+  "git-merge": 61768,
+  "git-pull-request": 61769,
+  "globe": 61770,
+  "grabber": 61771,
+  "graph": 61772,
+  "heart": 61773,
+  "history": 61774,
+  "home": 61775,
+  "horizontal-rule": 61776,
+  "hubot": 61777,
+  "inbox": 61778,
+  "info": 61779,
+  "issue-closed": 61780,
+  "issue-opened": 61781,
+  "issue-reopened": 61782,
+  "italic": 61783,
+  "jersey": 61784,
+  "key": 61785,
+  "keyboard": 61786,
+  "law": 61787,
+  "light-bulb": 61788,
+  "link": 61789,
+  "link-external": 61790,
+  "list-ordered": 61791,
+  "list-unordered": 61792,
+  "location": 61793,
+  "lock": 61794,
+  "logo-gist": 61795,
+  "logo-github": 61796,
+  "mail": 61797,
+  "mail-read": 61798,
+  "mail-reply": 61799,
+  "mark-github": 61800,
+  "markdown": 61801,
+  "megaphone": 61802,
+  "mention": 61803,
+  "milestone": 61804,
+  "mirror": 61805,
+  "mortar-board": 61806,
+  "mute": 61807,
+  "no-newline": 61808,
+  "note": 61809,
+  "octoface": 61810,
+  "organization": 61811,
+  "package": 61812,
+  "paintcan": 61813,
+  "pencil": 61814,
+  "person": 61815,
+  "pin": 61816,
+  "plug": 61817,
+  "plus": 61818,
+  "plus-small": 61819,
+  "primitive-dot": 61820,
+  "primitive-square": 61821,
+  "project": 61822,
+  "pulse": 61823,
+  "question": 61824,
+  "quote": 61825,
+  "radio-tower": 61826,
+  "reply": 61827,
+  "repo": 61828,
+  "repo-clone": 61829,
+  "repo-force-push": 61830,
+  "repo-forked": 61831,
+  "repo-pull": 61832,
+  "repo-push": 61833,
+  "rocket": 61834,
+  "rss": 61835,
+  "ruby": 61836,
+  "screen-full": 61837,
+  "screen-normal": 61838,
+  "search": 61839,
+  "server": 61840,
+  "settings": 61841,
+  "shield": 61842,
+  "sign-in": 61843,
+  "sign-out": 61844,
+  "smiley": 61845,
+  "squirrel": 61846,
+  "star": 61847,
+  "stop": 61848,
+  "sync": 61849,
+  "tag": 61850,
+  "tasklist": 61851,
+  "telescope": 61852,
+  "terminal": 61853,
+  "text-size": 61854,
+  "three-bars": 61855,
+  "thumbsdown": 61856,
+  "thumbsup": 61857,
+  "tools": 61858,
+  "trashcan": 61859,
+  "triangle-down": 61860,
+  "triangle-left": 61861,
+  "triangle-right": 61862,
+  "triangle-up": 61863,
+  "unfold": 61864,
+  "unmute": 61865,
+  "unverified": 61866,
+  "verified": 61867,
+  "versions": 61868,
+  "watch": 61869,
+  "x": 61870,
+  "zap": 61871
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 3d8ee88..2d61387 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "build-materialicons": "node generate-material-icons node_modules/material-design-icons/iconfont/codepoints --componentName=MaterialIcons --fontFamily='Material Icons' --template=templates/separated-icon-set.tpl --glyphmap=glyphmaps/MaterialIcons.json > MaterialIcons.js && cp node_modules/material-design-icons/iconfont/MaterialIcons-Regular.ttf Fonts/MaterialIcons.ttf",
     "build-materialcommunityicons": "node generate-icon node_modules/mdi/css/materialdesignicons.css --prefix=.mdi- --componentName=MaterialCommunityIcons --fontFamily='Material Design Icons' --template=templates/separated-icon-set.tpl --glyphmap=glyphmaps/MaterialCommunityIcons.json > MaterialCommunityIcons.js && cp node_modules/mdi/fonts/materialdesignicons-webfont.ttf Fonts/MaterialCommunityIcons.ttf",
     "build-octicons": "node generate-icon node_modules/octicons/build/font/octicons.css --prefix=.octicon- --componentName=Octicons --fontFamily=octicons --template=templates/separated-icon-set.tpl --glyphmap=glyphmaps/Octicons.json > Octicons.js && cp node_modules/octicons/build/font/octicons.ttf Fonts/Octicons.ttf",
+    "build-octicons": "fontcustom compile node_modules/octicons/build/svg -o tmp -n Octicons -t css -h && node generate-icon tmp/Octicons.css --prefix=.icon- --componentName=Octicons --template=templates/separated-icon-set.tpl --glyphmap=glyphmaps/Octicons.json --fontFamily=Octicons > Octicons.js && cp tmp/Octicons.ttf Fonts && rm -rf {tmp,.fontcustom-manifest.json}",
     "build-zocial": "node generate-icon bower_components/css-social-buttons/css/zocial.css --prefix=.zocial. --componentName=Zocial --fontFamily=zocial --template=templates/separated-icon-set.tpl --glyphmap=glyphmaps/Zocial.json > Zocial.js && cp bower_components/css-social-buttons/css/zocial.ttf Fonts/Zocial.ttf",
     "build-simplelineicons": "node generate-icon bower_components/simple-line-icons/css/simple-line-icons.css --prefix=.icon- --componentName=SimpleLineIcons --fontFamily=simple-line-icons --template=templates/separated-icon-set.tpl --glyphmap=glyphmaps/SimpleLineIcons.json > SimpleLineIcons.js && cp bower_components/simple-line-icons/fonts/Simple-Line-Icons.ttf Fonts/SimpleLineIcons.ttf"
   },
@@ -73,6 +74,6 @@
     "ionicons": "^3.0.0",
     "material-design-icons": "^3.0.1",
     "mdi": "1.7.22",
-    "octicons": "^4.4.0"
+    "octicons": "^5.0.1"
   }
 }