diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 2df39109..310ce03d 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -7,7 +7,13 @@
 	<file>resources/icon_phase_untap.svg</file>
 	<file>resources/icon_phase_upkeep.svg</file>
 	<file>resources/icon_phase_draw.svg</file>
-	<file>resources/icon_phase_combat.svg</file>
+	<file>resources/icon_phase_main1.svg</file>
+	<file>resources/icon_phase_combat_start.svg</file>
+	<file>resources/icon_phase_combat_attackers.svg</file>
+	<file>resources/icon_phase_combat_blockers.svg</file>
+	<file>resources/icon_phase_combat_damage.svg</file>
+	<file>resources/icon_phase_combat_end.svg</file>
+	<file>resources/icon_phase_main2.svg</file>
 	<file>resources/icon_phase_cleanup.svg</file>
 
 	<file>translations/cockatrice_de.qm</file>
diff --git a/cockatrice/resources/icon_phase_attacker.svg b/cockatrice/resources/icon_phase_combat_attackers.svg
similarity index 100%
rename from cockatrice/resources/icon_phase_attacker.svg
rename to cockatrice/resources/icon_phase_combat_attackers.svg
diff --git a/cockatrice/resources/icon_phase_blocker.svg b/cockatrice/resources/icon_phase_combat_blockers.svg
similarity index 100%
rename from cockatrice/resources/icon_phase_blocker.svg
rename to cockatrice/resources/icon_phase_combat_blockers.svg
diff --git a/cockatrice/resources/icon_phase_combat.svg b/cockatrice/resources/icon_phase_combat_damage.svg
similarity index 100%
rename from cockatrice/resources/icon_phase_combat.svg
rename to cockatrice/resources/icon_phase_combat_damage.svg
diff --git a/cockatrice/resources/icon_mainphase1.svg b/cockatrice/resources/icon_phase_main1.svg
similarity index 100%
rename from cockatrice/resources/icon_mainphase1.svg
rename to cockatrice/resources/icon_phase_main1.svg
diff --git a/cockatrice/resources/icon_mainphase2.svg b/cockatrice/resources/icon_phase_main2.svg
similarity index 100%
rename from cockatrice/resources/icon_mainphase2.svg
rename to cockatrice/resources/icon_phase_main2.svg
diff --git a/cockatrice/src/phasestoolbar.cpp b/cockatrice/src/phasestoolbar.cpp
index f7f9d325..e1d2e084 100644
--- a/cockatrice/src/phasestoolbar.cpp
+++ b/cockatrice/src/phasestoolbar.cpp
@@ -6,43 +6,43 @@
 PhasesToolbar::PhasesToolbar(QWidget *parent)
 	: QFrame(parent)
 {
-	QPushButton *untapButton = new QPushButton;
-	untapButton->setIcon(QIcon(":/resources/icon_phase_untap.svg"));
-	untapButton->setCheckable(true);
-	untapButton->setIconSize(QSize(64, 64));
-	QPushButton *upkeepButton = new QPushButton;
-	upkeepButton->setIcon(QIcon(":/resources/icon_phase_upkeep.svg"));
-	upkeepButton->setCheckable(true);
-	upkeepButton->setIconSize(QSize(64, 64));
-	QPushButton *drawButton = new QPushButton;
-	drawButton->setIcon(QIcon(":/resources/icon_phase_draw.svg"));
-	drawButton->setCheckable(true);
-	drawButton->setIconSize(QSize(64, 64));
-	QPushButton *main1Button = new QPushButton;
-	main1Button->setIcon(QIcon(":/resources/icon_phase_main1.svg"));
-	main1Button->setCheckable(true);
-	main1Button->setIconSize(QSize(64, 64));
-	QPushButton *combatButton = new QPushButton;
-	combatButton->setIcon(QIcon(":/resources/icon_phase_combat.svg"));
-	combatButton->setCheckable(true);
-	combatButton->setIconSize(QSize(64, 64));
-	QPushButton *main2Button = new QPushButton;
-	main2Button->setIcon(QIcon(":/resources/icon_phase_main2.svg"));
-	main2Button->setCheckable(true);
-	main2Button->setIconSize(QSize(64, 64));
-	QPushButton *cleanupButton = new QPushButton;
-	cleanupButton->setIcon(QIcon(":/resources/icon_phase_cleanup.svg"));
-	cleanupButton->setCheckable(true);
-	cleanupButton->setIconSize(QSize(64, 64));
+	QPushButton *untapButton = new QPushButton(QIcon(":/resources/icon_phase_untap.svg"), QString());
+	QPushButton *upkeepButton = new QPushButton(QIcon(":/resources/icon_phase_upkeep.svg"), QString());
+	QPushButton *drawButton = new QPushButton(QIcon(":/resources/icon_phase_draw.svg"), QString());
+	QPushButton *main1Button = new QPushButton(QIcon(":/resources/icon_phase_main1.svg"), QString());
+	QPushButton *combatStartButton = new QPushButton(QIcon(":/resources/icon_phase_combat_start.svg"), QString());
+	QPushButton *combatAttackersButton = new QPushButton(QIcon(":/resources/icon_phase_combat_attackers.svg"), QString());
+	QPushButton *combatBlockersButton = new QPushButton(QIcon(":/resources/icon_phase_combat_blockers.svg"), QString());
+	QPushButton *combatDamageButton = new QPushButton(QIcon(":/resources/icon_phase_combat_damage.svg"), QString());
+	QPushButton *combatEndButton = new QPushButton(QIcon(":/resources/icon_phase_combat_end.svg"), QString());
+	QPushButton *main2Button = new QPushButton(QIcon(":/resources/icon_phase_main2.svg"), QString());
+	QPushButton *cleanupButton = new QPushButton(QIcon(":/resources/icon_phase_cleanup.svg"), QString());
+	
+	buttonList << untapButton << upkeepButton << drawButton << main1Button << combatStartButton
+		<< combatAttackersButton << combatBlockersButton << combatDamageButton << combatEndButton
+		<< main2Button << cleanupButton;
+		
+	for (int i = 0; i < buttonList.size(); ++i) {
+		buttonList[i]->setCheckable(true);
+		buttonList[i]->setIconSize(QSize(50, 50));
+	}
 	
 	QVBoxLayout *layout = new QVBoxLayout;
 	layout->addStretch(1);
 	layout->addWidget(untapButton);
 	layout->addWidget(upkeepButton);
 	layout->addWidget(drawButton);
+	layout->addSpacing(20);
 	layout->addWidget(main1Button);
-	layout->addWidget(combatButton);
+	layout->addSpacing(20);
+	layout->addWidget(combatStartButton);
+	layout->addWidget(combatAttackersButton);
+	layout->addWidget(combatBlockersButton);
+	layout->addWidget(combatDamageButton);
+	layout->addWidget(combatEndButton);
+	layout->addSpacing(20);
 	layout->addWidget(main2Button);
+	layout->addSpacing(20);
 	layout->addWidget(cleanupButton);
 	layout->addStretch(1);
 	
diff --git a/cockatrice/src/phasestoolbar.h b/cockatrice/src/phasestoolbar.h
index f5519833..d9a2e4c5 100644
--- a/cockatrice/src/phasestoolbar.h
+++ b/cockatrice/src/phasestoolbar.h
@@ -2,13 +2,16 @@
 #define PHASESTOOLBAR_H
 
 #include <QFrame>
+#include <QList>
+
+class QPushButton;
 
 class PhasesToolbar : public QFrame {
 	Q_OBJECT
 public:
 	PhasesToolbar(QWidget *parent = 0);
 private:
-	QAction *aUntap, *aUpkeep, *aDraw, *aMain1, *aCombat, *aMain2, *aCleanup;
+	QList<QPushButton *> buttonList;
 };
 
 #endif