diff --git a/src/Shaders/Effects/IndexMap.gdshader b/src/Shaders/Effects/IndexMap.gdshader
index b834b1772..dc4c026dd 100644
--- a/src/Shaders/Effects/IndexMap.gdshader
+++ b/src/Shaders/Effects/IndexMap.gdshader
@@ -3,6 +3,7 @@ shader_type canvas_item;
 render_mode unshaded;
 
 uniform sampler2D map_texture : filter_nearest;  // The map texture
+uniform bool alpha = false;
 
 // (begin DESCRIPTION)
 // The Red and Green values (0-255) of tool color will be treated as an x and y position
@@ -14,5 +15,8 @@ void fragment(){
 	vec2 map_size = vec2(textureSize(map_texture, 0));
 	vec2 lookup_uv = vec2(round(col.x * 255.0)/(map_size.x), round(col.y * 255.0)/(map_size.y));
 	vec4 index_color = texture(map_texture, lookup_uv);
-	COLOR = index_color;
+	COLOR.rgb = index_color.rgb;
+	if (alpha) {
+		COLOR.a = index_color.a;
+	}
 }
diff --git a/src/UI/Timeline/CelButton.tscn b/src/UI/Timeline/CelButton.tscn
index 77f56cc0d..5861f2f92 100644
--- a/src/UI/Timeline/CelButton.tscn
+++ b/src/UI/Timeline/CelButton.tscn
@@ -59,7 +59,7 @@ grow_vertical = 2
 size_flags_horizontal = 0
 size_flags_vertical = 0
 expand_mode = 1
-stretch_mode = 6
+stretch_mode = 5
 
 [node name="TransparentChecker" parent="CelTexture" instance=ExtResource("2_mi8wp")]
 show_behind_parent = true