diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 451f9c1b..b4d2f05e 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -1,131 +1,129 @@
-
- resources/back.svg
- resources/lock.svg
- resources/icon_delete.svg
- resources/icon_tab_changed.svg
- resources/icon_config_general.svg
- resources/icon_config_appearance.svg
- resources/icon_config_interface.svg
- resources/icon_config_messages.svg
- resources/icon_config_deckeditor.svg
- resources/phases/icon_phase_untap.svg
- resources/phases/icon_phase_upkeep.svg
- resources/phases/icon_phase_draw.svg
- resources/phases/icon_phase_main1.svg
- resources/phases/icon_phase_combat_start.svg
- resources/phases/icon_phase_combat_attackers.svg
- resources/phases/icon_phase_combat_blockers.svg
- resources/phases/icon_phase_combat_damage.svg
- resources/phases/icon_phase_combat_end.svg
- resources/phases/icon_phase_main2.svg
- resources/phases/icon_phase_cleanup.svg
- resources/phases/icon_phase_nextturn.svg
- resources/icon_settings.svg
- resources/hand.svg
- resources/pencil.svg
- resources/icon_search.svg
- resources/icon_clearsearch.svg
- resources/icon_update.png
- resources/icon_view.svg
- resources/hr.jpg
- resources/cockatrice.svg
- resources/add_to_sideboard.svg
- resources/decrement.svg
- resources/increment.svg
- resources/remove_row.svg
- resources/arrow_left_green.svg
- resources/arrow_right_green.svg
- resources/icon_ready_start.svg
- resources/icon_not_ready_start.svg
- resources/icon_conceded.svg
- resources/icon_player.svg
- resources/icon_spectator.svg
-
- resources/replay_start.svg
- resources/replay_stop.svg
- resources/replay_fastforward.svg
- resources/replay_rewind.svg
- resources/replay_toend.svg
- resources/replay_tostart.svg
- resources/replay_pause.svg
+
+ resources/back.svg
+ resources/lock.svg
+ resources/icon_delete.svg
+ resources/icon_tab_changed.svg
+ resources/icon_config_general.svg
+ resources/icon_config_appearance.svg
+ resources/icon_config_interface.svg
+ resources/icon_config_messages.svg
+ resources/icon_config_deckeditor.svg
+ resources/phases/icon_phase_untap.svg
+ resources/phases/icon_phase_upkeep.svg
+ resources/phases/icon_phase_draw.svg
+ resources/phases/icon_phase_main1.svg
+ resources/phases/icon_phase_combat_start.svg
+ resources/phases/icon_phase_combat_attackers.svg
+ resources/phases/icon_phase_combat_blockers.svg
+ resources/phases/icon_phase_combat_damage.svg
+ resources/phases/icon_phase_combat_end.svg
+ resources/phases/icon_phase_main2.svg
+ resources/phases/icon_phase_cleanup.svg
+ resources/phases/icon_phase_nextturn.svg
+ resources/icon_settings.svg
+ resources/hand.svg
+ resources/pencil.svg
+ resources/icon_search.svg
+ resources/icon_clearsearch.svg
+ resources/icon_update.png
+ resources/icon_view.svg
+ resources/hr.jpg
+ resources/cockatrice.svg
+ resources/add_to_sideboard.svg
+ resources/decrement.svg
+ resources/increment.svg
+ resources/remove_row.svg
+ resources/arrow_left_green.svg
+ resources/arrow_right_green.svg
+ resources/icon_ready_start.svg
+ resources/icon_not_ready_start.svg
+ resources/icon_conceded.svg
+ resources/icon_player.svg
+ resources/icon_spectator.svg
- resources/genders/male.svg
- resources/genders/female.svg
- resources/genders/unknown.svg
+ resources/replay_start.svg
+ resources/replay_stop.svg
+ resources/replay_fastforward.svg
+ resources/replay_rewind.svg
+ resources/replay_toend.svg
+ resources/replay_tostart.svg
+ resources/replay_pause.svg
- resources/countries/ar.svg
- resources/countries/at.svg
- resources/countries/au.svg
- resources/countries/be.svg
- resources/countries/br.svg
- resources/countries/by.svg
- resources/countries/ca.svg
- resources/countries/cl.svg
- resources/countries/cz.svg
- resources/countries/ch.svg
- resources/countries/cn.svg
- resources/countries/de.svg
- resources/countries/dk.svg
- resources/countries/do.svg
- resources/countries/es.svg
- resources/countries/fi.svg
- resources/countries/fr.svg
- resources/countries/ge.svg
- resources/countries/gr.svg
- resources/countries/gt.svg
- resources/countries/hr.svg
- resources/countries/hu.svg
- resources/countries/ie.svg
- resources/countries/il.svg
- resources/countries/it.svg
- resources/countries/jp.svg
- resources/countries/lt.svg
- resources/countries/lu.svg
- resources/countries/lv.svg
- resources/countries/mx.svg
- resources/countries/my.svg
- resources/countries/nl.svg
- resources/countries/no.svg
- resources/countries/nz.svg
- resources/countries/pe.svg
- resources/countries/ph.svg
- resources/countries/pl.svg
- resources/countries/pt.svg
- resources/countries/ro.svg
- resources/countries/ru.svg
- resources/countries/se.svg
- resources/countries/sg.svg
- resources/countries/si.svg
- resources/countries/sk.svg
- resources/countries/tr.svg
- resources/countries/ua.svg
- resources/countries/uk.svg
- resources/countries/us.svg
- resources/countries/ve.svg
- resources/countries/za.svg
+ resources/genders/male.svg
+ resources/genders/female.svg
+ resources/genders/unknown.svg
- resources/counters/w.svg
- resources/counters/w_highlight.svg
- resources/counters/u.svg
- resources/counters/u_highlight.svg
- resources/counters/b.svg
- resources/counters/b_highlight.svg
- resources/counters/r.svg
- resources/counters/r_highlight.svg
- resources/counters/g.svg
- resources/counters/g_highlight.svg
- resources/counters/general.svg
- resources/counters/general_highlight.svg
+ resources/countries/ar.svg
+ resources/countries/at.svg
+ resources/countries/au.svg
+ resources/countries/be.svg
+ resources/countries/br.svg
+ resources/countries/by.svg
+ resources/countries/ca.svg
+ resources/countries/cl.svg
+ resources/countries/cz.svg
+ resources/countries/ch.svg
+ resources/countries/cn.svg
+ resources/countries/de.svg
+ resources/countries/dk.svg
+ resources/countries/do.svg
+ resources/countries/es.svg
+ resources/countries/fi.svg
+ resources/countries/fr.svg
+ resources/countries/ge.svg
+ resources/countries/gr.svg
+ resources/countries/gt.svg
+ resources/countries/hr.svg
+ resources/countries/hu.svg
+ resources/countries/ie.svg
+ resources/countries/il.svg
+ resources/countries/it.svg
+ resources/countries/jp.svg
+ resources/countries/lt.svg
+ resources/countries/lu.svg
+ resources/countries/lv.svg
+ resources/countries/mx.svg
+ resources/countries/my.svg
+ resources/countries/nl.svg
+ resources/countries/no.svg
+ resources/countries/nz.svg
+ resources/countries/pe.svg
+ resources/countries/ph.svg
+ resources/countries/pl.svg
+ resources/countries/pt.svg
+ resources/countries/ro.svg
+ resources/countries/ru.svg
+ resources/countries/se.svg
+ resources/countries/sg.svg
+ resources/countries/si.svg
+ resources/countries/sk.svg
+ resources/countries/tr.svg
+ resources/countries/ua.svg
+ resources/countries/uk.svg
+ resources/countries/us.svg
+ resources/countries/ve.svg
+ resources/countries/za.svg
- resources/userlevels/normal.svg
- resources/userlevels/registered.svg
- resources/userlevels/moderator.svg
- resources/userlevels/admin.svg
+ resources/counters/w.svg
+ resources/counters/w_highlight.svg
+ resources/counters/u.svg
+ resources/counters/u_highlight.svg
+ resources/counters/b.svg
+ resources/counters/b_highlight.svg
+ resources/counters/r.svg
+ resources/counters/r_highlight.svg
+ resources/counters/g.svg
+ resources/counters/g_highlight.svg
+ resources/counters/general.svg
+ resources/counters/general_highlight.svg
- resources/news/exclamation_mark.svg
- resources/news/question_mark.svg
+ resources/userlevels/normal.svg
+ resources/userlevels/registered.svg
+ resources/userlevels/moderator.svg
+ resources/userlevels/admin.svg
- resources/mtgforum.png
-
+ resources/news/exclamation_mark.svg
+ resources/news/question_mark.svg
+
diff --git a/cockatrice/resources/mtgforum.png b/cockatrice/resources/mtgforum.png
deleted file mode 100644
index a91bb854..00000000
Binary files a/cockatrice/resources/mtgforum.png and /dev/null differ
diff --git a/cockatrice/resources/phases_old/icon_phase_cleanup.svg b/cockatrice/resources/phases_old/icon_phase_cleanup.svg
deleted file mode 100644
index a675d66f..00000000
--- a/cockatrice/resources/phases_old/icon_phase_cleanup.svg
+++ /dev/null
@@ -1,749 +0,0 @@
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_attackers.svg b/cockatrice/resources/phases_old/icon_phase_combat_attackers.svg
deleted file mode 100644
index 540107ac..00000000
--- a/cockatrice/resources/phases_old/icon_phase_combat_attackers.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_blockers.svg b/cockatrice/resources/phases_old/icon_phase_combat_blockers.svg
deleted file mode 100644
index 6344ef6b..00000000
--- a/cockatrice/resources/phases_old/icon_phase_combat_blockers.svg
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_damage.svg b/cockatrice/resources/phases_old/icon_phase_combat_damage.svg
deleted file mode 100644
index 8536764e..00000000
--- a/cockatrice/resources/phases_old/icon_phase_combat_damage.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_end.svg b/cockatrice/resources/phases_old/icon_phase_combat_end.svg
deleted file mode 100644
index 9e7b8950..00000000
--- a/cockatrice/resources/phases_old/icon_phase_combat_end.svg
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_combat_start.svg b/cockatrice/resources/phases_old/icon_phase_combat_start.svg
deleted file mode 100644
index 996571d7..00000000
--- a/cockatrice/resources/phases_old/icon_phase_combat_start.svg
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_draw.svg b/cockatrice/resources/phases_old/icon_phase_draw.svg
deleted file mode 100644
index 51918274..00000000
--- a/cockatrice/resources/phases_old/icon_phase_draw.svg
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_main1.svg b/cockatrice/resources/phases_old/icon_phase_main1.svg
deleted file mode 100644
index 264cef39..00000000
--- a/cockatrice/resources/phases_old/icon_phase_main1.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_main2.svg b/cockatrice/resources/phases_old/icon_phase_main2.svg
deleted file mode 100644
index 50f77fa7..00000000
--- a/cockatrice/resources/phases_old/icon_phase_main2.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_nextturn.svg b/cockatrice/resources/phases_old/icon_phase_nextturn.svg
deleted file mode 100644
index 3cfd19ab..00000000
--- a/cockatrice/resources/phases_old/icon_phase_nextturn.svg
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_untap.svg b/cockatrice/resources/phases_old/icon_phase_untap.svg
deleted file mode 100644
index 2f4d8173..00000000
--- a/cockatrice/resources/phases_old/icon_phase_untap.svg
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-
diff --git a/cockatrice/resources/phases_old/icon_phase_upkeep.svg b/cockatrice/resources/phases_old/icon_phase_upkeep.svg
deleted file mode 100644
index 5a06aae9..00000000
--- a/cockatrice/resources/phases_old/icon_phase_upkeep.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-