diff --git a/public/legacy/modules/Administration/Search/ElasticSearch/view.tpl b/public/legacy/modules/Administration/Search/ElasticSearch/view.tpl
index 6a9a7dc73..fc058c2a9 100644
--- a/public/legacy/modules/Administration/Search/ElasticSearch/view.tpl
+++ b/public/legacy/modules/Administration/Search/ElasticSearch/view.tpl
@@ -35,11 +35,9 @@
  * reasonably feasible for technical reasons, the Appropriate Legal Notices must
  * display the words "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  *}
-<h1>{$MOD.LBL_ELASTIC_SEARCH_SETTINGS}</h1>
+<h2>{$MOD.LBL_ELASTIC_SEARCH_SETTINGS}</h2>
 <p class="text-muted">{$MOD.LBL_ELASTIC_SEARCH_SETTINGS_HELP}</p>
 
-<br/>
-
 <form id="ConfigureSettings"
       name="ConfigureSettings"
       class="detail-view"
@@ -48,15 +46,18 @@
       action="?module=Administration&action=ElasticSearchSettings&do=SaveConfig">
 
     <div class="row">
+     <div class="settings-buttons">
+        {$BUTTONS}
+    </div>
         <div class="panel panel-primary">
             <div class="panel-heading">{$MOD.LBL_ELASTIC_SEARCH_GENERAL}</div>
             <div class="panel-body tab-content text-center">
                 <div class="col-md-6">
                     <div class="form-check">
-                        <input type="checkbox" class="form-check-input"
-                               id="es-enabled" name="enabled"
-                               {if $config.enabled}checked='checked'{/if}>
-                        <label class="form-check-label" for="es-enabled">{$MOD.LBL_ELASTIC_SEARCH_ENABLE}</label>
+                    <label class="form-check-label" for="es-enabled">{$MOD.LBL_ELASTIC_SEARCH_ENABLE}</label>
+                    <input type="checkbox" class="form-check-input"
+                            id="es-enabled" name="enabled"
+                            {if $config.enabled}checked='checked'{/if}>                        
                     </div>
                 </div>
                 <div class="col-md-6">
@@ -141,11 +142,7 @@
                 </div>
             </div>
         </div>
-    </div>
-
-    <div>
-        {$BUTTONS}
-    </div>
+    </div>  
 
     {$JAVASCRIPT}
 
diff --git a/public/legacy/modules/Administration/language/en_us.lang.php b/public/legacy/modules/Administration/language/en_us.lang.php
index df483b6e7..231cad0a4 100755
--- a/public/legacy/modules/Administration/language/en_us.lang.php
+++ b/public/legacy/modules/Administration/language/en_us.lang.php
@@ -927,7 +927,7 @@ $mod_strings = array(
     'LBL_ELASTIC_SEARCH_SETTINGS_DESC' => 'Configure Elasticsearch preferences',
     'LBL_ELASTIC_SEARCH_SETTINGS_HELP' => 'Elasticsearch requires an external server set up to work. Read the <a href="https://docs.suitecrm.com/admin/administration-panel/search/elasticsearch/">documentation</a> to learn how.',
     'LBL_ELASTIC_SEARCH_GENERAL' => 'General',
-    'LBL_ELASTIC_SEARCH_ENABLE' => 'Enable Elasticsearch.',
+    'LBL_ELASTIC_SEARCH_ENABLE' => 'Enable Elasticsearch:',
     'LBL_ELASTIC_SEARCH_TEST_CONNECTION' => 'Test connection',
     'LBL_ELASTIC_SEARCH_TEST_CONNECTION_SUCCESS' => 'Connection successful.',
     'LBL_ELASTIC_SEARCH_TEST_CONNECTION_FAIL' => 'Connection failed.',
diff --git a/public/legacy/themes/suite8/css/Dawn/style.scss b/public/legacy/themes/suite8/css/Dawn/style.scss
index 0cc139d89..60f8e63c5 100644
--- a/public/legacy/themes/suite8/css/Dawn/style.scss
+++ b/public/legacy/themes/suite8/css/Dawn/style.scss
@@ -175,4 +175,5 @@
 @import '../suitep-base/pdf-settings.scss';
 @import '../suitep-base/admin-locale-mobile.scss';
 @import '../suitep-base/search-settings.scss';
+@import '../suitep-base/elastic-search-settings.scss';
 //
diff --git a/public/legacy/themes/suite8/css/suitep-base/elastic-search-settings.scss b/public/legacy/themes/suite8/css/suitep-base/elastic-search-settings.scss
new file mode 100644
index 000000000..73e86853a
--- /dev/null
+++ b/public/legacy/themes/suite8/css/suitep-base/elastic-search-settings.scss
@@ -0,0 +1,55 @@
+.view-action-ElasticSearchSettings {
+    h2 {
+        font-size: 1.8em;
+        color: $shell-grey;
+        text-transform: capitalize;
+        letter-spacing: 0.1em;
+        border-bottom: 1px solid lightgrey;
+        padding-bottom: 0.5em;
+    }
+    #es-test-connection {
+        margin-bottom: 0;
+    }
+    .button {
+        background-color: $nepal-grey;
+        border-radius: 0.2em;
+        font-weight: bold;
+        height: 2.2em;
+        line-height: 1em;
+        letter-spacing: 0.05em;
+        padding: 0.3em 1em;
+        text-transform: capitalize;
+        &:hover {
+            background: $pale-blue;
+        }
+    }
+    .form-check {
+        margin-top: 0.5em;
+        .form-check-input {
+            position: relative;
+            top:1px;
+        }
+        .form-check-label {
+            margin-left: 0.5em;
+            vertical-align: text-top;
+            margin-right: 0.5em;
+        }
+    }
+    .detail-view .tab-content {
+        padding-left: 1.5rem;
+        padding-right: 1.5rem;
+        padding-bottom: 1rem;
+    }
+    input[type=submit].button:hover {
+        background: $pale-blue;
+    }
+    .settings-buttons {
+        position: absolute;
+        right: 0;
+        margin-top: -5.5em;
+    }
+    input[type=text],input[type=password],input[type=email],input[type=number],textarea{
+        background-color: $transparent-color;
+        border: 1px solid $form-border-color;
+    }
+}
\ No newline at end of file