--- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
@@ -76,12 +76,12 @@ CONTROL_CENTER_MODULES = [
 STANDALONE_MODULES = [
 #         Label                          Executable                          Icon                Category        Keywords for filter
     [_("Printers"),                      "system-config-printer",        "cs-printer",         "hardware",       _("printers, laser, inkjet")],
-    [_("Firewall"),                      "gufw",                         "cs-firewall",        "admin",          _("firewall, block, filter, programs")],
+    [_("Firewall"),                      "firewall-config",              "cs-firewall",        "admin",          _("firewall, block, filter, programs")],
     [_("Languages"),                     "mintlocale",                   "cs-language",        "prefs",          _("language, install, foreign")],
-    [_("Input Method"),                  "mintlocale im",                "cs-input-method",    "prefs",          _("language, install, foreign, input, method, chinese, korean, japanese, typing")],
-    [_("Login Window"),                  "gksu /usr/sbin/mdmsetup",      "cs-login",           "admin",          _("login, mdm, gdm, manager, user, password, startup, switch")],
-    [_("Driver Manager"),                "mintdrivers",                  "cs-drivers",         "admin",          _("video, driver, wifi, card, hardware, proprietary, nvidia, radeon, nouveau, fglrx")],
-    [_("Software Sources"),              "mintsources",                  "cs-sources",         "admin",          _("ppa, repository, package, source, download")],
+    [_("Sharing"),                       "gnome-control-center sharing", "cs-sharing",         "prefs",          _("sharing, screen, media, login")],
+    [_("Login Window"),                  "lightdm-gtk-greeter-settings-pkexec", "cs-login",    "admin",          _("login, lightdm, manager, settings, editor")],
+    [_("Nvidia Settings"),               "nvidia-settings",              "cs-drivers",         "admin",          _("video, driver, proprietary, nvidia, settings")],
+    [_("Package Management"),            "yumex-dnf",                    "cs-sources",         "admin",          _("update, install, repository, package, source, download")],
     [_("Users and Groups"),              "cinnamon-settings-users",      "cs-user-accounts",   "admin",          _("user, users, account, accounts, group, groups, password")],
     [_("Bluetooth"),                     "blueberry",                    "cs-bluetooth",       "hardware",       _("bluetooth, dongle, transfer, mobile")]
 ]
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -49,6 +49,7 @@
 	hicolor_categories_scalable_cs-overview.svg \
 	hicolor_categories_scalable_cs-panel.svg \
 	hicolor_categories_scalable_cs-power.svg \
+	hicolor_categories_scalable_cs-sharing.svg \
 	hicolor_categories_scalable_cs-printer.svg \
 	hicolor_categories_scalable_cs-privacy.svg \
 	hicolor_categories_scalable_cs-region.svg \

--- /dev/null
+++ b/data/icons/hicolor_categories_scalable_cs-sharing.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   viewBox="0 0 96 96"
+   height="96"
+   width="96"
+   version="1.1"
+   id="svg3419">
+  <metadata
+     id="metadata3425">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3423" />
+  <image
+     y="0"
+     x="0"
+     id="image3427"
+     xlink:href="data:image/png;base64,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
+lsvRj1KCn+vnKhYpYqCjFyYfe+U74xkfg1fusloCS7X/Qg70/L6YJSRVTqmiSkpVH6jloGtRTI94
+Hs2OZmP5exOl6FNJcQrkySQHH3/l8USiapr2k4mWJlDdB7UkpAUoLEVwloTsU5mN2gdtdSaZnrEC
+VsRUTQwMdAwKFNDJk9ZHzp985vRrVtafqt3qjKj3kjPnVZEtz/MeIBYtXT6rQ3zVNZTtpetZqdHM
+0ejVeEe0ORwJqQGhCOE5VrGQmZgcnLlgjdak8lbJ4gRmPz4f/nwSS4mLRGlWAoFTM0d4s7bTJVPM
+TMhxJRaIyKoksKy8mbJmvARJUn4o3JqT0jinB7wFWrOcurkwVJe5eQjeHHUrZy6V8mdKtlH2p1Ub
+hSIKJiY6eTKEHc0JmmrJa8NEJ0eaFEmSZChQ9O1qpTcEi5vRhcbBcmvh2nJzr1LNWChNv3Jlfgj6
+eyilfCcPmyIGefLk/HT2IlYlsbRkd13BUhPZYvNwLREWIDH3reoy86e82UFe2lcRCL+Pir4xKvrG
+qWRpy4PYxZtPYKWe0GJ/qz2i+T7R4mZY1NAtb0jPJvO6VfanKiuz+gNLUVjOnVvYkVvcnVvo/TmW
+qeKYzoKuTif17dFyvvviJJZzpVfgUM/5XQ2fCtTaY9YU1xBYbj221DpsYVVZqM7Z5cxCazVvzrV6
+g6j6VzXJRdtiqbZarGeWJzALsDqnfjECc8nMLwXA/wPLfFNYdo2OkAAAABR0RVh0QXV0aG9yAEph
+a3ViIFN0ZWluZXLm+/cvAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA4LTI1VDExOjI5OjI5KzAx
+OjAwJK3aKAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wMy0yMlQxOTo0NDozNiswMDowMMfohEEA
+AAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAGXRFWHRUaXRsZQBTaGFyaW5n
+IHByZWZlcmVuY2VzArFd3gAAAABJRU5ErkJggg==
+"
+     preserveAspectRatio="none"
+     height="96"
+     width="96" />
+</svg>