diff --git a/src/core/public/ui_settings/ui_settings_service.mock.ts b/src/core/public/ui_settings/ui_settings_service.mock.ts
index 52d7d219669ab7..e1f7eeff934719 100644
--- a/src/core/public/ui_settings/ui_settings_service.mock.ts
+++ b/src/core/public/ui_settings/ui_settings_service.mock.ts
@@ -22,7 +22,7 @@ import { IUiSettingsClient } from './types';
 
 const createSetupContractMock = () => {
   const setupContract: jest.Mocked<IUiSettingsClient> = {
-    getAll: jest.fn(() => ({})),
+    getAll: jest.fn(),
     get: jest.fn(),
     get$: jest.fn(),
     set: jest.fn(),
@@ -40,6 +40,7 @@ const createSetupContractMock = () => {
   setupContract.getUpdate$.mockReturnValue(new Rx.Subject<any>());
   setupContract.getSaved$.mockReturnValue(new Rx.Subject<any>());
   setupContract.getUpdateErrors$.mockReturnValue(new Rx.Subject<any>());
+  setupContract.getAll.mockReturnValue({});
 
   return setupContract;
 };
diff --git a/src/legacy/core_plugins/kibana/public/management/index.scss b/src/legacy/core_plugins/kibana/public/management/index.scss
index c90985db5ed757..bc958f469bede2 100644
--- a/src/legacy/core_plugins/kibana/public/management/index.scss
+++ b/src/legacy/core_plugins/kibana/public/management/index.scss
@@ -11,5 +11,5 @@
 
 // Core
 @import 'management_app';
-@import '../../../../../plugins/advanced_settings/public/management_app/advanced_settings';
+@import '../../../../../plugins/advanced_settings/public';
 @import 'sections/index_patterns/index';
diff --git a/src/plugins/advanced_settings/public/_index.scss b/src/plugins/advanced_settings/public/_index.scss
new file mode 100644
index 00000000000000..f3fe78bf6a9c01
--- /dev/null
+++ b/src/plugins/advanced_settings/public/_index.scss
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ @import './management_app/advanced_settings';
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.scss b/src/plugins/advanced_settings/public/management_app/advanced_settings.scss
index 6710583cf5c877..79b6feccb6b7d6 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.scss
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.scss
@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 .mgtAdvancedSettings__field {
   + * {
     margin-top: $euiSize;