diff --git a/dashboards-observability/common/constants/metrics.ts b/dashboards-observability/common/constants/metrics.ts
index 0facdc693..4a2d8e114 100644
--- a/dashboards-observability/common/constants/metrics.ts
+++ b/dashboards-observability/common/constants/metrics.ts
@@ -17,8 +17,8 @@ export const resolutionOptions = [
   { value: 'm', text: 'minutes' },
   { value: 'h', text: 'hours' },
   { value: 'd', text: 'days' },
-  { value: 'M', text: 'Months' },
-  { value: 'q', text: 'quarters' },
+  // { value: 'M', text: 'Months' },
+  // { value: 'q', text: 'quarters' },
   { value: 'y', text: 'years' },
 ];
 
diff --git a/dashboards-observability/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap b/dashboards-observability/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
index 9cee54555..b7f4adfcd 100644
--- a/dashboards-observability/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
+++ b/dashboards-observability/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
@@ -125,7 +125,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
               initialIsOpen={true}
               isLoading={false}
               isLoadingMessage={false}
-              paddingSize="xs"
+              paddingSize="none"
             >
               <div
                 className="euiAccordion euiAccordion-isOpen"
@@ -197,7 +197,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                   >
                     <div>
                       <div
-                        className="euiAccordion__padding--xs"
+                        className=""
                       >
                         <ul
                           className="metricsList"
@@ -230,7 +230,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
               initialIsOpen={true}
               isLoading={false}
               isLoadingMessage={false}
-              paddingSize="xs"
+              paddingSize="none"
             >
               <div
                 className="euiAccordion euiAccordion-isOpen"
@@ -302,7 +302,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                   >
                     <div>
                       <div
-                        className="euiAccordion__padding--xs"
+                        className=""
                       >
                         <ul
                           className="metricsList"
@@ -335,7 +335,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
               initialIsOpen={true}
               isLoading={false}
               isLoadingMessage={false}
-              paddingSize="xs"
+              paddingSize="none"
             >
               <div
                 className="euiAccordion euiAccordion-isOpen"
@@ -407,7 +407,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                   >
                     <div>
                       <div
-                        className="euiAccordion__padding--xs"
+                        className=""
                       >
                         <ul
                           className="metricsList"
diff --git a/dashboards-observability/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap b/dashboards-observability/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
index 31818772d..274f4b2f0 100644
--- a/dashboards-observability/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
+++ b/dashboards-observability/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
@@ -274,14 +274,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when disabled in
                                   "text": "days",
                                   "value": "d",
                                 },
-                                Object {
-                                  "text": "Months",
-                                  "value": "M",
-                                },
-                                Object {
-                                  "text": "quarters",
-                                  "value": "q",
-                                },
                                 Object {
                                   "text": "years",
                                   "value": "y",
@@ -323,14 +315,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when disabled in
                                     "text": "days",
                                     "value": "d",
                                   },
-                                  Object {
-                                    "text": "Months",
-                                    "value": "M",
-                                  },
-                                  Object {
-                                    "text": "quarters",
-                                    "value": "q",
-                                  },
                                   Object {
                                     "text": "years",
                                     "value": "y",
@@ -396,14 +380,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when disabled in
                                     "text": "days",
                                     "value": "d",
                                   },
-                                  Object {
-                                    "text": "Months",
-                                    "value": "M",
-                                  },
-                                  Object {
-                                    "text": "quarters",
-                                    "value": "q",
-                                  },
                                   Object {
                                     "text": "years",
                                     "value": "y",
@@ -465,18 +441,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when disabled in
                                         </option>
                                         <option
                                           key="4"
-                                          value="M"
-                                        >
-                                          Months
-                                        </option>
-                                        <option
-                                          key="5"
-                                          value="q"
-                                        >
-                                          quarters
-                                        </option>
-                                        <option
-                                          key="6"
                                           value="y"
                                         >
                                           years
@@ -1631,14 +1595,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when disabled wit
                                   "text": "days",
                                   "value": "d",
                                 },
-                                Object {
-                                  "text": "Months",
-                                  "value": "M",
-                                },
-                                Object {
-                                  "text": "quarters",
-                                  "value": "q",
-                                },
                                 Object {
                                   "text": "years",
                                   "value": "y",
@@ -1680,14 +1636,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when disabled wit
                                     "text": "days",
                                     "value": "d",
                                   },
-                                  Object {
-                                    "text": "Months",
-                                    "value": "M",
-                                  },
-                                  Object {
-                                    "text": "quarters",
-                                    "value": "q",
-                                  },
                                   Object {
                                     "text": "years",
                                     "value": "y",
@@ -1753,14 +1701,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when disabled wit
                                     "text": "days",
                                     "value": "d",
                                   },
-                                  Object {
-                                    "text": "Months",
-                                    "value": "M",
-                                  },
-                                  Object {
-                                    "text": "quarters",
-                                    "value": "q",
-                                  },
                                   Object {
                                     "text": "years",
                                     "value": "y",
@@ -1822,18 +1762,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when disabled wit
                                         </option>
                                         <option
                                           key="4"
-                                          value="M"
-                                        >
-                                          Months
-                                        </option>
-                                        <option
-                                          key="5"
-                                          value="q"
-                                        >
-                                          quarters
-                                        </option>
-                                        <option
-                                          key="6"
                                           value="y"
                                         >
                                           years
@@ -2934,14 +2862,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                   "text": "days",
                                   "value": "d",
                                 },
-                                Object {
-                                  "text": "Months",
-                                  "value": "M",
-                                },
-                                Object {
-                                  "text": "quarters",
-                                  "value": "q",
-                                },
                                 Object {
                                   "text": "years",
                                   "value": "y",
@@ -2983,14 +2903,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                     "text": "days",
                                     "value": "d",
                                   },
-                                  Object {
-                                    "text": "Months",
-                                    "value": "M",
-                                  },
-                                  Object {
-                                    "text": "quarters",
-                                    "value": "q",
-                                  },
                                   Object {
                                     "text": "years",
                                     "value": "y",
@@ -3056,14 +2968,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                     "text": "days",
                                     "value": "d",
                                   },
-                                  Object {
-                                    "text": "Months",
-                                    "value": "M",
-                                  },
-                                  Object {
-                                    "text": "quarters",
-                                    "value": "q",
-                                  },
                                   Object {
                                     "text": "years",
                                     "value": "y",
@@ -3125,18 +3029,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                         </option>
                                         <option
                                           key="4"
-                                          value="M"
-                                        >
-                                          Months
-                                        </option>
-                                        <option
-                                          key="5"
-                                          value="q"
-                                        >
-                                          quarters
-                                        </option>
-                                        <option
-                                          key="6"
                                           value="y"
                                         >
                                           years