diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 85c834a..1b3f848 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -508,10 +508,10 @@ h1#site-name {
   background: rgba(255, 255, 255, 0.9);
 }
 /* Search block in region header. */
-.region-header #block-search-form {
+.region-header #search-block-form {
   width: 208px;
 }
-.region-header #block-search-form .form-text {
+.region-header #search-block-form .form-text {
   width: 154px;
 }
 /* Language switcher block in region header. */
@@ -1544,39 +1544,44 @@ div.password-suggestions {
 
 /* --------------- Search Form ---------------- */
 
-#block-search-form {
+#search-block-form {
   padding-bottom: 7px;
+  overflow: hidden;
 }
-#block-search-form .content {
+#search-block-form .content {
   margin-top: 0;
 }
 #search-form input[type="search"],
-#block-search-form input[type="search"] {
+#search-block-form input[type="search"] {
   box-sizing: border-box;
   padding: 4px;
   -webkit-appearance: textfield;
+  border-right: 0;
+  border-top-left-radius: 15px;
+  border-bottom-left-radius: 15px;
 }
 #search-form input[type="search"]::-webkit-search-decoration,
-#block-search-form input[type="search"]::-webkit-search-decoration {
+#search-block-form input[type="search"]::-webkit-search-decoration {
   display: none;
 }
 #search-form input#edit-keys,
-#block-search-form .form-item-search-block-form input {
+#search-block-form .form-item-search-block-form input {
   float: left; /* LTR */
   font-size: 1em;
-  margin-right: 5px;
+  margin-right: 0;
 }
 [dir="rtl"] #search-form input#edit-keys,
-[dir="rtl"] #block-search-form .form-item-search-block-form input {
+[dir="rtl"] #search-block-form .form-item-search-block-form input {
   float: right;
   margin-left: 5px;
   margin-right: 0;
 }
 #search-block-form input.form-submit,
 #search-form input.form-submit {
+  float: left;
   margin-left: 0;
   margin-right: 0;
-  height: 25px;
+  height: 26px;
   width: 34px;
   padding: 0;
   cursor: pointer;
@@ -1584,6 +1589,9 @@ div.password-suggestions {
   border-color: #e4e4e4 #d2d2d2 #b4b4b4;
   background: #f0f0f0 url("../../../misc/icons/505050/loupe.svg") no-repeat center;
   overflow: hidden;
+  /*border-left: 0;*/
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
 #search-block-form input.form-submit:hover,
 #search-block-form input.form-submit:focus,