diff --git a/assets/locator.png b/assets/locator.png
new file mode 100644
index 00000000..f63d43e1
Binary files /dev/null and b/assets/locator.png differ
diff --git a/assets/null_object.png b/assets/null_object.png
new file mode 100644
index 00000000..893458de
Binary files /dev/null and b/assets/null_object.png differ
diff --git a/js/outliner/locator.js b/js/outliner/locator.js
index 26d763a4..17d4d5c0 100644
--- a/js/outliner/locator.js
+++ b/js/outliner/locator.js
@@ -87,6 +87,7 @@ class Locator extends OutlinerElement {
 	Locator.prototype.buttons = [
 		Outliner.buttons.export,
 		Outliner.buttons.locked,
+		Outliner.buttons.visibility,
 	];
 	Locator.prototype.needsUniqueName = true;
 	Locator.prototype.menu = new Menu([
@@ -119,11 +120,49 @@ new Property(Locator, 'string', 'name', {default: 'locator'})
 new Property(Locator, 'vector', 'position')
 new Property(Locator, 'vector', 'rotation')
 new Property(Locator, 'boolean', 'ignore_inherited_scale')
+new Property(Locator, 'boolean', 'visibility', {default: true});
 new Property(Locator, 'boolean', 'locked');
 
 OutlinerElement.registerType(Locator, 'locator');
 
-new NodePreviewController(Locator)
+(function() {
+
+	const map = new THREE.TextureLoader().load( 'assets/locator.png' );
+	map.magFilter = map.minFilter = THREE.NearestFilter;
+
+	new NodePreviewController(Locator, {
+		setup(element) {
+			let material = new THREE.SpriteMaterial({
+				map,
+				alphaTest: 0.1,
+				sizeAttenuation: false
+			});
+			var mesh = new THREE.Sprite(material);
+			Project.nodes_3d[element.uuid] = mesh;
+			mesh.name = element.uuid;
+			mesh.type = element.type;
+			mesh.isElement = true;
+			mesh.visible = element.visibility;
+			mesh.rotation.order = 'ZYX';
+			this.updateTransform(element);
+
+			this.dispatchEvent('setup', {element});
+		},
+		updateTransform(element) {
+			NodePreviewController.prototype.updateTransform(element);
+			let size = 0.02 / (window.devicePixelRatio||1);
+			element.mesh.scale.set(size, size, size);
+		},
+		updateSelection(element) {
+			let {mesh} = element;
+
+			mesh.material.color.set(element.selected ? gizmo_colors.outline : CustomTheme.data.colors.text);
+
+			this.dispatchEvent('update_selection', {element});
+		}
+	})
+
+})()
 
 BARS.defineActions(function() {
 	new Action('add_locator', {
diff --git a/js/outliner/null_object.js b/js/outliner/null_object.js
index 0fe1b352..883caeeb 100644
--- a/js/outliner/null_object.js
+++ b/js/outliner/null_object.js
@@ -107,6 +107,7 @@ class NullObject extends OutlinerElement {
 	NullObject.prototype.buttons = [
 		//Outliner.buttons.export,
 		Outliner.buttons.locked,
+		Outliner.buttons.visibility,
 	];
 	NullObject.prototype.needsUniqueName = true;
 	NullObject.prototype.menu = new Menu([
@@ -137,24 +138,54 @@ class NullObject extends OutlinerElement {
 	new Property(NullObject, 'vector', 'position')
 	new Property(NullObject, 'string', 'ik_target', {condition: () => Format.animation_mode});
 	new Property(NullObject, 'boolean', 'lock_ik_target_rotation')
+	new Property(NullObject, 'boolean', 'visibility', {default: true});
 	new Property(NullObject, 'boolean', 'locked');
 	
 	OutlinerElement.registerType(NullObject, 'null_object');
 
+(function() {
+
+	const map = new THREE.TextureLoader().load( 'assets/null_object.png' );
+	map.magFilter = map.minFilter = THREE.NearestFilter;
+	
 	new NodePreviewController(NullObject, {
 		setup(element) {
-			NodePreviewController.prototype.setup(element);
+			let material = new THREE.SpriteMaterial({
+				map,
+				alphaTest: 0.1,
+				sizeAttenuation: false
+			});
+			var mesh = new THREE.Sprite(material);
+			Project.nodes_3d[element.uuid] = mesh;
+			mesh.name = element.uuid;
+			mesh.type = element.type;
+			mesh.isElement = true;
+			mesh.visible = element.visibility;
+			mesh.rotation.order = 'ZYX';
 			element.mesh.fix_position = new THREE.Vector3();
-
+			this.updateTransform(element);
+	
+			this.dispatchEvent('setup', {element});
 			this.dispatchEvent('update_selection', {element});
 		},
 		updateTransform(element) {
 			NodePreviewController.prototype.updateTransform(element);
+			let size = 0.019 / (window.devicePixelRatio||1);
+			element.mesh.scale.set(size, size, size);
 			element.mesh.fix_position.copy(element.mesh.position);
 
 			this.dispatchEvent('update_transform', {element});
+		},
+		updateSelection(element) {
+			let {mesh} = element;
+	
+			mesh.material.color.set(element.selected ? gizmo_colors.outline : CustomTheme.data.colors.text);
+	
+			this.dispatchEvent('update_selection', {element});
 		}
 	})
+	
+})()
 
 BARS.defineActions(function() {
 	new Action('add_null_object', {
diff --git a/js/preview/canvas.js b/js/preview/canvas.js
index b08f8580..f7960f31 100644
--- a/js/preview/canvas.js
+++ b/js/preview/canvas.js
@@ -932,7 +932,7 @@ const Canvas = {
 		arr.forEach(function(obj) {
 			if (!obj.visibility) return;
 			var mesh = obj.mesh;
-			if (!mesh || !mesh.geometry) return;
+			if (!mesh || !mesh.geometry || !mesh.outline) return;
 
 			var copy = mesh.outline.clone();
 			copy.geometry = mesh.outline.geometry.clone();