diff --git a/source/class/bernstein/theme/Decoration.js b/source/class/bernstein/theme/Decoration.js
index b93222c..78e045b 100644
--- a/source/class/bernstein/theme/Decoration.js
+++ b/source/class/bernstein/theme/Decoration.js
@@ -325,10 +325,10 @@ qx.Theme.define("bernstein.theme.Decoration",
 
     "checkbox-checked":
     {
-      include: "button-checked",
-      
+      include: "checkbox",
+
       style: {
-        radius: 2
+        backgroundImage: "decoration/checkbox/checked.png"
       }
     },
     
@@ -339,7 +339,11 @@ qx.Theme.define("bernstein.theme.Decoration",
     
     "checkbox-checked-hovered":
     {
-      include: "button-checked-hovered"
+      include: "checkbox",
+
+      style: {
+        backgroundImage: "decoration/checkbox/checked-focused.png"
+      }
     },
       
     "checkbox-focused": 
@@ -349,7 +353,11 @@ qx.Theme.define("bernstein.theme.Decoration",
     
     "checkbox-checked-focused":
     {
-      include: "checkbox-checked"
+      include: "checkbox",
+
+      style: {
+        backgroundImage: "decoration/checkbox/checked-focused.png"
+      }
     },
 
     "checkbox-disabled": 
@@ -364,7 +372,10 @@ qx.Theme.define("bernstein.theme.Decoration",
     
     "checkbox-checked-disabled":
     {
-      include: "button-checked-disabled"
+      include: "checkbox",
+      style: {
+        backgroundImage: "decoration/checkbox/checked-disabled.png"
+      }
     },
 
     "checkbox-invalid": 
diff --git a/source/resource/bernstein/decoration/checkbox/checked-disabled.png b/source/resource/bernstein/decoration/checkbox/checked-disabled.png
new file mode 100644
index 0000000..68df107
Binary files /dev/null and b/source/resource/bernstein/decoration/checkbox/checked-disabled.png differ
diff --git a/source/resource/bernstein/decoration/checkbox/checked-focused.png b/source/resource/bernstein/decoration/checkbox/checked-focused.png
new file mode 100644
index 0000000..9d4abe2
Binary files /dev/null and b/source/resource/bernstein/decoration/checkbox/checked-focused.png differ
diff --git a/source/resource/bernstein/decoration/checkbox/checked.png b/source/resource/bernstein/decoration/checkbox/checked.png
new file mode 100644
index 0000000..67a1696
Binary files /dev/null and b/source/resource/bernstein/decoration/checkbox/checked.png differ