diff --git a/header.php b/header.php
index 5790fb1..120c50f 100644
--- a/header.php
+++ b/header.php
@@ -101,7 +101,7 @@
 						<a id="icon-add-pin" rel="tooltip" data-placement="bottom" title="<?php _e('Add Pin', 'pinc'); ?>" href="<?php echo home_url('/itm-settings/'); ?>">
 							<span class="fa-stack">
 							<i class="fas fa-file fa-stack-2x" style="font-size: 18px; top: 3px;"></i>
-								<i class="fas fa-plus fa-stack-1x fa-inverse" style="font-size: 11px; color: #222; top: 3px;"></i>
+								<i class="fas fa-plus fa-stack-1x fa-inverse" style="font-size: 11px; top: 3px;"></i>
 							</span>
 						</a>
 					</li>
@@ -148,13 +148,13 @@
 				?>
 
 				<?php if ( is_home() == false || of_get_option('daily_photo_feature') == 'off' ) { ?>
-					<ul class="nav navbar-nav top-search">
-						<form class="navbar-form" method="get" id="searchform" action="<?php echo home_url('/'); ?>">
-							<input id="s" class="form-control input-sm search-query" type="search" placeholder="<?php _e('Search', 'pinc'); ?>" name="s" value="<?php the_search_query(); ?>">
+					<div class="nav navbar-nav top-search">
+						<form class="navbar-form top-search-from" method="get" id="searchform" action="<?php echo home_url('/'); ?>">
+							<input id="s" class="form-control input-sm search-query top-search-input" type="search" placeholder="<?php _e('Search', 'pinc'); ?>" name="s" value="<?php the_search_query(); ?>">
 							<input type="hidden" name="q" value="<?php echo $_GET['q']; ?>"/>
-							<button class="btn btn-success btn-sm" type="submit"><i class="fas fa-search"></i></button>
+							<button class="btn btn-sm top-search-btn" type="submit"><i class="fas fa-search"></i></button>
 						</form>
-					</ul>
+					</div>
 				<?php }?>
 
 				<ul id="topmenu-icons-wrapper" class="nav navbar-nav">
diff --git a/style-dark.css b/style-dark.css
index e1fde81..7ad5fb4 100644
--- a/style-dark.css
+++ b/style-dark.css
@@ -20,7 +20,7 @@ border-color: #4f4f4f;
 }
 
 .btn:hover, .btn:focus, .btn.focus {
-    color: #fafafa;
+    color: #fafafa !important;
 }
 
 .tags-detail a {
@@ -879,4 +879,12 @@ input[type = search], input[type = text] ,textarea, select {
 }
 input[type = search]:focus, input[type = text]:focus ,textarea:focus , select:focus {
     background-color: #fff !important;
+}
+
+.fas.fa-plus.fa-stack-1x.fa-inverse {
+	color: #222;
+}
+
+.top-search-btn {
+	background-color: #333 !important;
 }
\ No newline at end of file
diff --git a/style.css b/style.css
index a92c3de..caf257f 100644
--- a/style.css
+++ b/style.css
@@ -221,12 +221,27 @@ float: left;
 width: 50%;
 }
 
-.top-search{
-    width: 100%;
+.top-search {
+	font-size: 0;
 }
 
-.form-control.input-sm.search-query {
+.top-search-from{
+    padding-right: 8px;
+}
+
+.top-search-input {
     border-radius: 20px 0 0 20px;
+	max-width: 140px;
+	border-right: 0;
+}
+
+.top-search-btn {
+	border-radius: 0 20px 20px 0;
+	border-left: 0;
+	background-color: #fff !important;
+	color: #999;
+	border-color: #ccc;
+	height: 30px;
 }
 
 #topmenu #dropdown-search {