diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui
index 24c04b61..8857828c 100644
--- a/resources/forms/mainWindow.ui
+++ b/resources/forms/mainWindow.ui
@@ -370,7 +370,7 @@
     <string>Eraser</string>
    </property>
    <property name="toolTip">
-    <string>Smalle Eraser</string>
+    <string>Small Eraser</string>
    </property>
   </action>
   <action name="actionEraserMedium">
@@ -407,51 +407,78 @@
    </property>
   </action>
   <action name="actionColor0">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset resource="../OpenBoard.qrc">
      <normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
    </property>
    <property name="text">
-    <string>Color</string>
+    <string>Color0</string>
    </property>
    <property name="toolTip">
-    <string>Color</string>
+    <string>Color 1</string>
    </property>
   </action>
   <action name="actionColor1">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset resource="../OpenBoard.qrc">
      <normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
    </property>
    <property name="text">
-    <string>Color</string>
+    <string>Color1</string>
+   </property>
+   <property name="toolTip">
+    <string>Color 2</string>
    </property>
   </action>
   <action name="actionColor2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset resource="../OpenBoard.qrc">
      <normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
    </property>
    <property name="text">
-    <string>Color</string>
+    <string>Color2</string>
+   </property>
+   <property name="toolTip">
+    <string>Color 3</string>
    </property>
   </action>
   <action name="actionColor3">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset resource="../OpenBoard.qrc">
      <normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
    </property>
    <property name="text">
-    <string>Color</string>
+    <string>Color3</string>
+   </property>
+   <property name="toolTip">
+    <string>Color 4</string>
    </property>
   </action>
   <action name="actionColor4">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="icon">
     <iconset resource="../OpenBoard.qrc">
      <normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
    </property>
    <property name="text">
-    <string>Color</string>
+    <string>Color4</string>
+   </property>
+   <property name="toolTip">
+    <string>Color 5</string>
    </property>
   </action>
   <action name="actionWebBack">
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index d1236391..b3b913a2 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -319,11 +319,14 @@ void UBBoardController::setupToolbar()
     connect(settings->appToolBarDisplayText, SIGNAL(changed(QVariant)), colorChoice, SLOT(displayText(QVariant)));
     connect(colorChoice, SIGNAL(activated(int)), this, SLOT(setColorIndex(int)));
     connect(UBDrawingController::drawingController(), SIGNAL(colorIndexChanged(int)), colorChoice, SLOT(setCurrentIndex(int)));
+    connect(UBDrawingController::drawingController(), SIGNAL(colorIndexChanged(int)), UBDrawingController::drawingController(), SIGNAL(colorPaletteChanged()));
     connect(UBDrawingController::drawingController(), SIGNAL(colorPaletteChanged()), colorChoice, SLOT(colorPaletteChanged()));
     connect(UBDrawingController::drawingController(), SIGNAL(colorPaletteChanged()), this, SLOT(colorPaletteChanged()));
 
     colorChoice->displayText(QVariant(settings->appToolBarDisplayText->get().toBool()));
     colorChoice->colorPaletteChanged();
+    colorChoice->setCurrentIndex(settings->penColorIndex());
+    colorActions.at(settings->penColorIndex())->setChecked(true);
 
     // Setup line width choice widget
     QList<QAction *> lineWidthActions;