diff --git a/.changeset/hip-socks-fix.md b/.changeset/hip-socks-fix.md
deleted file mode 100644
index b920a4489..000000000
--- a/.changeset/hip-socks-fix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@primer/octicons": minor
----
-
-Added missing 24px version of shield-slash-24.svg
diff --git a/.changeset/selfish-goats-jump.md b/.changeset/selfish-goats-jump.md
deleted file mode 100644
index 1df339d80..000000000
--- a/.changeset/selfish-goats-jump.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-"@primer/octicons": major
----
-
-Update icon naming conventions for Tracks and Tracked By:
-
-- `issue-tracked-by` → `issue-tracks`
-- `issue-tracked-in` → `issue-tracked-by`
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b00026d1..1e96fc7f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 18.0.0
+
+### Major Changes
+
+- [#914](https://github.com/primer/octicons/pull/914) [`4d558ed9`](https://github.com/primer/octicons/commit/4d558ed962593dedde3d294194dce7c9419ee355) Thanks [@omerbensaadon](https://github.com/omerbensaadon)! - Update icon naming conventions for Tracks and Tracked By:
+
+  - `issue-tracked-by` → `issue-tracks`
+  - `issue-tracked-in` → `issue-tracked-by`
+
+### Minor Changes
+
+- [#924](https://github.com/primer/octicons/pull/924) [`6b494dfe`](https://github.com/primer/octicons/commit/6b494dfe07735fd343889678bfb0d13561396dc8) Thanks [@CameronFoxly](https://github.com/CameronFoxly)! - Added missing 24px version of shield-slash-24.svg
+
 ## 17.12.0
 
 ### Minor Changes
diff --git a/lib/octicons_gem/lib/octicons/version.rb b/lib/octicons_gem/lib/octicons/version.rb
index 972ecdd7b..2b5f8ee4a 100644
--- a/lib/octicons_gem/lib/octicons/version.rb
+++ b/lib/octicons_gem/lib/octicons/version.rb
@@ -1,3 +1,3 @@
 module Octicons
-  VERSION = "17.12.0".freeze
+  VERSION = "18.0.0".freeze
 end
diff --git a/lib/octicons_helper/Gemfile b/lib/octicons_helper/Gemfile
index 8353de9ed..da6c1da5c 100644
--- a/lib/octicons_helper/Gemfile
+++ b/lib/octicons_helper/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "octicons", "17.12.0"
+gem "octicons", "18.0.0"
 gem "rails"
 
 group :development, :test do
diff --git a/lib/octicons_helper/lib/octicons_helper/version.rb b/lib/octicons_helper/lib/octicons_helper/version.rb
index a638e3cf6..745180398 100644
--- a/lib/octicons_helper/lib/octicons_helper/version.rb
+++ b/lib/octicons_helper/lib/octicons_helper/version.rb
@@ -1,3 +1,3 @@
 module OcticonsHelper
-  VERSION = "17.12.0".freeze
+  VERSION = "18.0.0".freeze
 end
diff --git a/lib/octicons_helper/octicons_helper.gemspec b/lib/octicons_helper/octicons_helper.gemspec
index 8017f0743..27caa72f4 100644
--- a/lib/octicons_helper/octicons_helper.gemspec
+++ b/lib/octicons_helper/octicons_helper.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_dependency "octicons", "17.12.0"
+  s.add_dependency "octicons", "18.0.0"
   s.add_dependency "railties"
   s.add_dependency "actionview"
 end
diff --git a/lib/octicons_jekyll/Gemfile b/lib/octicons_jekyll/Gemfile
index 5209b3ef1..caf02d32f 100644
--- a/lib/octicons_jekyll/Gemfile
+++ b/lib/octicons_jekyll/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "octicons", "17.12.0"
+gem "octicons", "18.0.0"
 
 group :development, :test do
   gem "minitest"
diff --git a/lib/octicons_jekyll/jekyll-octicons.gemspec b/lib/octicons_jekyll/jekyll-octicons.gemspec
index 4dc4dd033..7eee7d966 100644
--- a/lib/octicons_jekyll/jekyll-octicons.gemspec
+++ b/lib/octicons_jekyll/jekyll-octicons.gemspec
@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "jekyll", ">= 3.6", "< 5.0"
-  s.add_dependency "octicons", "17.12.0"
+  s.add_dependency "octicons", "18.0.0"
 end
diff --git a/lib/octicons_jekyll/lib/jekyll-octicons/version.rb b/lib/octicons_jekyll/lib/jekyll-octicons/version.rb
index 33c298cdc..01eb92e1b 100644
--- a/lib/octicons_jekyll/lib/jekyll-octicons/version.rb
+++ b/lib/octicons_jekyll/lib/jekyll-octicons/version.rb
@@ -3,6 +3,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class Octicons < Liquid::Tag
-    VERSION = "17.12.0".freeze
+    VERSION = "18.0.0".freeze
   end
 end
diff --git a/lib/octicons_node/package.json b/lib/octicons_node/package.json
index f462a0a80..058925852 100644
--- a/lib/octicons_node/package.json
+++ b/lib/octicons_node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons",
-  "version": "17.12.0",
+  "version": "18.0.0",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://primer.style/octicons",
   "author": "GitHub Inc.",
diff --git a/lib/octicons_react/package.json b/lib/octicons_react/package.json
index dbefad8d5..64541944d 100644
--- a/lib/octicons_react/package.json
+++ b/lib/octicons_react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons-react",
-  "version": "17.12.0",
+  "version": "18.0.0",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://primer.style/octicons",
   "author": "GitHub, Inc.",
diff --git a/package.json b/package.json
index 56eb088d4..2d3dbbad9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons",
-  "version": "17.12.0",
+  "version": "18.0.0",
   "publishConfig": {
     "registry": "no registry, don't publish from this package.json."
   },