diff --git a/Assets/Graphics/Dark Themes/Timeline/Tag.png b/Assets/Graphics/Dark Themes/Timeline/Tag.png
new file mode 100644
index 000000000..29ff70fea
Binary files /dev/null and b/Assets/Graphics/Dark Themes/Timeline/Tag.png differ
diff --git a/Assets/Graphics/Dark Themes/Timeline/Tag.png.import b/Assets/Graphics/Dark Themes/Timeline/Tag.png.import
new file mode 100644
index 000000000..802cae274
--- /dev/null
+++ b/Assets/Graphics/Dark Themes/Timeline/Tag.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Tag.png-855015abac1d10cd3efd9c78dea7d2c5.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Dark Themes/Timeline/Tag.png"
+dest_files=[ "res://.import/Tag.png-855015abac1d10cd3efd9c78dea7d2c5.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png b/Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png
new file mode 100644
index 000000000..346a9dd81
Binary files /dev/null and b/Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png differ
diff --git a/Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png.import b/Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png.import
new file mode 100644
index 000000000..c3b645c3a
--- /dev/null
+++ b/Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Tag_Hover.png-313eea6e50504c5f8247ac5808d533c8.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png"
+dest_files=[ "res://.import/Tag_Hover.png-313eea6e50504c5f8247ac5808d533c8.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/Graphics/Gold Themes/Timeline/Tag.png b/Assets/Graphics/Gold Themes/Timeline/Tag.png
new file mode 100644
index 000000000..e7b1cf64b
Binary files /dev/null and b/Assets/Graphics/Gold Themes/Timeline/Tag.png differ
diff --git a/Assets/Graphics/Gold Themes/Timeline/Tag.png.import b/Assets/Graphics/Gold Themes/Timeline/Tag.png.import
new file mode 100644
index 000000000..63ad9b68a
--- /dev/null
+++ b/Assets/Graphics/Gold Themes/Timeline/Tag.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Tag.png-d67d17acdcfd6d5d7bfc51bfcfa3c67f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Gold Themes/Timeline/Tag.png"
+dest_files=[ "res://.import/Tag.png-d67d17acdcfd6d5d7bfc51bfcfa3c67f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/Graphics/Gold Themes/Timeline/Tag_Hover.png b/Assets/Graphics/Gold Themes/Timeline/Tag_Hover.png
new file mode 100644
index 000000000..214e6e53d
Binary files /dev/null and b/Assets/Graphics/Gold Themes/Timeline/Tag_Hover.png differ
diff --git a/Assets/Graphics/Gold Themes/Timeline/Tag_Hover.png.import b/Assets/Graphics/Gold Themes/Timeline/Tag_Hover.png.import
new file mode 100644
index 000000000..21ec69aa9
--- /dev/null
+++ b/Assets/Graphics/Gold Themes/Timeline/Tag_Hover.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Tag_Hover.png-d27258eb431a8bdec248021dbc37861c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Gold Themes/Timeline/Tag_Hover.png"
+dest_files=[ "res://.import/Tag_Hover.png-d27258eb431a8bdec248021dbc37861c.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/Graphics/Light Themes/Timeline/Tag.png b/Assets/Graphics/Light Themes/Timeline/Tag.png
new file mode 100644
index 000000000..ebf499386
Binary files /dev/null and b/Assets/Graphics/Light Themes/Timeline/Tag.png differ
diff --git a/Assets/Graphics/Light Themes/Timeline/Tag.png.import b/Assets/Graphics/Light Themes/Timeline/Tag.png.import
new file mode 100644
index 000000000..5c0279770
--- /dev/null
+++ b/Assets/Graphics/Light Themes/Timeline/Tag.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Tag.png-21c0d628aa7188f34641faa7944f9763.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Light Themes/Timeline/Tag.png"
+dest_files=[ "res://.import/Tag.png-21c0d628aa7188f34641faa7944f9763.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Assets/Graphics/Light Themes/Timeline/Tag_Hover.png b/Assets/Graphics/Light Themes/Timeline/Tag_Hover.png
new file mode 100644
index 000000000..5c19e8995
Binary files /dev/null and b/Assets/Graphics/Light Themes/Timeline/Tag_Hover.png differ
diff --git a/Assets/Graphics/Light Themes/Timeline/Tag_Hover.png.import b/Assets/Graphics/Light Themes/Timeline/Tag_Hover.png.import
new file mode 100644
index 000000000..afeddf51b
--- /dev/null
+++ b/Assets/Graphics/Light Themes/Timeline/Tag_Hover.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Tag_Hover.png-0ad988b69f756226418562da603cec62.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Graphics/Light Themes/Timeline/Tag_Hover.png"
+dest_files=[ "res://.import/Tag_Hover.png-0ad988b69f756226418562da603cec62.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Prefabs/AnimationTimeline.tscn b/Prefabs/AnimationTimeline.tscn
index fc5a33c1b..572897aee 100644
--- a/Prefabs/AnimationTimeline.tscn
+++ b/Prefabs/AnimationTimeline.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=58 format=2]
+[gd_scene load_steps=60 format=2]
 
 [ext_resource path="res://Scripts/AnimationTimeline.gd" type="Script" id=1]
 [ext_resource path="res://Assets/Graphics/Dark Themes/Layers/New_Layer.png" type="Texture" id=2]
@@ -39,6 +39,8 @@
 [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Loop.png" type="Texture" id=37]
 [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Expandable.png" type="Texture" id=38]
 [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Expandable_Hover.png" type="Texture" id=39]
+[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png" type="Texture" id=40]
+[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Tag.png" type="Texture" id=41]
 
 [sub_resource type="InputEventKey" id=1]
 control = true
@@ -257,9 +259,22 @@ size_flags_vertical = 0
 texture_normal = ExtResource( 19 )
 texture_hover = ExtResource( 20 )
 
+[node name="FrameTagButton" type="TextureButton" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[
+"UIButtons",
+]]
+margin_left = 178.0
+margin_right = 198.0
+margin_bottom = 20.0
+hint_tooltip = "Manage frame tags"
+mouse_default_cursor_shape = 2
+size_flags_horizontal = 0
+size_flags_vertical = 0
+texture_normal = ExtResource( 41 )
+texture_hover = ExtResource( 40 )
+
 [node name="PlaybackButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/AnimationButtons"]
-margin_left = 251.0
-margin_right = 391.0
+margin_left = 263.0
+margin_right = 403.0
 margin_bottom = 24.0
 size_flags_horizontal = 6
 
@@ -640,6 +655,7 @@ value = 1.0
 [connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]]
 [connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"]
 [connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/AddFrame" to="." method="add_frame"]
+[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/FrameTagButton" to="." method="_on_FrameTagButton_pressed"]
 [connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"]
 [connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"]
 [connection signal="toggled" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"]
diff --git a/Scripts/AnimationTimeline.gd b/Scripts/AnimationTimeline.gd
index 3b4761e1f..a816a601f 100644
--- a/Scripts/AnimationTimeline.gd
+++ b/Scripts/AnimationTimeline.gd
@@ -54,6 +54,10 @@ func add_frame() -> void:
 	Global.undo_redo.commit_action()
 
 
+func _on_FrameTagButton_pressed() -> void:
+	Global.tag_dialog.popup_centered()
+
+
 func _on_OnionSkinning_pressed() -> void:
 	Global.onion_skinning = !Global.onion_skinning
 	Global.canvas.update()
@@ -325,3 +329,4 @@ func _on_OnionSkinningSettings_popup_hide() -> void:
 
 func _on_TagDialog_popup_hide() -> void:
 	Global.can_draw = true
+