diff --git a/browser/main/Detail/InfoButton.styl b/browser/main/Detail/InfoButton.styl
index 67618fb3..2de4c0f4 100644
--- a/browser/main/Detail/InfoButton.styl
+++ b/browser/main/Detail/InfoButton.styl
@@ -1,6 +1,5 @@
 .control-infoButton
   top 10px
-  margin-bottom 10px
   topBarButtonLight()
 
 .infoButton
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index f4c805c1..d9af3004 100644
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -390,11 +390,6 @@ class MarkdownNoteDetail extends React.Component {
             ignorePreviewPointerEvents={this.props.ignorePreviewPointerEvents}
           />
         </div>
-
-        <StatusBar
-          {..._.pick(this.props, ['config', 'location', 'dispatch'])}
-          date={note.updatedAt}
-        />
       </div>
     )
   }
diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl
index 597447eb..4c001031 100644
--- a/browser/main/Detail/MarkdownNoteDetail.styl
+++ b/browser/main/Detail/MarkdownNoteDetail.styl
@@ -12,8 +12,7 @@
   padding-bottom 3px
 
 .control-lockButton
-  top 160px
-  margin-bottom 10px
+  top 150px
   topBarButtonLight()
 
 .trashed-infopanel
diff --git a/browser/main/Detail/TrashButton.styl b/browser/main/Detail/TrashButton.styl
index b1edbb5f..4410395f 100644
--- a/browser/main/Detail/TrashButton.styl
+++ b/browser/main/Detail/TrashButton.styl
@@ -1,6 +1,5 @@
 .control-trashButton
-  top 120px
-  margin-bottom 10px
+  top 115px
   topBarButtonLight()
 
 .control-trashButton--in-trash
diff --git a/browser/styles/index.styl b/browser/styles/index.styl
index d2c32b88..f252a002 100644
--- a/browser/styles/index.styl
+++ b/browser/styles/index.styl
@@ -181,7 +181,7 @@ topBarButtonLight()
   border-radius 17px
   font-size 14px
   border none
-  color alpha($ui-button-color, 0.4)
+  color alpha($ui-button-color, 0.2)
   fill $ui-button-color
   background-color transparent
   &:active
diff --git a/resources/icon/icon-info-24.svg b/resources/icon/icon-info-24.svg
deleted file mode 100644
index 28b2afb5..00000000
--- a/resources/icon/icon-info-24.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-info-24</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard" transform="translate(-1431.000000, -144.000000)">
-            <g id="icon-info-24" transform="translate(1429.000000, 142.000000)">
-                <rect id="Rectangle-7" fill="#BFBFBF" opacity="0" x="0" y="0" width="24" height="24"></rect>
-                <g id="info" transform="translate(3.000000, 3.000000)">
-                    <circle id="Oval" stroke="#8A8C8D" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" cx="9" cy="9" r="9"></circle>
-                    <path d="M9,14.1428571 L9,9" id="Shape" stroke="#8A8C8D" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"></path>
-                    <circle id="Oval-2" fill="#8A8C8D" cx="9" cy="5.14285714" r="1.28571429"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources/icon/icon-info.svg b/resources/icon/icon-info.svg
index b7ac5bb1..bd808f8c 100644
--- a/resources/icon/icon-info.svg
+++ b/resources/icon/icon-info.svg
@@ -8,10 +8,10 @@
         <g id="Artboard" transform="translate(-1440.000000, -152.000000)">
             <g id="icon-info" transform="translate(1439.000000, 151.000000)">
                 <rect id="Rectangle-7" fill="#BFBFBF" opacity="0" x="0" y="0" width="20" height="20"></rect>
-                <g id="info" transform="translate(2.000000, 2.000000)">
-                    <circle id="Oval" stroke="#8A8C8D" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" cx="8" cy="8" r="8"></circle>
-                    <path d="M8,12.5714286 L8,8" id="Shape" stroke="#8A8C8D" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"></path>
-                    <circle id="Oval-2" fill="#8A8C8D" cx="8" cy="4.57142857" r="1.14285714"></circle>
+                <g id="info" transform="translate(2.000000, 2.000000)" stroke="#000000">
+                    <circle id="Oval" stroke-width="1.6" opacity="0.202558877" stroke-linecap="round" stroke-linejoin="round" cx="8" cy="8" r="8"></circle>
+                    <path d="M8,12.5714286 L8,8" id="Shape" stroke-width="1.6" opacity="0.2" stroke-linecap="round" stroke-linejoin="round"></path>
+                    <circle id="Oval-2" stroke-width="0.8" fill="#000000" opacity="0.2" cx="8" cy="4.57142857" r="1.14285714"></circle>
                 </g>
             </g>
         </g>
