diff --git a/modules/wkroomsearchblock/views/css/wk-category-search.css b/modules/wkroomsearchblock/views/css/wk-category-search.css
index 51a0031dc..57e2f0a17 100644
--- a/modules/wkroomsearchblock/views/css/wk-category-search.css
+++ b/modules/wkroomsearchblock/views/css/wk-category-search.css
@@ -38,14 +38,6 @@
   .header-rmsearch-wrapper #search_hotel_block_form #daterange_value.multi-date {
     grid-template-columns: 1fr;
   }
-  #search_hotel_block_form .header-rmsearch-input {
-    height: unset;
-    min-height: 45px;
-  }
-  #search_hotel_block_form #search_room_submit {
-    height: unset;
-    min-height: 45px;
-  }
   #search_hotel_block_form .hotel-selector-wrap .chosen-container-single .chosen-single {
     min-height: 45px;
   }
diff --git a/modules/wkroomsearchblock/views/css/wk-global-search.css b/modules/wkroomsearchblock/views/css/wk-global-search.css
index a0d4bcf03..d54af2d05 100644
--- a/modules/wkroomsearchblock/views/css/wk-global-search.css
+++ b/modules/wkroomsearchblock/views/css/wk-global-search.css
@@ -68,6 +68,7 @@
   font-weight: 400;
   border: 1px solid #555555;
   background-color: #FFF;
+  height: 100%;
   min-height: 55px;}
   #search_hotel_block_form .header-rmsearch-input:active, #search_hotel_block_form .header-rmsearch-input:focus {
     border: 2px solid #1292FF;}
@@ -75,12 +76,9 @@
     appearance: none;
     width: 100%;
     padding-left: 35px;
+    padding-right: 20px;
     background: url("../../views/img/icon-hotel.svg") no-repeat 10px 50%, url("../../views/img/icon-dropdown-arrow.svg") no-repeat calc(100% - 10px) 50%;
     background-color: #FFF;}
-  #search_hotel_block_form #guest_occupancy {
-    height: unset;
-    text-align: unset;
-  }
   #search_hotel_block_form .input-date {
     display: grid;
     cursor: text;}
@@ -181,7 +179,8 @@
         font-size: 13px;
         text-transform: uppercase;
         border: none;
-        border-radius: 4px;}
+        border-radius: 4px;
+        min-height: 55px;}
       .submit_occupancy_btn {
         background-color: #1292FF;
         border: none;
diff --git a/modules/wkroomsearchblock/views/css/wk-landing-page-search.css b/modules/wkroomsearchblock/views/css/wk-landing-page-search.css
index 812f782b7..22cece330 100644
--- a/modules/wkroomsearchblock/views/css/wk-landing-page-search.css
+++ b/modules/wkroomsearchblock/views/css/wk-landing-page-search.css
@@ -72,10 +72,6 @@
     float: left;
     margin-top: 5px;
     width: 125px;}
-  #search_hotel_block_form #search_room_submit {
-    height: unset;
-    min-height: 45px;
-  }
 /* .fancybox-inner #search_hotel_block_form {
   grid-template-columns: 1fr;
 } */
\ No newline at end of file
diff --git a/modules/wkroomsearchblock/views/css/wk-roomtype-search.css b/modules/wkroomsearchblock/views/css/wk-roomtype-search.css
index bc6beff2c..bbbfc1cfc 100644
--- a/modules/wkroomsearchblock/views/css/wk-roomtype-search.css
+++ b/modules/wkroomsearchblock/views/css/wk-roomtype-search.css
@@ -64,10 +64,7 @@
       background-color: #FAFAFA;}
       .faded-txt {
         color: #777777;}
-      #search_hotel_block_form #search_room_submit {
-        height: unset;
-        min-height: 45px;
-      }
+
 @media (max-width: 767px) {
   .header-rmsearch-wrapper #search_hotel_block_form .grid {
     grid-template-columns: 1fr;
diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js
index 956794b7e..36d0a4205 100644
--- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js
+++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js
@@ -458,6 +458,14 @@ $(document).ready(function() {
                     }
                 },
                 endDate: max_order_date,
+                customOpenAnimation: function(cb)
+                {
+                    $(this).show(10, cb);
+                },
+                customCloseAnimation: function(cb)
+                {
+                    $(this).hide(10, cb);
+                }
             }).on('datepicker-first-date-selected', function() {
                 calendarFirstDateSelected = true;
             }).on('datepicker-change', function(event,obj){
@@ -488,6 +496,14 @@ $(document).ready(function() {
             $('#daterange_value').dateRangePicker({
                 startDate: start_date,
                 endDate: max_order_date,
+                customOpenAnimation: function(cb)
+                {
+                    $(this).show(10, cb);
+                },
+                customCloseAnimation: function(cb)
+                {
+                    $(this).hide(10, cb);
+                }
             }).on('datepicker-first-date-selected', function() {
                 calendarFirstDateSelected = true;
             }).on('datepicker-change', function(event,obj){
diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
index 274c400ca..d7f89bc11 100644
--- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
@@ -24,9 +24,9 @@
             {block name='search_form_location'}
                 {if isset($location_enabled) && $location_enabled}
                     <div class="form-group grid-item area-4">
-                        <input type="text" class="form-control header-rmsearch-input input-location" id="hotel_location" name="hotel_location" autocomplete="off" placeholder="{l s='Hotel Location' mod='wkroomsearchblock'}" {if isset($search_data)}value="{$search_data['location']|escape:'htmlall':'UTF-8'}"{/if}>
-                        <input hidden="hidden" name="location_category_id" id="location_category_id" {if isset($search_data)}value="{$search_data['location_category_id']|escape:'htmlall':'UTF-8'}"{/if}>
                         <div class="dropdown">
+                            <input type="text" class="form-control header-rmsearch-input input-location" id="hotel_location" name="hotel_location" autocomplete="off" placeholder="{l s='Hotel Location' mod='wkroomsearchblock'}" {if isset($search_data)}value="{$search_data['location']|escape:'htmlall':'UTF-8'}"{/if}>
+                            <input hidden="hidden" name="location_category_id" id="location_category_id" {if isset($search_data)}value="{$search_data['location_category_id']|escape:'htmlall':'UTF-8'}"{/if}>
                             <ul class="location_search_results_ul dropdown-menu"></ul>
                         </div>
                     </div>