diff --git a/PACKAGES.md b/PACKAGES.md
index 71000774..1ef0bd2e 100644
--- a/PACKAGES.md
+++ b/PACKAGES.md
@@ -397,6 +397,10 @@ This file contains a list of possible packages you may need to install to see th
 
 - [PlainTasks](https://packagecontrol.io/packages/PlainTasks)
 
+## Toit
+
+- [Toit](https://packagecontrol.io/packages/Toit)
+
 ## TOML
 
 - [TOML](https://packagecontrol.io/packages/TOML)
diff --git a/icons/icons.json b/icons/icons.json
index 7e871991..2412cd7b 100644
--- a/icons/icons.json
+++ b/icons/icons.json
@@ -3375,6 +3375,18 @@
 			}
 		]
 	},
+	"file_type_toit": {
+		"color": "orange",
+		"syntaxes": [
+			{
+				"extensions": [
+					"toit"
+				],
+				"name": "Plain Text (TOIT)",
+				"scope": "source.toit"
+			}
+		]
+	},
 	"file_type_toml": {
 		"color": "cyan",
 		"syntaxes": [
diff --git a/icons/multi/file_type_toit.png b/icons/multi/file_type_toit.png
new file mode 100644
index 00000000..585c4d9f
Binary files /dev/null and b/icons/multi/file_type_toit.png differ
diff --git a/icons/multi/file_type_toit@2x.png b/icons/multi/file_type_toit@2x.png
new file mode 100644
index 00000000..9386b01c
Binary files /dev/null and b/icons/multi/file_type_toit@2x.png differ
diff --git a/icons/multi/file_type_toit@3x.png b/icons/multi/file_type_toit@3x.png
new file mode 100644
index 00000000..07a30609
Binary files /dev/null and b/icons/multi/file_type_toit@3x.png differ
diff --git a/icons/single/file_type_toit.png b/icons/single/file_type_toit.png
new file mode 100644
index 00000000..e0d85470
Binary files /dev/null and b/icons/single/file_type_toit.png differ
diff --git a/icons/single/file_type_toit@2x.png b/icons/single/file_type_toit@2x.png
new file mode 100644
index 00000000..5f57ed9c
Binary files /dev/null and b/icons/single/file_type_toit@2x.png differ
diff --git a/icons/single/file_type_toit@3x.png b/icons/single/file_type_toit@3x.png
new file mode 100644
index 00000000..486e0ebe
Binary files /dev/null and b/icons/single/file_type_toit@3x.png differ
diff --git a/icons/svg/file_type_toit.svg b/icons/svg/file_type_toit.svg
new file mode 100644
index 00000000..a1960628
--- /dev/null
+++ b/icons/svg/file_type_toit.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" fill="#000" viewBox="0 0 16 16">
+  <path d="m 0.18,2.68 c 0.06,-0.27 0.3,-0.44 0.57,-0.44 0.05,0 0.09,0 0.14,0.02 l 6,1.44 v 0 0 C 6.93,3.7 6.96,3.71 7,3.72 7.65,3.89 8.36,3.89 9.01,3.72 9.04,3.71 9.07,3.7 9.11,3.7 v 0 0 l 6,-1.44 c 0.05,-0.01 0.1,-0.02 0.14,-0.02 0.26,0 0.5,0.17 0.57,0.44 C 15.89,2.99 15.7,3.3 15.4,3.37 L 9.39,4.81 c -0.03,0 -0.05,0.01 -0.08,0.02 -0.44,0.13 -0.74,0.54 -0.74,1 v 0.73 c 0,0.35 0.1,0.69 0.29,0.98 l 2.29,3.53 c 0.27,0.42 0.86,0.47 1.2,0.1 l 2.5,-2.69 c 0.22,-0.23 0.58,-0.25 0.81,-0.03 0.23,0.22 0.25,0.58 0.03,0.81 l -2.5,2.69 c -0.85,0.91 -2.33,0.78 -3,-0.26 L 8.11,8.48 C 8.06,8.4 7.94,8.4 7.89,8.48 l -2.08,3.21 c -0.68,1.04 -2.15,1.17 -3,0.26 L 0.31,9.26 C 0.1,9.03 0.11,8.67 0.34,8.45 0.57,8.23 0.93,8.25 1.15,8.48 l 2.5,2.69 c 0.34,0.36 0.93,0.31 1.2,-0.1 L 7.14,7.54 C 7.33,7.24 7.43,6.9 7.43,6.56 V 5.82 C 7.43,5.36 7.13,4.96 6.69,4.82 6.66,4.82 6.64,4.81 6.61,4.81 L 0.6,3.37 C 0.29,3.3 0.1,2.99 0.18,2.68 Z" />
+</svg>
diff --git a/preferences/file_type_toit.tmPreferences b/preferences/file_type_toit.tmPreferences
new file mode 100644
index 00000000..83d36e5f
--- /dev/null
+++ b/preferences/file_type_toit.tmPreferences
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+	<dict>
+		<key>scope</key>
+		<string>source.toit</string>
+		<key>settings</key>
+		<dict>
+			<key>icon</key>
+			<string>file_type_toit</string>
+		</dict>
+	</dict>
+</plist>
diff --git a/tests/file_type_toit.toit b/tests/file_type_toit.toit
new file mode 100644
index 00000000..e69de29b