diff -up gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_desktop.py.3 gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_desktop.py
--- gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_desktop.py.3	2019-06-19 18:07:40.482827754 +0200
+++ gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_desktop.py	2019-06-19 18:07:54.970827554 +0200
@@ -4,8 +4,17 @@
 # License-Filename: LICENSES/GPL-3.0
 
 from gtweak.widgets import ListBoxTweakGroup, GSettingsSwitchTweak, Title
+from gtweak.gshellwrapper import GnomeShellFactory
 
-dicons = GSettingsSwitchTweak(_("Show Icons"),"org.gnome.desktop.background","show-desktop-icons")
+_shell = GnomeShellFactory().get_shell()
+_shell_is_classic = False
+
+if (not(_shell is None)):
+	_shell_is_classic = _shell.mode == 'classic'
+
+dicons = None
+if (not(_shell_is_classic)):
+	dicons = GSettingsSwitchTweak(_("Show Icons"),"org.gnome.desktop.background","show-desktop-icons")
 
 # show-desktop-icons is in gsettings-desktop-schemas, but it won't actually
 # *work* unless we have a version of Nautilus that still has the ability to
diff -up gnome-tweaks-3.28.1/gtweak/widgets.py.3 gnome-tweaks-3.28.1/gtweak/widgets.py
--- gnome-tweaks-3.28.1/gtweak/widgets.py.3	2019-06-19 18:07:19.483828044 +0200
+++ gnome-tweaks-3.28.1/gtweak/widgets.py	2019-06-19 18:08:01.239827467 +0200
@@ -223,6 +223,9 @@ class ListBoxTweakGroup(Gtk.ListBox, Twe
     #the search cache etc)
 
     def add_tweak_row(self, t, position=None):
+        if t == None:
+            return None
+
         if self.add_tweak(t):
             if isinstance(t, Gtk.ListBoxRow):
                 row = t