diff --git a/fgd/bases/BaseClusteredLight.fgd b/fgd/bases/BaseClusteredLight.fgd
index a25ff5a82..f09acb05c 100644
--- a/fgd/bases/BaseClusteredLight.fgd
+++ b/fgd/bases/BaseClusteredLight.fgd
@@ -20,9 +20,17 @@
 		[
 		0: "None"
 		1: "Static Only"
+		]	
+	_initialshadowsize(choices) : "Initial Shadow Size" : 3 : "The initial shadow resolution exponent for shadowed lights. Each increment of one doubles both dimensions of the shadowmap, making shadows appear sharper as a result." =
+		[
+		1: "1"
+		2: "2"
+		3: "3"
+		4: "4"
+		5: "5"
+		6: "6"
+		7: "7"
 		]
-		
-	_initialshadowsize(integer) : "Initial Shadow Size" : 3 : "The initial static shadow resolution exponent. Only relevant for static shadow allocation. Adding 1 to this value doubles both dimensions of the shadowmap."
 	nearz(float) : "Near Z" : 4.0 : "Near Z for this light. Determines where shadows start to be cast. Inside the nearz radius, the light is still visible, but anything inside it won't cast shadows"
 
 	input SetShadowSize(integer) : "Set the size exponent of this light's shadowmap(s)."
diff --git a/fgd/point/filter/filter_activator_surfacedata.fgd b/fgd/point/filter/filter_activator_surfacedata.fgd
index 4edcee3a9..deb64a7ad 100644
--- a/fgd/point/filter/filter_activator_surfacedata.fgd
+++ b/fgd/point/filter/filter_activator_surfacedata.fgd
@@ -1,5 +1,5 @@
 @FilterClass base(filter_base)
-	iconsprite("editor/filter_generic.vmt") 
+	iconsprite("editor/l2/filter_activator_surfacedata.vmt") 
 = filter_activator_surfacedata : "A filter that tests the activator's surface data."
 	[
 	filtersurfaceprop[engine](string) : "Surface"
diff --git a/fgd/point/logic/logic_console.fgd b/fgd/point/logic/logic_console.fgd
index edcbb0522..f5fc42b8c 100644
--- a/fgd/point/logic/logic_console.fgd
+++ b/fgd/point/logic/logic_console.fgd
@@ -1,5 +1,5 @@
 @PointClass base(BaseEntityPoint)
-	iconsprite("editor/logic_console.vmt")
+	iconsprite("editor/l2/logic_console.vmt")
 = logic_console : "Sends messages to the console. Not to be confused with point_clientcommand or point_servercommand."
 	[
 	// Keys
diff --git a/fgd/point/math/math_counter_advanced.fgd b/fgd/point/math/math_counter_advanced.fgd
index 778b72fa7..f067bacb7 100644
--- a/fgd/point/math/math_counter_advanced.fgd
+++ b/fgd/point/math/math_counter_advanced.fgd
@@ -1,5 +1,5 @@
 @PointClass base(BaseEntityPoint, EnableDisable, math_counter) 
-	iconsprite("editor/math_counter_advanced.vmt") 
+	iconsprite("editor/l2/math_counter_advanced.vmt") 
 = math_counter_advanced : "A special version of math_counter with the ability to perform advanced calculations. " +
 	"Otherwise functions identically to math_counter."
 	[
diff --git a/hammer/materials/editor/l2/filter_activator_surfacedata.vmt b/hammer/materials/editor/l2/filter_activator_surfacedata.vmt
new file mode 100644
index 000000000..1509bd4e4
--- /dev/null
+++ b/hammer/materials/editor/l2/filter_activator_surfacedata.vmt
@@ -0,0 +1,7 @@
+"Sprite"
+{
+	"$spriteorientation" "vp_parallel"
+	"$spriteorigin" "[ 0.50 0.50 ]"
+	"$baseTexture" "editor/l2/filter_activator_surfacedata"
+	"$no_fullbright" 1
+}
diff --git a/hammer/materials/editor/l2/filter_activator_surfacedata.vtf b/hammer/materials/editor/l2/filter_activator_surfacedata.vtf
new file mode 100644
index 000000000..c8327a89c
Binary files /dev/null and b/hammer/materials/editor/l2/filter_activator_surfacedata.vtf differ
diff --git a/hammer/materials/editor/l2/logic_console.vmt b/hammer/materials/editor/l2/logic_console.vmt
new file mode 100644
index 000000000..6cf70b2e5
--- /dev/null
+++ b/hammer/materials/editor/l2/logic_console.vmt
@@ -0,0 +1,7 @@
+"Sprite"
+{
+	"$spriteorientation" "vp_parallel"
+	"$spriteorigin" "[ 0.50 0.50 ]"
+	"$baseTexture" "editor/l2/logic_console"
+	"$no_fullbright" 1
+}
diff --git a/hammer/materials/editor/l2/logic_console.vtf b/hammer/materials/editor/l2/logic_console.vtf
new file mode 100644
index 000000000..e8699732a
Binary files /dev/null and b/hammer/materials/editor/l2/logic_console.vtf differ
diff --git a/hammer/materials/editor/l2/math_counter_advanced.vmt b/hammer/materials/editor/l2/math_counter_advanced.vmt
new file mode 100644
index 000000000..b9b295ef7
--- /dev/null
+++ b/hammer/materials/editor/l2/math_counter_advanced.vmt
@@ -0,0 +1,7 @@
+"Sprite"
+{
+	"$spriteorientation" "vp_parallel"
+	"$spriteorigin" "[ 0.50 0.50 ]"
+	"$baseTexture" "editor/l2/math_counter_advanced"
+	"$no_fullbright" 1
+}
diff --git a/hammer/materials/editor/l2/math_counter_advanced.vtf b/hammer/materials/editor/l2/math_counter_advanced.vtf
new file mode 100644
index 000000000..e43205e6f
Binary files /dev/null and b/hammer/materials/editor/l2/math_counter_advanced.vtf differ