diff --git a/css/contrib.css b/css/contrib.css
index 0ce1445..53ee768 100644
--- a/css/contrib.css
+++ b/css/contrib.css
@@ -139,6 +139,7 @@
 .field-widget-inline-entity-form fieldset fieldset .fieldset-wrapper .ief-entity-submit:focus,
 .ief-row-form .ief-entity-submit:focus {
   color: #fff;
+  outline: 0;
 }
 .field-widget-inline-entity-form fieldset fieldset .fieldset-wrapper .ief-entity-submit:hover, .field-widget-inline-entity-form fieldset fieldset .fieldset-wrapper .ief-entity-submit:focus, .field-widget-inline-entity-form fieldset fieldset .fieldset-wrapper .ief-entity-submit:active, .field-widget-inline-entity-form fieldset fieldset .fieldset-wrapper .ief-entity-submit:disabled,
 .ief-row-form .ief-entity-submit:hover,
@@ -336,6 +337,11 @@ tr.even {
   /* LTR */
 }
 
+form table .ief-product-details input.form-checkbox,
+form table .ief-product-details input.form-radio {
+  opacity: 0;
+}
+
 #module-filter-squeeze .form-item-module-filter-name {
   clear: none;
 }
@@ -406,6 +412,7 @@ tr.even {
 .entity-commerce-order .commerce-backoffice-order-status-form .form-submit:focus,
 .view-commerce-message-messages #commerce-backoffice-message-form input.form-submit:focus {
   color: #fff;
+  outline: 0;
 }
 .entity-commerce-order .commerce-backoffice-order-status-form .form-submit:hover, .entity-commerce-order .commerce-backoffice-order-status-form .form-submit:focus, .entity-commerce-order .commerce-backoffice-order-status-form .form-submit:active, .entity-commerce-order .commerce-backoffice-order-status-form .form-submit:disabled,
 .view-commerce-message-messages #commerce-backoffice-message-form input.form-submit:hover,
