diff --git a/app/styles/app/layouts/settings.sass b/app/styles/app/layouts/settings.sass
index 11446efa..8cbceb29 100644
--- a/app/styles/app/layouts/settings.sass
+++ b/app/styles/app/layouts/settings.sass
@@ -88,12 +88,6 @@
   @extend %settings-name-section
   width: 100%
   margin-bottom: 1em
-  .icon-key
-    @extend %icon
-    @extend .icon-key
-    width: 1.2em
-    height: 1.3em
-
   @media #{$medium-up}
     width: 32%
     margin-bottom: 0
@@ -110,16 +104,11 @@
   display: inline-block
   vertical-align: middle
   overflow: hidden
+  color: #8e8f8e
 
 .ssh-key-value
   @extend %settings-value-section
   word-break: break-all
-  .icon-fingerprint
-    @extend %icon
-    @extend .icon-fingerprint
-    width: 1.3em
-    height: 1.3em
-    margin-right: .5em
   @media #{$medium-up}
     width: grid-calc(6, 12)
     word-break: normal
@@ -188,7 +177,7 @@
     @extend .icon-delete-disabled
     display: block
     width: 1.1em
-    height: 1.3em
+    height: 1.4em
     margin: .2em auto 0
 
 
diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass
index cedcf80f..cea8b89a 100644
--- a/app/styles/app/modules/icons.sass
+++ b/app/styles/app/modules/icons.sass
@@ -67,12 +67,23 @@
 .icon-delete-disabled
   @extend %icon-line-trashcan-disabled
 
+%icon-line-key
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 6.1"><style>.st0{fill:%23949899;}</style><path class="st0" d="M12.2 0C11 0 10.1.7 9.6 1.7h-9c-.3 0-.6.3-.6.6v3c0 .4.3.7.6.7s.6-.3.6-.6V2.9h.9v2.5c0 .4.3.6.6.6.4 0 .6-.3.6-.6V2.9h5.9c.1 1.5 1.3 2.7 2.8 2.7 1.6 0 2.8-1.3 2.8-2.8C15 1.3 13.7 0 12.2 0zm0 4.4c-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5 1.5.7 1.5 1.5-.7 1.5-1.5 1.5z"/></svg>')
 .icon-key
-  background-image: inline-image('svg/key.svg')
-
+  @extend %icon
+  @extend %icon-line-key
+  width: 1.2em
+  height: 1.3em
+  background-position: 0 6px
+  margin-right: .3em
+%icon-line-fingerprint
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-505.3 376 18.2 16.3"><style>.st0{fill:%23939798;}</style><g id="fingerprint"><path class="st0" d="M-496.9 381.2c-2.5.5-2.7 2.7-2.9 4.7-.2 1.5-.4 3.1-1.4 4.2-.2.3-.2.7 0 .9.3.2.7.2.9 0 1.3-1.5 1.5-3.3 1.7-5 .2-2.1.4-3.2 1.9-3.5.8-.2 1.5 0 1.9.4 1.3 1.4.7 5.9 0 8.4-.1.3.1.7.4.8h.2c.3 0 .5-.2.6-.5.1-.3 2-7.2-.3-9.7-.4-.4-1.3-1-3-.7z"/><path class="st0" d="M-496.8 378.6c-4.4.6-5.3 4.5-5.9 7.3-.2 1.1-.4 2.1-.8 2.7-.2.3-.1.7.3.9.3.2.7.1.9-.3.4-.8.7-1.9.9-3.1.6-2.9 1.3-5.8 4.8-6.3 1.5-.2 2.6.1 3.5 1 2.6 2.6 1.7 9.4 1.7 9.4-.1.4.2.7.5.7h.1c.3 0 .6-.2.6-.6 0-.3 1.1-7.5-2-10.6-1.2-1-2.7-1.4-4.6-1.1z"/><path class="st0" d="M-490.1 378c-1.6-1.5-3.7-2.2-6.4-1.9-9.4.9-8.8 10.6-8.8 10.7 0 .4.3.6.7.6.4 0 .6-.3.6-.7 0-.3-.5-8.5 7.6-9.3 2.3-.2 4.1.3 5.4 1.6 2.8 2.7 2.6 8.1 2.6 8.7 0 .4.3.7.6.7s.6-.3.6-.6c.1-1.2.3-6.8-2.9-9.8z"/><path class="st0" d="M-496.2 384.4c-.4 0-.6.4-.6.7 0 0 .4 3.4-1.4 6.1-.2.3-.1.7.2.9.1.1.2.1.4.1s.4-.1.5-.3c2-3.1 1.6-6.8 1.6-7 0-.3-.3-.5-.7-.5z"/></g></svg>')
 .icon-fingerprint