diff --git a/resources/icon/icon-sidebar-24.svg b/resources/icon/icon-sidebar-24.svg
deleted file mode 100644
index efdc3ebb..00000000
--- a/resources/icon/icon-sidebar-24.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-sidebar-24</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard" transform="translate(-1400.000000, -219.000000)">
-            <g id="icon-sidebar-24" transform="translate(1397.000000, 216.000000)">
-                <rect id="Rectangle-7" fill="#D8D8D8" opacity="0" x="0" y="0" width="24" height="24"></rect>
-                <g id="sidebar" transform="translate(4.000000, 4.000000)" stroke="#8A8C8D" stroke-width="1.77777778" stroke-linecap="round" stroke-linejoin="round">
-                    <rect id="Rectangle-path" x="0" y="0" width="16" height="16" rx="1.77777778"></rect>
-                    <path d="M5.33333333,0 L5.33333333,16" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources/icon/icon-sidebar.svg b/resources/icon/icon-sidebar.svg
index 26f2be2a..619c4ea3 100644
--- a/resources/icon/icon-sidebar.svg
+++ b/resources/icon/icon-sidebar.svg
@@ -8,7 +8,7 @@
         <g id="Artboard" transform="translate(-1441.000000, -218.000000)">
             <g id="icon-sidebar" transform="translate(1439.000000, 216.000000)">
                 <rect id="Rectangle-7" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
-                <g id="sidebar" transform="translate(3.000000, 3.000000)" stroke="#8A8C8D" stroke-width="1.55555556" stroke-linecap="round" stroke-linejoin="round">
+                <g id="sidebar" opacity="0.197633605" transform="translate(3.000000, 3.000000)" stroke="#000000" stroke-width="1.55555556" stroke-linecap="round" stroke-linejoin="round">
                     <rect id="Rectangle-path" x="0" y="0" width="14" height="14" rx="1.55555556"></rect>
                     <path d="M4.66666667,0 L4.66666667,14" id="Shape"></path>
                 </g>
diff --git a/resources/icon/icon-star-24.svg b/resources/icon/icon-star-24.svg
deleted file mode 100644
index 40b9bf45..00000000
--- a/resources/icon/icon-star-24.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="19px" viewBox="0 0 20 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-star-24</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard" transform="translate(-1313.000000, -147.000000)">
-            <g id="icon-star-24" transform="translate(1311.000000, 145.000000)">
-                <rect id="Rectangle-7" fill="#D8D8D8" opacity="0" x="0" y="0" width="24" height="24"></rect>
-                <rect id="Rectangle-2" fill="#D8D8D8" opacity="0" x="1" y="1" width="18" height="18"></rect>
-                <g id="star" transform="translate(3.000000, 3.000000)" stroke-linecap="round" stroke-width="1.8" stroke="#8A8C8D" stroke-linejoin="round">
-                    <polygon id="Shape" points="9 0 11.781 5.634 18 6.543 13.5 10.926 14.562 17.118 9 14.193 3.438 17.118 4.5 10.926 0 6.543 6.219 5.634"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources/icon/icon-star.svg b/resources/icon/icon-star.svg
index c9a6d84b..3318a7e7 100644
--- a/resources/icon/icon-star.svg
+++ b/resources/icon/icon-star.svg
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="17px" viewBox="0 0 18 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="20px" height="19px" viewBox="0 0 20 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-star</title>
+    <title>icon-star-24</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard" transform="translate(-150.000000, -267.000000)">
-            <g id="BG" transform="translate(64.000000, 132.000000)">
-                <g id="icon-star" transform="translate(85.000000, 134.000000)">
-                    <rect id="Rectangle-7" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
-                    <g id="star" transform="translate(1.000000, 1.000000)">
-                        <rect id="Rectangle-2" fill="#D8D8D8" opacity="0" x="0" y="0" width="18" height="18"></rect>
-                        <g transform="translate(1.500000, 1.500000)" stroke-linecap="round" id="Shape" stroke-width="1.5" stroke="#8A8C8D" stroke-linejoin="round">
-                            <polygon points="7.5 0 9.8175 4.695 15 5.4525 11.25 9.105 12.135 14.265 7.5 11.8275 2.865 14.265 3.75 9.105 0 5.4525 5.1825 4.695"></polygon>
-                        </g>
-                    </g>
-                </g>
+        <g id="icon-star-24" transform="translate(-2.000000, -2.000000)">
+            <rect id="Rectangle-7" fill="#D8D8D8" fill-rule="nonzero" opacity="0" x="0" y="0" width="24" height="24"></rect>
+            <rect id="Rectangle-2" fill="#D8D8D8" fill-rule="nonzero" opacity="0" x="1" y="1" width="18" height="18"></rect>
+            <g id="star" stroke-linecap="round" stroke-linejoin="round" transform="translate(3.000000, 3.000000)" stroke-width="1.8" stroke="#000000" opacity="0.199841486">
+                <polygon id="Shape" points="9 0 11.781 5.634 18 6.543 13.5 10.926 14.562 17.118 9 14.193 3.438 17.118 4.5 10.926 0 6.543 6.219 5.634"></polygon>
             </g>
         </g>
     </g>
