diff --git a/src/components/Icon/glyphs/APIToken.svg b/src/components/Icon/glyphs/APIToken.svg
index edc2b706..b90d509a 100644
--- a/src/components/Icon/glyphs/APIToken.svg
+++ b/src/components/Icon/glyphs/APIToken.svg
@@ -5,16 +5,16 @@
     <desc>Created with sketchtool.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="API-Tokens-Screen" transform="translate(-20.000000, -411.000000)" stroke="#FFFFFF">
+        <g id="API-Tokens-Screen" transform="translate(-20.000000, -411.000000)" stroke="currentColor">
             <g id="API-Token-Icon" transform="translate(15.000000, 410.000000)">
                 <g transform="translate(16.617009, 16.617009) rotate(45.000000) translate(-16.617009, -16.617009) translate(4.617009, 5.117009)">
-                    <path d="M1,5 L12,5 C12.552,5 13,5.448 13,6 L13,8.5 C13,10.074 12.259,11.556 11,12.5 L11,12.5 C9.741,13.444 9,14.926 9,16.5 L9,18 C9,18.552 8.552,19 8,19 L5,19 C4.448,19 4,18.552 4,18 L4,16.5 C4,14.926 3.259,13.444 2,12.5 L2,12.5 C0.741,11.556 0,10.074 0,8.5 L0,6 C0,5.448 0.448,5 1,5 L1,5 Z" id="Stroke-412" stroke-width="1.5" fill-opacity="0.1" fill="#FFFFFF"></path>
+                    <path d="M1,5 L12,5 C12.552,5 13,5.448 13,6 L13,8.5 C13,10.074 12.259,11.556 11,12.5 L11,12.5 C9.741,13.444 9,14.926 9,16.5 L9,18 C9,18.552 8.552,19 8,19 L5,19 C4.448,19 4,18.552 4,18 L4,16.5 C4,14.926 3.259,13.444 2,12.5 L2,12.5 C0.741,11.556 0,10.074 0,8.5 L0,6 C0,5.448 0.448,5 1,5 L1,5 Z" id="Stroke-412" stroke-width="1.5" fill-opacity="0.1" fill="currentColor"></path>
                     <path d="M3,5 L3,0" id="Stroke-414" stroke-width="1.5"></path>
                     <path d="M10,5 L10,0" id="Stroke-416" stroke-width="1.5"></path>
                     <path d="M7,19 C7,20.25 8.083,23 12,23 C15.917,23 16.208,16 20.5,16 C23.25,16 23.5,17 23.5,17" id="Stroke-418" stroke-width="1.5"></path>
-                    <path d="M8,10.5 C8,11.328 7.328,12 6.5,12 C5.672,12 5,11.328 5,10.5 C5,9.672 5.672,9 6.5,9 C7.328,9 8,9.672 8,10.5 L8,10.5 Z" id="Stroke-420" stroke-width="1.5" fill-opacity="0.1" fill="#FFFFFF"></path>
+                    <path d="M8,10.5 C8,11.328 7.328,12 6.5,12 C5.672,12 5,11.328 5,10.5 C5,9.672 5.672,9 6.5,9 C7.328,9 8,9.672 8,10.5 L8,10.5 Z" id="Stroke-420" stroke-width="1.5" fill-opacity="0.1" fill="currentColor"></path>
                 </g>
             </g>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/components/Icon/glyphs/EditPencil.svg b/src/components/Icon/glyphs/EditPencil.svg
index 4ce27169..5fb4ae96 100644
--- a/src/components/Icon/glyphs/EditPencil.svg
+++ b/src/components/Icon/glyphs/EditPencil.svg
@@ -3,9 +3,9 @@
     <g id="edit_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g>
             <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
-            <path d="M4.9037088,19.0962912 L6.61084897,14.8284408 L6.71979194,14.7195479 L15.4146699,6.02866991 C16.1195631,5.3237767 17.2624369,5.3237767 17.9673301,6.02866991 C18.6776945,6.73903435 18.6774299,7.88713065 17.9641884,8.59095323 C17.164966,9.38078972 15.7926113,10.750399 14.0098639,12.5356752 C13.9973548,12.548202 13.9973548,12.548202 13.9848459,12.560729 C12.9542361,13.5928263 11.8515151,14.6986941 10.7498224,15.8045687 C10.3642246,16.1916302 10.1256056,16.4312416 9.68519051,16.8735883 C9.35495665,17.2053354 9.35495665,17.2053354 9.28164471,17.2790122 L9.17237656,17.3888241 L4.9037088,19.0962912 Z" id="Stroke-52" stroke="#7E828B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M7.5,15 L9,16.5" id="Stroke-54" stroke="#7E828B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M14.5,8 L16,9.5" id="Stroke-56" stroke="#7E828B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M4.9037088,19.0962912 L6.61084897,14.8284408 L6.71979194,14.7195479 L15.4146699,6.02866991 C16.1195631,5.3237767 17.2624369,5.3237767 17.9673301,6.02866991 C18.6776945,6.73903435 18.6774299,7.88713065 17.9641884,8.59095323 C17.164966,9.38078972 15.7926113,10.750399 14.0098639,12.5356752 C13.9973548,12.548202 13.9973548,12.548202 13.9848459,12.560729 C12.9542361,13.5928263 11.8515151,14.6986941 10.7498224,15.8045687 C10.3642246,16.1916302 10.1256056,16.4312416 9.68519051,16.8735883 C9.35495665,17.2053354 9.35495665,17.2053354 9.28164471,17.2790122 L9.17237656,17.3888241 L4.9037088,19.0962912 Z" id="Stroke-52" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M7.5,15 L9,16.5" id="Stroke-54" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M14.5,8 L16,9.5" id="Stroke-56" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
         </g>
     </g>
 </svg>
