diff --git a/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/applet.js
new file mode 100644
index 0000000000..0f2b2e2383
--- /dev/null
+++ b/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/applet.js
@@ -0,0 +1,51 @@
+const Applet = imports.ui.applet;
+const Gio = imports.gi.Gio;
+const PopupMenu = imports.ui.popupMenu;
+const Util = imports.misc.util;
+const St = imports.gi.St;
+
+class NightLightSwitch extends Applet.IconApplet {
+  constructor(metadata, orientation, panelHeight, instance_id) {
+    super(orientation, panelHeight, instance_id);
+
+    this.gsettings = Gio.Settings.new("org.cinnamon.settings-daemon.plugins.color");
+    this.nightLightEnabled = this.gsettings.get_boolean("night-light-enabled");
+    this.connectColorID = this.gsettings.connect("changed", () => this.set_icon());
+    this.set_icon();
+
+    let items = this._applet_context_menu._getMenuItems();
+    if (this.context_menu_item_configure == null) {
+      this.context_menu_item_configure = new PopupMenu.PopupIconMenuItem(_("Configure..."),
+        "system-run",
+        St.IconType.SYMBOLIC);
+      this.context_menu_item_configure.connect('activate',
+        () => { Util.spawnCommandLineAsync("cinnamon-settings nightlight"); }
+      );
+    }
+    if (items.indexOf(this.context_menu_item_configure) == -1) {
+      this._applet_context_menu.addMenuItem(this.context_menu_item_configure);
+    }
+  }
+
+  on_applet_clicked() {
+    this.gsettings.set_boolean("night-light-enabled", !this.nightLightEnabled);
+    this.set_icon();
+  }
+
+  set_icon() {
+    this.nightLightEnabled = this.gsettings.get_boolean("night-light-enabled");
+    if (this.nightLightEnabled) {
+      this.set_applet_icon_symbolic_name("night-light-2");
+    } else {
+      this.set_applet_icon_symbolic_name("night-light-disabled-2");
+    }
+  }
+
+  on_applet_removed_from_panel() {
+    this.gsettings.disconnect(this.connectColorID);
+  }
+}
+
+function main(metadata, orientation, panel_height, instance_id) {
+    return new NightLightSwitch(metadata, orientation, panel_height, instance_id);
+}
diff --git a/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/icons/night-light-2-symbolic.svg b/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/icons/night-light-2-symbolic.svg
new file mode 100644
index 0000000000..4cd3b351b3
--- /dev/null
+++ b/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/icons/night-light-2-symbolic.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="M8 3a5 5 0 1 0 0 10A5 5 0 0 0 8 3zM6.951 4a3.589 3.589 0 0 0-.691 3.195 3.596 3.596 0 0 0 4.402 2.543c.49-.133.946-.37 1.338-.691a4.084 4.084 0 0 1-2.861 2.814A4.081 4.081 0 0 1 6.951 4zM8.5 0h-1v2h1zm4.803 1.99l-1.414 1.414.707.707 1.415-1.414zm-10.606 0l-.707.707 1.414 1.414.707-.707zM16 7.5h-2v1h2zm-14 0H0v1h2zm10.596 4.389l-.707.707 1.414 1.414.707-.707zm-9.192 0L1.99 13.303l.707.707 1.414-1.414zm5.096 2.11h-1v2h1z" fill="gray"/>
+</svg>
diff --git a/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/icons/night-light-disabled-2-symbolic.svg b/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/icons/night-light-disabled-2-symbolic.svg
new file mode 100644
index 0000000000..f44544983e
--- /dev/null
+++ b/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/icons/night-light-disabled-2-symbolic.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.5 0v2h1v-2h-1zm7.5352 1.0352-13.879 13.879 0.70703 0.70703 3.4336-3.4316a5 5 0 0 0 2.7031 0.81055 5 5 0 0 0 4.1836-7.6973l3.5586-3.5605-0.70703-0.70703zm-12.338 0.95508-0.70703 0.70703 1.4141 1.4141 0.70703-0.70703-1.4141-1.4141zm5.3027 1.0098a5 5 0 0 0-4.1582 7.7422l0.78516-0.78516a4.081 4.081 0 0 1 2.3242-5.957 3.589 3.589 0 0 0-0.69141 3.1953 3.596 3.596 0 0 0 0.33008 0.79883l4.1582-4.1582a5 5 0 0 0-2.748-0.83594zm-8 4.5v1h2v-1h-2zm14 0v1h2v-1h-2zm-2 1.5469a4.084 4.084 0 0 1-2.8613 2.8145 4.081 4.081 0 0 1-3.0625-0.45117l1.9902-1.9902a3.596 3.596 0 0 0 2.5957 0.31836c0.49-0.133 0.94589-0.37041 1.3379-0.69141zm0.5957 2.8418-0.70703 0.70703 1.4141 1.4141 0.70703-0.70703-1.4141-1.4141zm-5.0957 2.1094v2h1v-2h-1z" fill="#808080"/>
+</svg>
diff --git a/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/metadata.json b/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/metadata.json
new file mode 100644
index 0000000000..13ebaf9bae
--- /dev/null
+++ b/files/usr/share/cinnamon/applets/nightlight@cinnamon.org/metadata.json
@@ -0,0 +1,8 @@
+{
+    "description": "Activate/deactivate Night Light mode.",
+    "icon": "cs-nightlight",
+    "max-instances": "1",
+    "hide-configuration": true,
+    "uuid": "nightlight@cinnamon.org",
+    "name": "Night Light"
+}