diff --git a/resources/icon/icon-starred-24.svg b/resources/icon/icon-starred-24.svg
deleted file mode 100644
index 3e44a3e2..00000000
--- a/resources/icon/icon-starred-24.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="19px" viewBox="0 0 20 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-starred-24</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard" transform="translate(-1346.000000, -147.000000)">
-            <g id="icon-starred-24" transform="translate(1344.000000, 145.000000)">
-                <rect id="Rectangle-7" fill="#D8D8D8" opacity="0" x="0" y="0" width="24" height="24"></rect>
-                <rect id="Rectangle-2" fill="#D8D8D8" opacity="0" x="1" y="1" width="18" height="18"></rect>
-                <g id="star" transform="translate(3.000000, 3.000000)" stroke-linecap="round" stroke-width="1.8" stroke="#FDD835" fill="#FDD835" stroke-linejoin="round">
-                    <polygon id="Shape" points="9 0 11.781 5.634 18 6.543 13.5 10.926 14.562 17.118 9 14.193 3.438 17.118 4.5 10.926 0 6.543 6.219 5.634"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources/icon/icon-trash-24.svg b/resources/icon/icon-trash-24.svg
deleted file mode 100644
index a72ff7da..00000000
--- a/resources/icon/icon-trash-24.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="20px" viewBox="0 0 18 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-trash-24</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard" transform="translate(-1404.000000, -250.000000)">
-            <g id="icon-trash-24" transform="translate(1401.000000, 248.000000)">
-                <rect id="Rectangle-7" fill="#D8D8D8" opacity="0" x="0" y="0" width="24" height="24"></rect>
-                <g id="trash" transform="translate(4.000000, 3.000000)" stroke-linecap="round" stroke-width="1.77777778" stroke="#8A8C8D" stroke-linejoin="round">
-                    <polyline id="Shape" points="0 3.6 1.77777778 3.6 16 3.6"></polyline>
-                    <path d="M14.2222222,3.6 L14.2222222,16.2 C14.2222222,17.1941125 13.426284,18 12.4444444,18 L3.55555556,18 C2.573716,18 1.77777778,17.1941125 1.77777778,16.2 L1.77777778,3.6 M4.44444444,3.6 L4.44444444,1.8 C4.44444444,0.80588745 5.24038267,0 6.22222222,0 L9.77777778,0 C10.7596173,0 11.5555556,0.80588745 11.5555556,1.8 L11.5555556,3.6" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources/icon/icon-trash.svg b/resources/icon/icon-trash.svg
index 431972bd..64dedb87 100644
--- a/resources/icon/icon-trash.svg
+++ b/resources/icon/icon-trash.svg
@@ -5,10 +5,10 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard" transform="translate(-84.000000, -263.000000)">
-            <g id="icon-trash" transform="translate(82.000000, 262.000000)">
-                <rect id="Rectangle-7" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
-                <g id="trash" transform="translate(3.000000, 2.000000)" stroke-linecap="round" stroke-width="1.55555556" stroke="#8A8C8D" stroke-linejoin="round">
+        <g id="Artboard" transform="translate(-1441.000000, -249.000000)">
+            <g id="icon-trash" transform="translate(1439.000000, 248.000000)">
+                <rect id="Rectangle-7" fill="#C6C6C6" fill-rule="nonzero" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                <g id="trash" stroke-linecap="round" stroke-linejoin="round" transform="translate(3.000000, 2.000000)" stroke-width="1.55555556" stroke="#C7C7C7">
                     <polyline id="Shape" points="0 3.2 1.55555556 3.2 14 3.2"></polyline>
                     <path d="M12.4444444,3.2 L12.4444444,14.4 C12.4444444,15.2836556 11.7479985,16 10.8888889,16 L3.11111111,16 C2.2520015,16 1.55555556,15.2836556 1.55555556,14.4 L1.55555556,3.2 M3.88888889,3.2 L3.88888889,1.6 C3.88888889,0.7163444 4.58533483,0 5.44444444,0 L8.55555556,0 C9.41466517,0 10.1111111,0.7163444 10.1111111,1.6 L10.1111111,3.2" id="Shape"></path>
                 </g>
diff --git a/resources/icon/icon-unlock.svg b/resources/icon/icon-unlock.svg
index 75503cfb..0e20453f 100644
--- a/resources/icon/icon-unlock.svg
+++ b/resources/icon/icon-unlock.svg
@@ -8,7 +8,7 @@
         <g id="Artboard" transform="translate(-1463.000000, -284.000000)">
             <g id="icon-unlock" transform="translate(1461.000000, 282.000000)">
                 <rect id="Rectangle-7" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
-                <g id="unlock" transform="translate(3.000000, 2.000000)" stroke="#8A8C8D" stroke-width="1.55555556" stroke-linecap="round" stroke-linejoin="round">
+                <g id="unlock" transform="translate(3.000000, 2.000000)" stroke="#C7C7C7" stroke-width="1.55555556" stroke-linecap="round" stroke-linejoin="round">
                     <rect id="Rectangle-path" x="0" y="7.61904762" width="14" height="8.38095238" rx="1.55555556"></rect>
                     <path d="M3.11111111,7.61904762 L3.11111111,4.57142857 C3.10910319,2.61427389 4.62135513,0.974054703 6.60916974,0.777363091 C8.59698434,0.580671479 10.4135331,1.89151027 10.8111111,3.80952381" id="Shape"></path>
                 </g>