diff --git a/modules/backend/formwidgets/recordfinder/partials/_recordfinder_form.htm b/modules/backend/formwidgets/recordfinder/partials/_recordfinder_form.htm
index 1504e80c2..561030514 100644
--- a/modules/backend/formwidgets/recordfinder/partials/_recordfinder_form.htm
+++ b/modules/backend/formwidgets/recordfinder/partials/_recordfinder_form.htm
@@ -5,7 +5,7 @@
             <h4 class="modal-title"><?= e(trans($title)) ?></h4>
         </div>
 
-        <div class="list-flush" data-request-data="recordfinder_flag: 1">
+        <div class="recordfinder-list list-flush" data-request-data="recordfinder_flag: 1">
             <?= $searchWidget->render() ?>
             <?= $listWidget->render() ?>
         </div>
diff --git a/modules/system/assets/css/framework.extras.css b/modules/system/assets/css/framework.extras.css
index 5055da464..2dfe08e0c 100644
--- a/modules/system/assets/css/framework.extras.css
+++ b/modules/system/assets/css/framework.extras.css
@@ -136,7 +136,8 @@ body > p.flash-message button.close:focus {
   display: none;
 }
 a.oc-loading:after,
-button.oc-loading:after {
+button.oc-loading:after,
+span.oc-loading:after {
   content: '';
   display: inline-block;
   vertical-align: middle;
diff --git a/modules/system/assets/less/framework.extras.less b/modules/system/assets/less/framework.extras.less
index 67b163d48..77f27eae6 100644
--- a/modules/system/assets/less/framework.extras.less
+++ b/modules/system/assets/less/framework.extras.less
@@ -151,7 +151,7 @@ body > p.flash-message {
 // Element Loader
 // --------------------------------------------------
 
-a.oc-loading, button.oc-loading {
+a.oc-loading, button.oc-loading, span.oc-loading {
     &:after {
         content: '';
         display: inline-block;
diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less
index 7d3f6dd03..d6f443d25 100644
--- a/modules/system/assets/ui/less/form.less
+++ b/modules/system/assets/ui/less/form.less
@@ -402,12 +402,20 @@
     }
 }
 
+.recordfinder-list {
+    .list-footer {
+        padding-top: 0;
+        padding-bottom: 0;
+    }
+}
+
 .recordfinder-search {
     background-position: right -81px !important;
-    border-top: none  !important;
-    border-left: none  !important;
-    border-right: none  !important;
+    border-top: none !important;
+    border-left: none !important;
+    border-right: none !important;
     border-radius: 0;
+    padding-left: 20px;
 }
 
 .form-buttons {
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index 495f3c8f7..71b7d3d5c 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -2509,7 +2509,8 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .field-recordfinder .btn:hover{color:#333333}
 .field-recordfinder .text-muted i{font-size:14px;position:relative;top:1px;display:inline-block;margin:0 2px}
 .field-recordfinder .primary{font-weight:600}
-.recordfinder-search{background-position:right -81px !important;border-top:none !important;border-left:none !important;border-right:none !important;border-radius:0}
+.recordfinder-list .list-footer{padding-top:0;padding-bottom:0}
+.recordfinder-search{background-position:right -81px !important;border-top:none !important;border-left:none !important;border-right:none !important;border-radius:0;padding-left:20px}
 .form-buttons{padding-bottom:20px;font-size:0}
 .form-buttons:before,.form-buttons:after{content:" ";display:table}
 .form-buttons:after{clear:both}