diff --git a/cockatrice/resources/phases/icon_phase_cleanup.svg b/cockatrice/resources/phases/icon_phase_cleanup.svg
index a675d66f..9786daca 100644
--- a/cockatrice/resources/phases/icon_phase_cleanup.svg
+++ b/cockatrice/resources/phases/icon_phase_cleanup.svg
@@ -1,749 +1,186 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_combat_attackers.svg b/cockatrice/resources/phases/icon_phase_combat_attackers.svg
index 540107ac..d7483253 100644
--- a/cockatrice/resources/phases/icon_phase_combat_attackers.svg
+++ b/cockatrice/resources/phases/icon_phase_combat_attackers.svg
@@ -1,162 +1,103 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_combat_blockers.svg b/cockatrice/resources/phases/icon_phase_combat_blockers.svg
index 6344ef6b..6602eaef 100644
--- a/cockatrice/resources/phases/icon_phase_combat_blockers.svg
+++ b/cockatrice/resources/phases/icon_phase_combat_blockers.svg
@@ -1,181 +1,1930 @@
-
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_combat_damage.svg b/cockatrice/resources/phases/icon_phase_combat_damage.svg
index 8536764e..aa356e2a 100644
--- a/cockatrice/resources/phases/icon_phase_combat_damage.svg
+++ b/cockatrice/resources/phases/icon_phase_combat_damage.svg
@@ -1,169 +1,108 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_combat_end.svg b/cockatrice/resources/phases/icon_phase_combat_end.svg
index 9e7b8950..bbbbf9bf 100644
--- a/cockatrice/resources/phases/icon_phase_combat_end.svg
+++ b/cockatrice/resources/phases/icon_phase_combat_end.svg
@@ -1,253 +1,319 @@
-
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_combat_start.svg b/cockatrice/resources/phases/icon_phase_combat_start.svg
index 996571d7..b80b571d 100644
--- a/cockatrice/resources/phases/icon_phase_combat_start.svg
+++ b/cockatrice/resources/phases/icon_phase_combat_start.svg
@@ -1,253 +1,348 @@
-
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_draw.svg b/cockatrice/resources/phases/icon_phase_draw.svg
index 51918274..4d106219 100644
--- a/cockatrice/resources/phases/icon_phase_draw.svg
+++ b/cockatrice/resources/phases/icon_phase_draw.svg
@@ -1,192 +1,190 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_main1.svg b/cockatrice/resources/phases/icon_phase_main1.svg
index 264cef39..48fce651 100644
--- a/cockatrice/resources/phases/icon_phase_main1.svg
+++ b/cockatrice/resources/phases/icon_phase_main1.svg
@@ -1,135 +1,79 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_main2.svg b/cockatrice/resources/phases/icon_phase_main2.svg
index 50f77fa7..61be736e 100644
--- a/cockatrice/resources/phases/icon_phase_main2.svg
+++ b/cockatrice/resources/phases/icon_phase_main2.svg
@@ -1,135 +1,235 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_nextturn.svg b/cockatrice/resources/phases/icon_phase_nextturn.svg
index 3cfd19ab..302a57d6 100644
--- a/cockatrice/resources/phases/icon_phase_nextturn.svg
+++ b/cockatrice/resources/phases/icon_phase_nextturn.svg
@@ -1,89 +1,102 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_untap.svg b/cockatrice/resources/phases/icon_phase_untap.svg
index 2f4d8173..3d316ab0 100644
--- a/cockatrice/resources/phases/icon_phase_untap.svg
+++ b/cockatrice/resources/phases/icon_phase_untap.svg
@@ -1,198 +1,120 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases/icon_phase_upkeep.svg b/cockatrice/resources/phases/icon_phase_upkeep.svg
index 5a06aae9..2317a937 100644
--- a/cockatrice/resources/phases/icon_phase_upkeep.svg
+++ b/cockatrice/resources/phases/icon_phase_upkeep.svg
@@ -1,159 +1,162 @@
-
-
-
+
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_cleanup.svg b/cockatrice/resources/phases_old/icon_phase_cleanup.svg
new file mode 100644
index 00000000..a675d66f
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_cleanup.svg
@@ -0,0 +1,749 @@
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_attackers.svg b/cockatrice/resources/phases_old/icon_phase_combat_attackers.svg
new file mode 100644
index 00000000..540107ac
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_combat_attackers.svg
@@ -0,0 +1,162 @@
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_blockers.svg b/cockatrice/resources/phases_old/icon_phase_combat_blockers.svg
new file mode 100644
index 00000000..6344ef6b
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_combat_blockers.svg
@@ -0,0 +1,181 @@
+
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_damage.svg b/cockatrice/resources/phases_old/icon_phase_combat_damage.svg
new file mode 100644
index 00000000..8536764e
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_combat_damage.svg
@@ -0,0 +1,169 @@
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_end.svg b/cockatrice/resources/phases_old/icon_phase_combat_end.svg
new file mode 100644
index 00000000..9e7b8950
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_combat_end.svg
@@ -0,0 +1,253 @@
+
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_start.svg b/cockatrice/resources/phases_old/icon_phase_combat_start.svg
new file mode 100644
index 00000000..996571d7
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_combat_start.svg
@@ -0,0 +1,253 @@
+
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_draw.svg b/cockatrice/resources/phases_old/icon_phase_draw.svg
new file mode 100644
index 00000000..51918274
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_draw.svg
@@ -0,0 +1,192 @@
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_main1.svg b/cockatrice/resources/phases_old/icon_phase_main1.svg
new file mode 100644
index 00000000..264cef39
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_main1.svg
@@ -0,0 +1,135 @@
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_main2.svg b/cockatrice/resources/phases_old/icon_phase_main2.svg
new file mode 100644
index 00000000..50f77fa7
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_main2.svg
@@ -0,0 +1,135 @@
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_nextturn.svg b/cockatrice/resources/phases_old/icon_phase_nextturn.svg
new file mode 100644
index 00000000..3cfd19ab
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_nextturn.svg
@@ -0,0 +1,89 @@
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_untap.svg b/cockatrice/resources/phases_old/icon_phase_untap.svg
new file mode 100644
index 00000000..2f4d8173
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_untap.svg
@@ -0,0 +1,198 @@
+
+
+
diff --git a/cockatrice/resources/phases_old/icon_phase_upkeep.svg b/cockatrice/resources/phases_old/icon_phase_upkeep.svg
new file mode 100644
index 00000000..5a06aae9
--- /dev/null
+++ b/cockatrice/resources/phases_old/icon_phase_upkeep.svg
@@ -0,0 +1,159 @@
+
+
+