diff --git a/source/frontends/qapple/qapple.cpp b/source/frontends/qapple/qapple.cpp
index 375bb895..77e89bfe 100644
--- a/source/frontends/qapple/qapple.cpp
+++ b/source/frontends/qapple/qapple.cpp
@@ -168,13 +168,17 @@ QApple::QApple(QWidget *parent) :
 {
     setupUi(this);
 
+    actionStart->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
+    actionPause->setIcon(style()->standardIcon(QStyle::SP_MediaPause));
+    actionReboot->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward));
+
     myEmulator = new Emulator(mdiArea);
     myEmulatorWindow = mdiArea->addSubWindow(myEmulator, Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
 
     myMSGap = 5;
 
+    on_actionPause_triggered();
     initialiseEmulator();
-
     startEmulator(myEmulatorWindow);
 }
 
@@ -225,6 +229,10 @@ void QApple::on_actionStart_triggered()
     myElapsedTimer.start();
     actionPause->setEnabled(true);
     actionStart->setEnabled(false);
+
+    actionChange->setIcon(style()->standardIcon(QStyle::SP_MediaPause));
+    actionChange->disconnect(SIGNAL(triggered(bool)));
+    connect(actionChange, SIGNAL(triggered(bool)), this, SLOT(on_actionPause_triggered()));
 }
 
 void QApple::on_actionPause_triggered()
@@ -232,6 +240,10 @@ void QApple::on_actionPause_triggered()
     stopTimer();
     actionPause->setEnabled(false);
     actionStart->setEnabled(true);
+
+    actionChange->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
+    actionChange->disconnect(SIGNAL(triggered(bool)));
+    connect(actionChange, SIGNAL(triggered(bool)), this, SLOT(on_actionStart_triggered()));
 }
 
 void QApple::on_actionX1_triggered()
diff --git a/source/frontends/qapple/qapple.ui b/source/frontends/qapple/qapple.ui
index 9e376bb1..170443ef 100644
--- a/source/frontends/qapple/qapple.ui
+++ b/source/frontends/qapple/qapple.ui
@@ -79,6 +79,19 @@
    <addaction name="actionX2"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionChange"/>
+   <addaction name="actionReboot"/>
+  </widget>
   <action name="actionStart">
    <property name="text">
     <string>&amp;Start</string>
@@ -127,6 +140,11 @@
     <string>&amp;Options...</string>
    </property>
   </action>
+  <action name="actionChange">
+   <property name="text">
+    <string>Change</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>