diff --git a/_includes/2017/search-form.html b/_includes/2017/search-form.html
index f3f705842..acc46d274 100644
--- a/_includes/2017/search-form.html
+++ b/_includes/2017/search-form.html
@@ -2,10 +2,8 @@
   {% if include.live %}data-js-search-form{% endif %}
   class='search' action='{{ base }}' method='get'>
   <label class='search-box {{ include.class }}'>
-    {% comment %}
     <span class='prefix'>{{ site.data.content.search_form.prefix }}</span>
     <span class='sep'>/</span>
-    {% endcomment %}
     <input name='q'
       type='text'
       {% if include.live %}
diff --git a/_sass/2017/components/search-box.scss b/_sass/2017/components/search-box.scss
index 24797f878..626f29397 100644
--- a/_sass/2017/components/search-box.scss
+++ b/_sass/2017/components/search-box.scss
@@ -13,7 +13,7 @@
     height: 64px;
     background: transparent;
     border: 0;
-    Flex: 1 0 auto;
+    flex: 1 0 auto;
     padding-left: 0;
     font-weight: bold;
     color: $base-head;
@@ -28,20 +28,27 @@
     outline: 0;
   }
 
-  & > .prefix,
-  & > .sep {
-    @include font-size(2);
+  & > .prefix {
+    @include font-size(0);
     display: block;
-    color: $base-mute;
+    color: rgba($base-mute, 0.5);
     font-weight: 400;
-    opacity: 0.5;
     user-select: none;
+    line-height: 1.5em;
+    padding: 2px 8px;
+    border-radius: 3px;
+    background: rgba($base-body, 0.5);
+    margin: 0 0 0 16px;
+    box-shadow: 0 1px 1px rgba($base-mute, 0.25);
   }
 
   & > .sep {
+    color: rgba($base-mute, 0.5);
+    @include font-size(2);
     margin: 0 8px;
   }
 
+  // Icon
   &::before {
     @include ion-icon('md-search');
     font-size: 32px;
@@ -50,6 +57,7 @@
     width: 64px;
     line-height: 64px;
     text-align: center;
+    order: 2;
   }
 }