diff --git a/plugins/dockers/animation/onion_skins_docker.cpp b/plugins/dockers/animation/onion_skins_docker.cpp
--- a/plugins/dockers/animation/onion_skins_docker.cpp
+++ b/plugins/dockers/animation/onion_skins_docker.cpp
@@ -27,6 +27,7 @@
 #include "kis_image_config.h"
 #include "kis_onion_skin_compositor.h"
 #include "kis_signals_blocker.h"
+#include "kis_node_view_color_scheme.h"
 #include "KisViewManager.h"
 #include "kis_action_manager.h"
 #include "kis_action.h"
@@ -34,8 +35,6 @@
 
 #include "kis_equalizer_widget.h"
 
-#include "kis_color_filter_combo.h"
-
 OnionSkinsDocker::OnionSkinsDocker(QWidget *parent) :
     QDockWidget(i18n("Onion Skins"), parent),
     ui(new Ui::OnionSkinsDocker),
@@ -78,10 +77,50 @@
         slotShowAdditionalSettings(isShown);
     }
 
-    QSet<int> colors;
-    for (int c=1; c<=8; c++) colors.insert(c);
-    ui->cmbColorLabelFilter->updateAvailableLabels(colors);
-    connect(ui->cmbColorLabelFilter, &KisColorFilterCombo::selectedColorsChanged, this, &OnionSkinsDocker::slotFilteredColorsChanged);
+    // create colored checkboxes for onion skin filtering
+    KisNodeViewColorScheme scm;
+    QPalette filterColorPalette;
+    QPixmap iconPixmap(10, 10);
+
+    //iconPixmap.fill(scm.colorLabel(0));
+    //ui->colorFilter0_checkbox->setIcon(iconPixmap); // default(no) color
+
+    iconPixmap.fill(scm.colorLabel(1));
+    ui->colorFilter1_checkbox->setIcon(QIcon(iconPixmap));
+
+    iconPixmap.fill(scm.colorLabel(2));
+    ui->colorFilter2_checkbox->setIcon(QIcon(iconPixmap));
+
+    iconPixmap.fill(scm.colorLabel(3));
+    ui->colorFilter3_checkbox->setIcon(QIcon(iconPixmap));
+
+    iconPixmap.fill(scm.colorLabel(4));
+    ui->colorFilter4_checkbox->setIcon(QIcon(iconPixmap));
+
+    iconPixmap.fill(scm.colorLabel(5));
+    ui->colorFilter5_checkbox->setIcon(QIcon(iconPixmap));
+
+    iconPixmap.fill(scm.colorLabel(6));
+    ui->colorFilter6_checkbox->setIcon(QIcon(iconPixmap));
+
+    iconPixmap.fill(scm.colorLabel(7));
+    ui->colorFilter7_checkbox->setIcon(QIcon(iconPixmap));
+
+    iconPixmap.fill(scm.colorLabel(8));
+    ui->colorFilter8_checkbox->setIcon(QIcon(iconPixmap));
+
+
+    // assign click events to color filters and group checkbox
+    connect(ui->colorFilter0_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilter1_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilter2_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilter3_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilter4_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilter5_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilter6_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilter7_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilter8_checkbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
+    connect(ui->colorFilterGroupbox, SIGNAL(toggled(bool)), this, SLOT(slotFilteredColorsChanged()));
 
     loadSettings();
     KisOnionSkinCompositor::instance()->configChanged();
@@ -89,6 +128,7 @@
     resize(sizeHint());
 }
 
+
 OnionSkinsDocker::~OnionSkinsDocker()
 {
     delete ui;
@@ -121,7 +161,28 @@
 
 void OnionSkinsDocker::slotFilteredColorsChanged()
 {
-    KisOnionSkinCompositor::instance()->setColorLabelFilter(ui->cmbColorLabelFilter->selectedColors());
+    // what colors are selected to filter??
+    QList<int> selectedFilterColors;
+
+    if (ui->colorFilter0_checkbox->isChecked()) selectedFilterColors << 0;
+    if (ui->colorFilter1_checkbox->isChecked()) selectedFilterColors << 1;
+    if (ui->colorFilter2_checkbox->isChecked()) selectedFilterColors << 2;
+    if (ui->colorFilter3_checkbox->isChecked()) selectedFilterColors << 3;
+    if (ui->colorFilter4_checkbox->isChecked()) selectedFilterColors << 4;
+    if (ui->colorFilter5_checkbox->isChecked()) selectedFilterColors << 5;
+    if (ui->colorFilter6_checkbox->isChecked()) selectedFilterColors << 6;
+    if (ui->colorFilter7_checkbox->isChecked()) selectedFilterColors << 7;
+    if (ui->colorFilter8_checkbox->isChecked()) selectedFilterColors << 8;
+
+    // show all colors if the filter is off and ignore the checkboxes
+    if(ui->colorFilterGroupbox->isChecked() == false) {
+        selectedFilterColors.clear();
+        selectedFilterColors << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8; // show everything
+    }
+
+
+    // existing code
+    KisOnionSkinCompositor::instance()->setColorLabelFilter(selectedFilterColors);
     KisOnionSkinCompositor::instance()->configChanged();
 }
 
diff --git a/plugins/dockers/animation/onion_skins_docker.ui b/plugins/dockers/animation/onion_skins_docker.ui
--- a/plugins/dockers/animation/onion_skins_docker.ui
+++ b/plugins/dockers/animation/onion_skins_docker.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>356</width>
-    <height>210</height>
+    <width>281</width>
+    <height>282</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -22,34 +22,100 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="KisColorFilterCombo" name="cmbColorLabelFilter">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>Filter by frame color</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QGroupBox" name="colorFilterGroupbox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Filter Frames by Color</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="spacing">
+       <number>4</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="colorFilter0_checkbox">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>None</string>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="colorFilter1_checkbox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="colorFilter2_checkbox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="colorFilter3_checkbox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="colorFilter4_checkbox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="colorFilter5_checkbox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="colorFilter6_checkbox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="colorFilter7_checkbox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="colorFilter8_checkbox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <layout class="QVBoxLayout" name="buttonsLayout">
@@ -150,11 +216,6 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KisColorFilterCombo</class>
-   <extends>QComboBox</extends>
-   <header>kis_color_filter_combo.h</header>
-  </customwidget>
-  <customwidget>
    <class>KisColorButton</class>
    <extends>QPushButton</extends>
    <header>kis_color_button.h</header>