diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs
index 85a69fb0a2..5565c4adf8 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs
@@ -137,6 +137,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 		void InitializeActorPreviews()
 		{
 			panel.RemoveChildren();
+			if (!selectedCategories.Any())
+				return;
 
 			var actors = mapRules.Actors.Where(a => !a.Value.Name.Contains('^'))
 				.Select(a => a.Value);
diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index c2e5dd18f4..1b3e99ab98 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -897,7 +897,7 @@
 	ScriptTriggers:
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
-		Categories: Rock
+		Categories: Decoration
 
 ^CommonHuskDefaults:
 	Inherits@1: ^SpriteActor
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 25938bc0d6..f4f0088a74 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -722,7 +722,7 @@ wall:
 			TopLeft: -512, -512
 			BottomRight: 512, 512
 	EditorTilesetFilter:
-		Categories: Wall
+		Categories: Defense
 
 medium_gun_turret:
 	Inherits: ^Defense
diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
index 6ce6ded9a8..739c1bf11e 100644
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -304,6 +304,8 @@ BARL:
 	-ShakeOnDeath:
 	-SoundOnDamageTransition:
 	-Demolishable:
+	EditorTilesetFilter:
+		Categories: Decoration
 
 BRL3:
 	Inherits: ^TechBuilding
@@ -326,6 +328,8 @@ BRL3:
 	-ShakeOnDeath:
 	-SoundOnDamageTransition:
 	-Demolishable:
+	EditorTilesetFilter:
+		Categories: Decoration
 
 AMMOBOX1:
 	Inherits: ^AmmoBox
diff --git a/mods/ra/rules/decoration.yaml b/mods/ra/rules/decoration.yaml
index 227db319da..db622c7062 100644
--- a/mods/ra/rules/decoration.yaml
+++ b/mods/ra/rules/decoration.yaml
@@ -219,6 +219,7 @@ BOXES01:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 BOXES02:
 	Inherits: ^Tree
@@ -226,6 +227,7 @@ BOXES02:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 BOXES03:
 	Inherits: ^Tree
@@ -233,6 +235,7 @@ BOXES03:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 BOXES04:
 	Inherits: ^Tree
@@ -240,6 +243,7 @@ BOXES04:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 BOXES05:
 	Inherits: ^Tree
@@ -247,6 +251,7 @@ BOXES05:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 BOXES06:
 	Inherits: ^Tree
@@ -254,6 +259,7 @@ BOXES06:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 BOXES07:
 	Inherits: ^Tree
@@ -261,6 +267,7 @@ BOXES07:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 BOXES08:
 	Inherits: ^Tree
@@ -268,6 +275,7 @@ BOXES08:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 BOXES09:
 	Inherits: ^Tree
@@ -275,6 +283,7 @@ BOXES09:
 		Name: Boxes
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 ICE01:
 	Inherits: ^Tree
@@ -285,6 +294,7 @@ ICE01:
 		Name: Ice Floe
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT, INTERIOR
+		Categories: Decoration
 
 ICE02:
 	Inherits: ^Tree
@@ -295,6 +305,7 @@ ICE02:
 		Name: Ice Floe
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT, INTERIOR
+		Categories: Decoration
 
 ICE03:
 	Inherits: ^Tree
@@ -305,6 +316,7 @@ ICE03:
 		Name: Ice Floe
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT, INTERIOR
+		Categories: Decoration
 
 ICE04:
 	Inherits: ^Tree
@@ -312,6 +324,7 @@ ICE04:
 		Name: Ice Floe
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT, INTERIOR
+		Categories: Decoration
 
 ICE05:
 	Inherits: ^Tree
@@ -319,6 +332,7 @@ ICE05:
 		Name: Ice Floe
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT, INTERIOR
+		Categories: Decoration
 
 ROCK1:
 	Inherits: ^Rock
@@ -368,6 +382,7 @@ UTILPOL1:
 		Name: Utility Pole
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 UTILPOL2:
 	Inherits: ^Tree
@@ -375,6 +390,7 @@ UTILPOL2:
 		Name: Utility Pole
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+		Categories: Decoration
 
 TANKTRAP1:
 	Inherits: ^Rock
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 61cb8319b7..3fed74f188 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -693,7 +693,7 @@
 		ClosingSound: cashturn.aud
 		TerrainTypes: Clear, Road
 	EditorTilesetFilter:
-		Categories: Gate
+		Categories: Wall
 
 ^TechBuilding:
 	Inherits: ^BasicBuilding
@@ -759,6 +759,8 @@
 		Type: Light
 	Targetable:
 		TargetTypes: Ground, DetonateAttack
+	EditorTilesetFilter:
+		Categories: Decoration
 
 ^CivBuilding:
 	Inherits: ^TechBuilding
@@ -952,7 +954,7 @@
 	ScriptTriggers:
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
-		Categories: Rock
+		Categories: Decoration
 
 ^DesertCivBuilding:
 	Inherits: ^CivBuilding
diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml
index 237c2700de..8237f96ccc 100644
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -195,7 +195,7 @@ FLARE:
 		ShowOwnerRow: false
 	AutoSelectionSize:
 	EditorTilesetFilter:
-		Categories: System
+		Categories: Decoration
 
 MINE:
 	Inherits@1: ^SpriteActor
@@ -395,4 +395,4 @@ CTFLAG:
 	-SelectionDecorations:
 	-Targetable:
 	EditorTilesetFilter:
-		Categories: System
\ No newline at end of file
+		Categories: Decoration
\ No newline at end of file
diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml
index 84d5a7d80d..bcd284333f 100644
--- a/mods/ts/rules/civilian-structures.yaml
+++ b/mods/ts/rules/civilian-structures.yaml
@@ -714,6 +714,8 @@ CAHOSP:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	EditorTilesetFilter:
+		Categories: Civilian building
 
 CAPYR01:
 	Inherits: ^CivBuilding
@@ -1263,6 +1265,8 @@ GASPOT:
 		Sequence: idle-lights
 	SelectionDecorations:
 		VisualBounds: 48, 82, 0, -25
+	EditorTilesetFilter:
+		Categories: Civilian building
 
 GALITE:
 	Inherits: ^Building
@@ -1294,6 +1298,8 @@ GALITE:
 	-Cloak@EXTERNALCLOAK:
 	-ExternalCondition@CLOAKGENERATOR:
 	-ExternalCondition@CRATE-CLOAK:
+	EditorTilesetFilter:
+		Categories: Civilian building
 
 TSTLAMP:
 	Inherits: GALITE
@@ -1322,6 +1328,8 @@ GAICBM:
 		TransformSounds: place2.aud
 		NoTransformSounds:
 	-WithDeathAnimation:
+	EditorTilesetFilter:
+		Categories: Vehicle
 
 NAMNTK:
 	Inherits: ^CivBuilding
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 9c3b701bae..e5f89c9f32 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -271,6 +271,8 @@
 		Pieces: 1, 3
 	ThrowsShrapnel@LARGE:
 		Pieces: 1, 1
+	EditorTilesetFilter:
+		Categories: Billboard
 
 ^Crate:
 	HiddenUnderFog:
@@ -824,7 +826,7 @@
 	Tooltip:
 		Name: Rock
 	EditorTilesetFilter:
-		Categories: Rock
+		Categories: Decoration
 
 ^Decoration:
 	Inherits@1: ^SpriteActor
@@ -997,7 +999,7 @@
 			BottomRight: 512, 512
 			VerticalTopOffset: 768
 	EditorTilesetFilter:
-		Categories: Gate
+		Categories: Wall
 
 ^Gate_A:
 	Inherits: ^Gate