-  background-image: inline-image('svg/fingerprint.svg')
-
+  @extend %icon
+  @extend %icon-line-fingerprint
+  width: 1.3em
+  height: 1.3em
+  margin-right: .3em
 
 %icon-line-calendar
   background-image: inline-image('line-icons/icon-cal.svg')
diff --git a/public/images/line-icons/icon-fingerprint.svg b/public/images/line-icons/icon-fingerprint.svg
new file mode 100644
index 00000000..799b9c15
--- /dev/null
+++ b/public/images/line-icons/icon-fingerprint.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-505.3 376 18.2 16.3" style="enable-background:new -505.3 376 18.2 16.3;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#939798;}
+</style>
+<g id="fingerprint">
+	<path class="st0" d="M-496.9,381.2c-2.5,0.5-2.7,2.7-2.9,4.7c-0.2,1.5-0.4,3.1-1.4,4.2c-0.2,0.3-0.2,0.7,0,0.9
+		c0.3,0.2,0.7,0.2,0.9,0c1.3-1.5,1.5-3.3,1.7-5c0.2-2.1,0.4-3.2,1.9-3.5c0.8-0.2,1.5,0,1.9,0.4c1.3,1.4,0.7,5.9,0,8.4
+		c-0.1,0.3,0.1,0.7,0.4,0.8c0.1,0,0.1,0,0.2,0c0.3,0,0.5-0.2,0.6-0.5c0.1-0.3,2-7.2-0.3-9.7C-494.3,381.5-495.2,380.9-496.9,381.2z"
+		/>
+	<path class="st0" d="M-496.8,378.6c-4.4,0.6-5.3,4.5-5.9,7.3c-0.2,1.1-0.4,2.1-0.8,2.7c-0.2,0.3-0.1,0.7,0.3,0.9
+		c0.3,0.2,0.7,0.1,0.9-0.3c0.4-0.8,0.7-1.9,0.9-3.1c0.6-2.9,1.3-5.8,4.8-6.3c1.5-0.2,2.6,0.1,3.5,1c2.6,2.6,1.7,9.4,1.7,9.4
+		c-0.1,0.4,0.2,0.7,0.5,0.7c0,0,0.1,0,0.1,0c0.3,0,0.6-0.2,0.6-0.6c0-0.3,1.1-7.5-2-10.6C-493.4,378.7-494.9,378.3-496.8,378.6z"/>
+	<path class="st0" d="M-490.1,378c-1.6-1.5-3.7-2.2-6.4-1.9c-9.4,0.9-8.8,10.6-8.8,10.7c0,0.4,0.3,0.6,0.7,0.6
+		c0.4,0,0.6-0.3,0.6-0.7c0-0.3-0.5-8.5,7.6-9.3c2.3-0.2,4.1,0.3,5.4,1.6c2.8,2.7,2.6,8.1,2.6,8.7c0,0.4,0.3,0.7,0.6,0.7c0,0,0,0,0,0
+		c0.3,0,0.6-0.3,0.6-0.6C-487.1,386.6-486.9,381-490.1,378z"/>
+	<path class="st0" d="M-496.2,384.4c-0.4,0-0.6,0.4-0.6,0.7c0,0,0.4,3.4-1.4,6.1c-0.2,0.3-0.1,0.7,0.2,0.9c0.1,0.1,0.2,0.1,0.4,0.1
+		c0.2,0,0.4-0.1,0.5-0.3c2-3.1,1.6-6.8,1.6-7C-495.5,384.6-495.8,384.4-496.2,384.4z"/>
+</g>
+</svg>
diff --git a/public/images/line-icons/icon-key.svg b/public/images/line-icons/icon-key.svg
new file mode 100644
index 00000000..c7456f17
--- /dev/null
+++ b/public/images/line-icons/icon-key.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 15 6.1" style="enable-background:new 0 0 15 6.1;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#949899;}
+</style>
+<path class="st0" d="M12.2,0C11,0,10.1,0.7,9.6,1.7h-9C0.3,1.7,0,2,0,2.3v3C0,5.7,0.3,6,0.6,6s0.6-0.3,0.6-0.6V2.9h0.9v2.5
+	c0,0.4,0.3,0.6,0.6,0.6c0.4,0,0.6-0.3,0.6-0.6V2.9h5.9c0.1,1.5,1.3,2.7,2.8,2.7c1.6,0,2.8-1.3,2.8-2.8C15,1.3,13.7,0,12.2,0z
+	 M12.2,4.4c-0.8,0-1.5-0.7-1.5-1.5c0-0.8,0.7-1.5,1.5-1.5c0.8,0,1.5,0.7,1.5,1.5C13.7,3.7,13,4.4,12.2,4.4z"/>
+</svg>