diff --git a/core/themes/bartik/css/components/search-form.css b/core/themes/bartik/css/components/search-form.css
index b8c4017..3caa80c 100644
--- a/core/themes/bartik/css/components/search-form.css
+++ b/core/themes/bartik/css/components/search-form.css
@@ -6,28 +6,50 @@
 .search-form {
   font-size: 0.875rem;
 }
+.search-form,
+.search-form .container-inline {
+  position: relative;
+}
 .search-form .form-search {
-  float: left; /* LTR */
-  margin-right: 5px; /* LTR */
-  padding: 4px;
+  padding: 4px 0 4px 0;
+  text-indent: 5px;
+  height: 27px;
+  border-right: 0;
+  width: 100%;
+  box-sizing: border-box;
 }
-[dir="rtl"] .search-form .form-search {
-  float: right;
-  margin-left: 5px;
+.search-form #edit-actions  {
+  margin-right: 0;
+  height: 27px;
+}
+.search-form #edit-actions input  {
   margin-right: 0;
 }
+[dir="rtl"] .search-form #edit-actions input  {
+  margin-left: 0;
+}
 .button.search-form__submit,
 .search-form__submit {
   background: #f0f0f0 url(../../../../misc/icons/505050/loupe.svg) no-repeat center;
   cursor: pointer;
-  height: 26px;
+  height: 27px;
   margin-left: 0;
   margin-right: 0;
   overflow: hidden;
   padding: 0;
   text-indent: -9999px;
   direction: ltr;
-  width: 34px;
+  border-radius: 0 4px 4px 0;
+  width: 27px;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+}
+[dir="rtl"] .button.search-form__submit,
+[dir="rtl"] .search-form__submit {
+  right: auto;
+  left: 0;
+  border-radius: 4px 0 0 4px;
 }
 .button.search-form__submit:hover,
 .search-form__submit:hover,
@@ -38,3 +60,24 @@
 .search-form .form-item-keys label {
   display: block;
 }
+.search-form .form-type-search {
+  padding-right: 27px;
+  display: block;
+}
+[dir="rtl"] .search-form .form-type-search {
+  padding-right: 0;
+  padding-left: 27px;
+}
+[dir="rtl"] .search-form .form-search {
+  border-right: 1px solid #ccc;
+  border-left: 0;
+}
+
+/**
+ * Overrides the general input bottom margin for search form in small devices.
+ */
+@media all and (max-width: 600px) {
+  .search-form .form-search {
+    margin-bottom: 0;
+  }
+}