diff --git a/udiskie/icons/udiskie-checkbox-checked.svg b/udiskie/icons/udiskie-checkbox-checked.svg
index 393b02e..8c9c1cf 100644
--- a/udiskie/icons/udiskie-checkbox-checked.svg
+++ b/udiskie/icons/udiskie-checkbox-checked.svg
@@ -13,14 +13,12 @@
        stroke="#000000"
        stroke-width="8"
        stroke-linejoin="round"
-       stroke-linecap="round"
-       fill="none"
+       fill="#eee"
        d="M 5,5
        L 5,95
        L 95,95
        L 95,5
-       L 5,5
-       " />
+       Z" />
     <path
        id="checkmark"
        stroke="#000000"
diff --git a/udiskie/icons/udiskie-checkbox-unchecked.svg b/udiskie/icons/udiskie-checkbox-unchecked.svg
index c3984c9..75e30ca 100644
--- a/udiskie/icons/udiskie-checkbox-unchecked.svg
+++ b/udiskie/icons/udiskie-checkbox-unchecked.svg
@@ -13,13 +13,11 @@
        stroke="#000000"
        stroke-width="8"
        stroke-linejoin="round"
-       stroke-linecap="round"
-       fill="none"
+       fill="#eee"
        d="M 5,5
        L 5,95
        L 95,95
        L 95,5
-       L 5,5
-       " />
+       Z" />
   </g>
 </svg>
diff --git a/udiskie/icons/udiskie-submenu.svg b/udiskie/icons/udiskie-submenu.svg
index 59e9f68..c419b8e 100644
--- a/udiskie/icons/udiskie-submenu.svg
+++ b/udiskie/icons/udiskie-submenu.svg
@@ -7,14 +7,22 @@
    version="1.1"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink">
-  <g>
+  <defs>
     <path
        id="tick"
-       fill="#000000"
        d="M 35,25
        L 35,75
        L 65,50
-       L 35,25
-       " />
+       Z" />
+  </defs>
+  <g>
+    <use
+      stroke="#eee"
+      stroke-width="10"
+      stroke-linejoin="round"
+      xlink:href="#tick" />
+    <use
+      fill="#000"
+      xlink:href="#tick" />
   </g>
 </svg>