diff --git a/src/components/Icon/glyphs/Tables.svg b/src/components/Icon/glyphs/Tables.svg
index ac3a20d1..76b7c9f0 100644
--- a/src/components/Icon/glyphs/Tables.svg
+++ b/src/components/Icon/glyphs/Tables.svg
@@ -6,7 +6,7 @@
     <g id="tables_icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g>
             <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
-            <path d="M12,3 C8.0751,3 5,4.48275 5,6.375 L5,17.625 C5,19.51725 8.0751,21 12,21 C15.9249,21 19,19.51725 19,17.625 L19,6.375 C19,4.48275 15.9249,3 12,3 Z M18.3,13.875 C18.3,15.11625 15.7128,16.5 12,16.5 C8.2872,16.5 5.7,15.11625 5.7,13.875 L5.7,11.6115 C6.8221,12.738 9.1895,13.5 12,13.5 C14.8105,13.5 17.1779,12.738 18.3,11.6115 L18.3,13.875 Z M18.3,10.125 C18.3,11.36625 15.7128,12.75 12,12.75 C8.2872,12.75 5.7,11.36625 5.7,10.125 L5.7,7.8615 C6.8221,8.988 9.1895,9.75 12,9.75 C14.8105,9.75 17.1779,8.988 18.3,7.8615 L18.3,10.125 Z M12,3.75 C15.7128,3.75 18.3,5.13375 18.3,6.375 C18.3,7.61625 15.7128,9 12,9 C8.2872,9 5.7,7.61625 5.7,6.375 C5.7,5.13375 8.2872,3.75 12,3.75 Z M12,20.25 C8.2872,20.25 5.7,18.86625 5.7,17.625 L5.7,15.3615 C6.8221,16.488 9.1895,17.25 12,17.25 C14.8105,17.25 17.1779,16.488 18.3,15.3615 L18.3,17.625 C18.3,18.86625 15.7128,20.25 12,20.25 Z" id="Data-Drum" stroke="#323C47" stroke-width="0.2" fill="#323C47" fill-rule="nonzero"></path>
+            <path d="M12,3 C8.0751,3 5,4.48275 5,6.375 L5,17.625 C5,19.51725 8.0751,21 12,21 C15.9249,21 19,19.51725 19,17.625 L19,6.375 C19,4.48275 15.9249,3 12,3 Z M18.3,13.875 C18.3,15.11625 15.7128,16.5 12,16.5 C8.2872,16.5 5.7,15.11625 5.7,13.875 L5.7,11.6115 C6.8221,12.738 9.1895,13.5 12,13.5 C14.8105,13.5 17.1779,12.738 18.3,11.6115 L18.3,13.875 Z M18.3,10.125 C18.3,11.36625 15.7128,12.75 12,12.75 C8.2872,12.75 5.7,11.36625 5.7,10.125 L5.7,7.8615 C6.8221,8.988 9.1895,9.75 12,9.75 C14.8105,9.75 17.1779,8.988 18.3,7.8615 L18.3,10.125 Z M12,3.75 C15.7128,3.75 18.3,5.13375 18.3,6.375 C18.3,7.61625 15.7128,9 12,9 C8.2872,9 5.7,7.61625 5.7,6.375 C5.7,5.13375 8.2872,3.75 12,3.75 Z M12,20.25 C8.2872,20.25 5.7,18.86625 5.7,17.625 L5.7,15.3615 C6.8221,16.488 9.1895,17.25 12,17.25 C14.8105,17.25 17.1779,16.488 18.3,15.3615 L18.3,17.625 C18.3,18.86625 15.7128,20.25 12,20.25 Z" id="Data-Drum" stroke="currentColor" stroke-width="0.2" fill="currentColor" fill-rule="nonzero"></path>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>