@@ -1094,20 +1101,63 @@ html.js .views-exposed-form .form-item input.throbbing {
   .form-type-taxonomy-manager-tree input.form-radio {
     -webkit-appearance: none;
     appearance: none;
-    border: 0;
     opacity: 1;
-    height: 20px;
-    width: 20px;
-    background: transparent url("../images/toggles.png") no-repeat 0 0;
+    outline: 0;
+    height: 17px;
+    width: 17px;
+    border: 1px solid #a1a1a1;
+    border-radius: 3px;
+    background: #eaeaea;
+    background: -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+    background: -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+    background: -o-linear-gradient(top, white 0%, #eaeaea 100%);
+    background: -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+    background: linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+  }
+  .form-type-taxonomy-manager-tree input.form-checkbox:focus,
+  .form-type-taxonomy-manager-tree input.form-radio:focus {
+    outline: 0;
+    box-shadow: 0 0 3px #36a2f6;
   }
   .form-type-taxonomy-manager-tree input.form-checkbox:checked {
-    background-position: 0 -20px;
+    background-image: url("../images/check.png");
+    background-image: url("../images/check.png"), -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* FF3.6+ */
+    background-image: url("../images/check.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+    /* Chrome,Safari4+ */
+    background-image: url("../images/check.png"), -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* Chrome10+,Safari5.1+ */
+    background-image: url("../images/check.png"), -o-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* Opera 11.10+ */
+    background-image: url("../images/check.png"), -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* IE10+ */
+    background-image: url("../images/check.png"), linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+    /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$from', endColorstr='#eaeaea',GradientType=0 );
+    /* IE6-9 */
   }
   .form-type-taxonomy-manager-tree input.form-radio {
-    background-position: 0 -40px;
+    height: 14px;
+    width: 14px;
+    border-radius: 14px;
   }
   .form-type-taxonomy-manager-tree input.form-radio:checked {
-    background-position: 0 -60px;
+    background-image: url("../images/radio.png");
+    background-image: url("../images/radio.png"), -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* FF3.6+ */
+    background-image: url("../images/radio.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+    /* Chrome,Safari4+ */
+    background-image: url("../images/radio.png"), -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* Chrome10+,Safari5.1+ */
+    background-image: url("../images/radio.png"), -o-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* Opera 11.10+ */
+    background-image: url("../images/radio.png"), -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* IE10+ */
+    background-image: url("../images/radio.png"), linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+    /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$from', endColorstr='#eaeaea',GradientType=0 );
+    /* IE6-9 */
   }
   .form-type-taxonomy-manager-tree .form-disabled input.form-checkbox {
     opacity: .4;
diff --git a/css/shiny.css b/css/shiny.css
index ca55b68..4834f9a 100644
--- a/css/shiny.css
+++ b/css/shiny.css
@@ -164,12 +164,34 @@ input.form-radio + label::before {
   content: "";
   cursor: pointer;
   position: absolute;
-  top: 2px;
-  left: 0;
+  top: 4px;
+  left: 2px;
   /* LTR */
-  height: 20px;
-  width: 20px;
-  background: transparent url("../images/toggles.png") no-repeat 0 0;
+  height: 15px;
+  width: 15px;
+  border: 1px solid #a1a1a1;
+  border-radius: 3px;
+  background: #eaeaea;
+  background: -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+  background: -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+  background: -o-linear-gradient(top, white 0%, #eaeaea 100%);
+  background: -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+  background: linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+}
+
+#foo:checked,
+input.form-checkbox:focus + label::before,
+input.form-radio:focus + label::before {
+  outline: 0;
+  box-shadow: 0 0 3px #36a2f6;
+}
+
+#foo:checked,
+input.form-radio + label::before {
+  height: 14px;
+  width: 14px;
+  border-radius: 14px;
 }
 
 #foo:checked,
@@ -182,17 +204,41 @@ body.in-maintenance input.form-radio + label::before {
   top: 4px;
 }
 
-input.form-radio + label::before {
-  background-position: 0 -40px;
-}
-
 #foo:checked,
 input.form-checkbox:checked + label::before {
-  background-position: 0 -20px;
+  background-image: url("../images/check.png");
+  background-image: url("../images/check.png"), -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+  /* FF3.6+ */
+  background-image: url("../images/check.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+  /* Chrome,Safari4+ */
+  background-image: url("../images/check.png"), -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+  /* Chrome10+,Safari5.1+ */
+  background-image: url("../images/check.png"), -o-linear-gradient(top, white 0%, #eaeaea 100%);
+  /* Opera 11.10+ */
+  background-image: url("../images/check.png"), -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+  /* IE10+ */
+  background-image: url("../images/check.png"), linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$from', endColorstr='#eaeaea',GradientType=0 );
+  /* IE6-9 */
 }
 
 input.form-radio:checked + label::before {
-  background-position: 0 -60px;
+  background-image: url("../images/radio.png");
+  background-image: url("../images/radio.png"), -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+  /* FF3.6+ */
+  background-image: url("../images/radio.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+  /* Chrome,Safari4+ */
+  background-image: url("../images/radio.png"), -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+  /* Chrome10+,Safari5.1+ */
+  background-image: url("../images/radio.png"), -o-linear-gradient(top, white 0%, #eaeaea 100%);
+  /* Opera 11.10+ */
+  background-image: url("../images/radio.png"), -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+  /* IE10+ */
+  background-image: url("../images/radio.png"), linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$from', endColorstr='#eaeaea',GradientType=0 );
+  /* IE6-9 */
 }
 
 select.form-select {
@@ -232,21 +278,68 @@ select.form-select:focus {
   form table input.form-checkbox,
   form table input.form-radio {
     -webkit-appearance: none;
+    display: inline-block;
     appearance: none;
-    border: 0;
     opacity: 1;
-    height: 20px;
-    width: 20px;
-    background: transparent url("../images/toggles.png") no-repeat 0 0;
+    cursor: pointer;
+    top: 4px;
+    left: 2px;
+    /* LTR */
+    height: 17px;
+    width: 17px;
+    border: 1px solid #a1a1a1;
+    border-radius: 3px;
+    background: #eaeaea;
+    background: -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+    background: -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+    background: -o-linear-gradient(top, white 0%, #eaeaea 100%);
+    background: -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+    background: linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+  }
+  form table input.form-checkbox:focus,
+  form table input.form-radio:focus {
+    outline: 0;
+    box-shadow: 0 0 3px #36a2f6;
   }
   form table input.form-checkbox:checked {
-    background-position: 0 -20px;
+    background-image: url("../images/check.png");
+    background-image: url("../images/check.png"), -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* FF3.6+ */
+    background-image: url("../images/check.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+    /* Chrome,Safari4+ */
+    background-image: url("../images/check.png"), -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* Chrome10+,Safari5.1+ */
+    background-image: url("../images/check.png"), -o-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* Opera 11.10+ */
+    background-image: url("../images/check.png"), -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* IE10+ */
+    background-image: url("../images/check.png"), linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+    /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$from', endColorstr='#eaeaea',GradientType=0 );
+    /* IE6-9 */
   }
   form table input.form-radio {
-    background-position: 0 -40px;
+    height: 16px;
+    width: 16px;
+    border-radius: 16px;
   }
   form table input.form-radio:checked {
-    background-position: 0 -60px;
+    background-image: url("../images/radio.png");
+    background-image: url("../images/radio.png"), -moz-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* FF3.6+ */
+    background-image: url("../images/radio.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eaeaea));
+    /* Chrome,Safari4+ */
+    background-image: url("../images/radio.png"), -webkit-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* Chrome10+,Safari5.1+ */
+    background-image: url("../images/radio.png"), -o-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* Opera 11.10+ */
+    background-image: url("../images/radio.png"), -ms-linear-gradient(top, white 0%, #eaeaea 100%);
+    /* IE10+ */
+    background-image: url("../images/radio.png"), linear-gradient(to bottom, #ffffff 0%, #eaeaea 100%);
+    /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$from', endColorstr='#eaeaea',GradientType=0 );
+    /* IE6-9 */
   }
   form table .form-disabled input.form-checkbox {
     opacity: .4;
@@ -572,6 +665,7 @@ a.button {
 input.form-submit:focus,
 a.button:focus {
   color: #fff;
+  outline: 0;
 }
 input.form-submit:hover, input.form-submit:focus, input.form-submit:active, input.form-submit:disabled,
 a.button:hover,
@@ -580,6 +674,7 @@ a.button:active,
 a.button:disabled {
   background: #eeeeee;
   color: #5A5A5A;
+  outline: 0;
   text-shadow: 0 -1px 1px #fff;
 }
 
@@ -673,6 +768,7 @@ html.js .view-commerce-message-messages .view-footer fieldset.collapsible .field
 .field-widget-inline-entity-form .container-inline input.form-submit:focus,
 input.ief-entity-submit:focus {
   color: #fff;
+  outline: 0;
 }
 .form-actions #edit-submit:hover, .form-actions #edit-submit:focus, .form-actions #edit-submit:active, .form-actions #edit-submit:disabled,
 .form-actions #edit-save:hover,
@@ -890,5 +986,10 @@ td.checkbox input.form-checkbox {
   opacity: 1;
   height: 20px;
   width: 20px;
-  background: transparent url("../images/toggles.png") no-repeat 0 0;
+}
+
+#module-filter-squeeze td.checkbox input.form-checkbox {
+  height: 17px;
+  width: 17px;
+  border: 1px solid #a1a1a1;
 }
diff --git a/images/check.png b/images/check.png
new file mode 100644
index 0000000..15cbd3f
Binary files /dev/null and b/images/check.png differ
diff --git a/images/radio.png b/images/radio.png
new file mode 100644
index 0000000..1d3ad61
Binary files /dev/null and b/images/radio.png differ
diff --git a/scss/_base.scss b/scss/_base.scss
index 62204ac..e1bbc07 100644
--- a/scss/_base.scss
+++ b/scss/_base.scss
@@ -11,6 +11,17 @@ $serif: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "Deja
   background: linear-gradient(to bottom, $from 0%,$to 100%);
 }
 
+@mixin gradient-image($image, $from, $to) {
+  background-image: $image;
+  background-image: $image, -moz-linear-gradient(top, $from 0%, $to 100%); /* FF3.6+ */
+  background-image: $image, -webkit-gradient(linear, left top, left bottom, color-stop(0%,$from), color-stop(100%,#eaeaea)); /* Chrome,Safari4+ */
+  background-image: $image, -webkit-linear-gradient(top,  $from 0%,$to 100%); /* Chrome10+,Safari5.1+ */
+  background-image: $image, -o-linear-gradient(top, $from 0%,$to 100%); /* Opera 11.10+ */
+  background-image: $image, -ms-linear-gradient(top, $from 0%,$to 100%); /* IE10+ */
+  background-image: $image, linear-gradient(to bottom, $from 0%,$to 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$from', endColorstr='#eaeaea',GradientType=0 ); /* IE6-9 */
+}
+
 @mixin button($border, $highlight) {
   border: 1px solid $border;
   -moz-border-radius: 4px;
@@ -27,6 +38,7 @@ $serif: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "Deja
 
   &:focus {
     color: #fff;
+    outline: 0;
   }
 }
 
@@ -40,6 +52,7 @@ $serif: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "Deja
   &:disabled {
     background: #eeeeee;
     color: #5A5A5A;
+    outline: 0;
     text-shadow: 0 -1px 1px #fff;
   }
 
diff --git a/scss/contrib.scss b/scss/contrib.scss
index 9f1297a..c12973f 100644
--- a/scss/contrib.scss
+++ b/scss/contrib.scss
@@ -253,6 +253,10 @@ tr.even {
 .ief-product-details fieldset .form-type-checkbox {
   clear: left; /* LTR */
 }
+form table .ief-product-details input.form-checkbox,
+form table .ief-product-details input.form-radio {
+  opacity: 0;
+}
 #module-filter-squeeze .form-item-module-filter-name {
   clear: none;
 }
@@ -890,20 +894,28 @@ html.js .views-exposed-form .form-item input.throbbing {
     input.form-radio {
       -webkit-appearance: none;
       appearance: none;
-      border: 0;
       opacity: 1;
-      height: 20px;
-      width: 20px;
-      background: transparent url("../images/toggles.png") no-repeat 0 0;
+      outline: 0;
+      height: 17px;
+      width: 17px;
+      border: 1px solid #a1a1a1;
+      border-radius: 3px;
+      @include gradient-vertical(#ffffff,#eaeaea);
+      &:focus {
+        outline: 0;
+        box-shadow: 0 0 3px #36a2f6;
+      }
     }
     input.form-checkbox:checked {
-      background-position: 0 -20px;
+      @include gradient-image(url("../images/check.png"), #ffffff, #eaeaea);
     }
     input.form-radio {
-      background-position: 0 -40px;
+      height: 14px;
+      width: 14px;
+      border-radius: 14px;
     }
     input.form-radio:checked {
-      background-position: 0 -60px;
+      @include gradient-image(url("../images/radio.png"), #ffffff, #eaeaea);
     }
     .form-disabled input.form-checkbox {
       opacity: .4;
diff --git a/scss/shiny.scss b/scss/shiny.scss
index fc90751..f519e18 100644
--- a/scss/shiny.scss
+++ b/scss/shiny.scss
@@ -144,11 +144,26 @@ input.form-radio + label::before {
   content: "";
   cursor: pointer;
   position: absolute;
-  top: 2px;
-  left: 0; /* LTR */
-  height: 20px;
-  width: 20px;
-  background: transparent url("../images/toggles.png") no-repeat 0 0;
+  top: 4px;
+  left: 2px; /* LTR */
+  height: 15px;
+  width: 15px;
+  border: 1px solid #a1a1a1;
+  border-radius: 3px;
+  @include gradient-vertical(#ffffff,#eaeaea);
+}
+#foo:checked,
+input.form-checkbox:focus + label::before,
+input.form-radio:focus + label::before {
+  outline: 0;
+  box-shadow: 0 0 3px #36a2f6;
+}
+// Make the radios more round.
+#foo:checked,
+input.form-radio + label::before {
+  height: 14px;
+  width: 14px;
+  border-radius: 14px;
 }
 #foo:checked,
 .form-disabled input.form-checkbox + label::before {
@@ -158,16 +173,12 @@ input.form-radio + label::before {
 body.in-maintenance input.form-radio + label::before {
   top: 4px;
 }
-input.form-radio + label::before {
-  background-position: 0 -40px;
-}
 #foo:checked,
-
 input.form-checkbox:checked + label::before {
-  background-position: 0 -20px;
+  @include gradient-image(url("../images/check.png"), #ffffff, #eaeaea);
 }
 input.form-radio:checked + label::before {
-  background-position: 0 -60px;
+  @include gradient-image(url("../images/radio.png"), #ffffff, #eaeaea);
 }
 select.form-select {
   -webkit-appearance: none;
@@ -204,21 +215,32 @@ select.form-select {
     input.form-checkbox,
     input.form-radio {
       -webkit-appearance: none;
+      display: inline-block;
       appearance: none;
-      border: 0;
       opacity: 1;
-      height: 20px;
-      width: 20px;
-      background: transparent url("../images/toggles.png") no-repeat 0 0;
+      cursor: pointer;
+      top: 4px;
+      left: 2px; /* LTR */
+      height: 17px;
+      width: 17px;
+      border: 1px solid #a1a1a1;
+      border-radius: 3px;
+      @include gradient-vertical(#ffffff,#eaeaea);
+      &:focus {
+        outline: 0;
+        box-shadow: 0 0 3px #36a2f6;
+      }
     }
     input.form-checkbox:checked {
-      background-position: 0 -20px;
+      @include gradient-image(url("../images/check.png"),#ffffff,#eaeaea);
     }
     input.form-radio {
-      background-position: 0 -40px;
+      height: 16px;
+      width: 16px;
+      border-radius: 16px;
     }
     input.form-radio:checked {
-      background-position: 0 -60px;
+      @include gradient-image(url("../images/radio.png"),#ffffff,#eaeaea);
     }
     .form-disabled input.form-checkbox {
       opacity: .4;
@@ -669,5 +691,10 @@ td.checkbox input.form-checkbox {
   opacity: 1;
   height: 20px;
   width: 20px;
-  background: transparent url("../images/toggles.png") no-repeat 0 0;
+}
+
+#module-filter-squeeze td.checkbox input.form-checkbox {
+  height: 17px;
+  width: 17px;
+  border: 1px solid #a1a1a1;
 }