diff --git a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
index b6dc51f0c294..cf9665dca56a 100644
--- a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
+++ b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
@@ -689,7 +689,7 @@ exports[`EuiDataGrid rendering renders additional toolbar controls 1`] = `
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="0"
@@ -700,26 +700,22 @@ exports[`EuiDataGrid rendering renders additional toolbar controls 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  0, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 1
-                </p>
+                0, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 1
+              </p>
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="0"
@@ -730,26 +726,22 @@ exports[`EuiDataGrid rendering renders additional toolbar controls 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  0, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 1
-                </p>
+                0, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 1
+              </p>
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="1"
@@ -760,26 +752,22 @@ exports[`EuiDataGrid rendering renders additional toolbar controls 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  1, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 2
-                </p>
+                1, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 2
+              </p>
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="1"
@@ -790,26 +778,22 @@ exports[`EuiDataGrid rendering renders additional toolbar controls 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  1, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 2
-                </p>
+                1, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 2
+              </p>
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="2"
@@ -820,26 +804,22 @@ exports[`EuiDataGrid rendering renders additional toolbar controls 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  2, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 3
-                </p>
+                2, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 3
+              </p>
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="2"
@@ -850,22 +830,18 @@ exports[`EuiDataGrid rendering renders additional toolbar controls 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  2, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 3
-                </p>
+                2, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 3
+              </p>
             </div>
           </div>
         </div>
@@ -1164,7 +1140,7 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="leading"
               data-gridcell-column-index="0"
               data-gridcell-row-index="0"
@@ -1183,22 +1159,18 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
                 data-focus-lock-disabled="disabled"
               >
                 <div
-                  class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                  class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight"
+                  data-datagrid-cellcontent="true"
                 >
-                  <div
-                    class="euiDataGridRowCell__content"
-                    data-datagrid-cellcontent="true"
-                  >
-                    0
-                  </div>
-                  <p
-                    class="emotion-euiScreenReaderOnly"
-                    hidden=""
-                  >
-                    - 
-                    leading, column 1, row 1
-                  </p>
+                  0
                 </div>
+                <p
+                  class="emotion-euiScreenReaderOnly"
+                  hidden=""
+                >
+                  - 
+                  leading, column 1, row 1
+                </p>
               </div>
               <div
                 data-focus-guard="true"
@@ -1208,7 +1180,7 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft"
               data-gridcell-column-id="A"
               data-gridcell-column-index="1"
               data-gridcell-row-index="0"
@@ -1219,26 +1191,22 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  0, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 2, row 1
-                </p>
+                0, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 2, row 1
+              </p>
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft"
               data-gridcell-column-id="B"
               data-gridcell-column-index="2"
               data-gridcell-row-index="0"
@@ -1249,26 +1217,22 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  0, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 3, row 1
-                </p>
+                0, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 3, row 1
+              </p>
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="trailing"
               data-gridcell-column-index="3"
               data-gridcell-row-index="0"
@@ -1287,22 +1251,18 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
                 data-focus-lock-disabled="disabled"
               >
                 <div
-                  class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                  class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight"
+                  data-datagrid-cellcontent="true"
                 >
-                  <div
-                    class="euiDataGridRowCell__content"
-                    data-datagrid-cellcontent="true"
-                  >
-                    0
-                  </div>
-                  <p
-                    class="emotion-euiScreenReaderOnly"
-                    hidden=""
-                  >
-                    - 
-                    trailing, column 4, row 1
-                  </p>
+                  0
                 </div>
+                <p
+                  class="emotion-euiScreenReaderOnly"
+                  hidden=""
+                >
+                  - 
+                  trailing, column 4, row 1
+                </p>
               </div>
               <div
                 data-focus-guard="true"
@@ -1312,7 +1272,7 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="leading"
               data-gridcell-column-index="0"
               data-gridcell-row-index="1"
@@ -1331,22 +1291,18 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
                 data-focus-lock-disabled="disabled"
               >
                 <div
-                  class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                  class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight"
+                  data-datagrid-cellcontent="true"
                 >
-                  <div
-                    class="euiDataGridRowCell__content"
-                    data-datagrid-cellcontent="true"
-                  >
-                    1
-                  </div>
-                  <p
-                    class="emotion-euiScreenReaderOnly"
-                    hidden=""
-                  >
-                    - 
-                    leading, column 1, row 2
-                  </p>
+                  1
                 </div>
+                <p
+                  class="emotion-euiScreenReaderOnly"
+                  hidden=""
+                >
+                  - 
+                  leading, column 1, row 2
+                </p>
               </div>
               <div
                 data-focus-guard="true"
@@ -1356,7 +1312,7 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft"
               data-gridcell-column-id="A"
               data-gridcell-column-index="1"
               data-gridcell-row-index="1"
@@ -1367,26 +1323,22 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  1, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 2, row 2
-                </p>
+                1, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 2, row 2
+              </p>
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft"
               data-gridcell-column-id="B"
               data-gridcell-column-index="2"
               data-gridcell-row-index="1"
@@ -1397,26 +1349,22 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  1, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 3, row 2
-                </p>
+                1, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 3, row 2
+              </p>
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="trailing"
               data-gridcell-column-index="3"
               data-gridcell-row-index="1"
@@ -1435,22 +1383,18 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
                 data-focus-lock-disabled="disabled"
               >
                 <div
-                  class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                  class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight"
+                  data-datagrid-cellcontent="true"
                 >
-                  <div
-                    class="euiDataGridRowCell__content"
-                    data-datagrid-cellcontent="true"
-                  >
-                    1
-                  </div>
-                  <p
-                    class="emotion-euiScreenReaderOnly"
-                    hidden=""
-                  >
-                    - 
-                    trailing, column 4, row 2
-                  </p>
+                  1
                 </div>
+                <p
+                  class="emotion-euiScreenReaderOnly"
+                  hidden=""
+                >
+                  - 
+                  trailing, column 4, row 2
+                </p>
               </div>
               <div
                 data-focus-guard="true"
@@ -1460,7 +1404,7 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="leading"
               data-gridcell-column-index="0"
               data-gridcell-row-index="2"
@@ -1479,22 +1423,18 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
                 data-focus-lock-disabled="disabled"
               >
                 <div
-                  class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                  class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight"
+                  data-datagrid-cellcontent="true"
                 >
-                  <div
-                    class="euiDataGridRowCell__content"
-                    data-datagrid-cellcontent="true"
-                  >
-                    2
-                  </div>
-                  <p
-                    class="emotion-euiScreenReaderOnly"
-                    hidden=""
-                  >
-                    - 
-                    leading, column 1, row 3
-                  </p>
+                  2
                 </div>
+                <p
+                  class="emotion-euiScreenReaderOnly"
+                  hidden=""
+                >
+                  - 
+                  leading, column 1, row 3
+                </p>
               </div>
               <div
                 data-focus-guard="true"
@@ -1504,7 +1444,7 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft"
               data-gridcell-column-id="A"
               data-gridcell-column-index="1"
               data-gridcell-row-index="2"
@@ -1515,26 +1455,22 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  2, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 2, row 3
-                </p>
+                2, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 2, row 3
+              </p>
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft"
               data-gridcell-column-id="B"
               data-gridcell-column-index="2"
               data-gridcell-row-index="2"
@@ -1545,26 +1481,22 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  2, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 3, row 3
-                </p>
+                2, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 3, row 3
+              </p>
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn euiDataGridRowCell--controlColumn"
               data-gridcell-column-id="trailing"
               data-gridcell-column-index="3"
               data-gridcell-row-index="2"
@@ -1583,22 +1515,18 @@ exports[`EuiDataGrid rendering renders control columns 1`] = `
                 data-focus-lock-disabled="disabled"
               >
                 <div
-                  class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                  class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight"
+                  data-datagrid-cellcontent="true"
                 >
-                  <div
-                    class="euiDataGridRowCell__content"
-                    data-datagrid-cellcontent="true"
-                  >
-                    2
-                  </div>
-                  <p
-                    class="emotion-euiScreenReaderOnly"
-                    hidden=""
-                  >
-                    - 
-                    trailing, column 4, row 3
-                  </p>
+                  2
                 </div>
+                <p
+                  class="emotion-euiScreenReaderOnly"
+                  hidden=""
+                >
+                  - 
+                  trailing, column 4, row 3
+                </p>
               </div>
               <div
                 data-focus-guard="true"
@@ -1864,7 +1792,7 @@ exports[`EuiDataGrid rendering renders custom column headers 1`] = `
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="0"
@@ -1875,26 +1803,22 @@ exports[`EuiDataGrid rendering renders custom column headers 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  0, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 1
-                </p>
+                0, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 1
+              </p>
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="0"
@@ -1905,26 +1829,22 @@ exports[`EuiDataGrid rendering renders custom column headers 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  0, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 1
-                </p>
+                0, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 1
+              </p>
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="1"
@@ -1935,26 +1855,22 @@ exports[`EuiDataGrid rendering renders custom column headers 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  1, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 2
-                </p>
+                1, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 2
+              </p>
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="1"
@@ -1965,26 +1881,22 @@ exports[`EuiDataGrid rendering renders custom column headers 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  1, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 2
-                </p>
+                1, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 2
+              </p>
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="2"
@@ -1995,26 +1907,22 @@ exports[`EuiDataGrid rendering renders custom column headers 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  2, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 3
-                </p>
+                2, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 3
+              </p>
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="2"
@@ -2025,22 +1933,18 @@ exports[`EuiDataGrid rendering renders custom column headers 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  2, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 3
-                </p>
+                2, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 3
+              </p>
             </div>
           </div>
         </div>
@@ -2298,7 +2202,7 @@ exports[`EuiDataGrid rendering renders with common and div attributes 1`] = `
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="0"
@@ -2309,26 +2213,22 @@ exports[`EuiDataGrid rendering renders with common and div attributes 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  0, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 1
-                </p>
+                0, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 1
+              </p>
             </div>
             <div
               aria-rowindex="1"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="0"
@@ -2339,26 +2239,22 @@ exports[`EuiDataGrid rendering renders with common and div attributes 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  0, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 1
-                </p>
+                0, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 1
+              </p>
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="1"
@@ -2369,26 +2265,22 @@ exports[`EuiDataGrid rendering renders with common and div attributes 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  1, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 2
-                </p>
+                1, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 2
+              </p>
             </div>
             <div
               aria-rowindex="2"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="1"
@@ -2399,26 +2291,22 @@ exports[`EuiDataGrid rendering renders with common and div attributes 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  1, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 2
-                </p>
+                1, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 2
+              </p>
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell euiDataGridRowCell--firstColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn"
               data-gridcell-column-id="A"
               data-gridcell-column-index="0"
               data-gridcell-row-index="2"
@@ -2429,26 +2317,22 @@ exports[`EuiDataGrid rendering renders with common and div attributes 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  2, A
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  A, column 1, row 3
-                </p>
+                2, A
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                A, column 1, row 3
+              </p>
             </div>
             <div
               aria-rowindex="3"
-              class="euiDataGridRowCell euiDataGridRowCell--lastColumn"
+              class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn"
               data-gridcell-column-id="B"
               data-gridcell-column-index="1"
               data-gridcell-row-index="2"
@@ -2459,22 +2343,18 @@ exports[`EuiDataGrid rendering renders with common and div attributes 1`] = `
               tabindex="-1"
             >
               <div
-                class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+                class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+                data-datagrid-cellcontent="true"
               >
-                <div
-                  class="euiDataGridRowCell__content eui-textTruncate"
-                  data-datagrid-cellcontent="true"
-                >
-                  2, B
-                </div>
-                <p
-                  class="emotion-euiScreenReaderOnly"
-                  hidden=""
-                >
-                  - 
-                  B, column 2, row 3
-                </p>
+                2, B
               </div>
+              <p
+                class="emotion-euiScreenReaderOnly"
+                hidden=""
+              >
+                - 
+                B, column 2, row 3
+              </p>
             </div>
           </div>
         </div>
diff --git a/src/components/datagrid/body/__snapshots__/data_grid_body_custom.test.tsx.snap b/src/components/datagrid/body/__snapshots__/data_grid_body_custom.test.tsx.snap
index d51f94ba5d22..d17d29bfa94a 100644
--- a/src/components/datagrid/body/__snapshots__/data_grid_body_custom.test.tsx.snap
+++ b/src/components/datagrid/body/__snapshots__/data_grid_body_custom.test.tsx.snap
@@ -115,7 +115,7 @@ exports[`EuiDataGridBodyCustomRender treats \`renderCustomGridBody\` as a render
   >
     <div
       aria-rowindex="1"
-      class="euiDataGridRowCell euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
+      class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
       data-gridcell-column-id="columnA"
       data-gridcell-column-index="0"
       data-gridcell-row-index="0"
@@ -126,26 +126,22 @@ exports[`EuiDataGridBodyCustomRender treats \`renderCustomGridBody\` as a render
       tabindex="-1"
     >
       <div
-        class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+        class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+        data-datagrid-cellcontent="true"
       >
-        <div
-          class="euiDataGridRowCell__content eui-textTruncate"
-          data-datagrid-cellcontent="true"
-        >
-          hello
-        </div>
-        <p
-          class="emotion-euiScreenReaderOnly"
-          hidden=""
-        >
-          - 
-          columnA, column 1, row 1
-        </p>
+        hello
       </div>
+      <p
+        class="emotion-euiScreenReaderOnly"
+        hidden=""
+      >
+        - 
+        columnA, column 1, row 1
+      </p>
     </div>
     <div
       aria-rowindex="1"
-      class="euiDataGridRowCell euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
+      class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
       data-gridcell-column-id="columnB"
       data-gridcell-column-index="1"
       data-gridcell-row-index="0"
@@ -156,22 +152,18 @@ exports[`EuiDataGridBodyCustomRender treats \`renderCustomGridBody\` as a render
       tabindex="-1"
     >
       <div
-        class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+        class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+        data-datagrid-cellcontent="true"
       >
-        <div
-          class="euiDataGridRowCell__content eui-textTruncate"
-          data-datagrid-cellcontent="true"
-        >
-          world
-        </div>
-        <p
-          class="emotion-euiScreenReaderOnly"
-          hidden=""
-        >
-          - 
-          columnB, column 2, row 1
-        </p>
+        world
       </div>
+      <p
+        class="emotion-euiScreenReaderOnly"
+        hidden=""
+      >
+        - 
+        columnB, column 2, row 1
+      </p>
     </div>
   </div>
   <div
@@ -179,7 +171,7 @@ exports[`EuiDataGridBodyCustomRender treats \`renderCustomGridBody\` as a render
   >
     <div
       aria-rowindex="2"
-      class="euiDataGridRowCell euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
+      class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
       data-gridcell-column-id="columnA"
       data-gridcell-column-index="0"
       data-gridcell-row-index="1"
@@ -190,26 +182,22 @@ exports[`EuiDataGridBodyCustomRender treats \`renderCustomGridBody\` as a render
       tabindex="-1"
     >
       <div
-        class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+        class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+        data-datagrid-cellcontent="true"
       >
-        <div
-          class="euiDataGridRowCell__content eui-textTruncate"
-          data-datagrid-cellcontent="true"
-        >
-          lorem
-        </div>
-        <p
-          class="emotion-euiScreenReaderOnly"
-          hidden=""
-        >
-          - 
-          columnA, column 1, row 2
-        </p>
+        lorem
       </div>
+      <p
+        class="emotion-euiScreenReaderOnly"
+        hidden=""
+      >
+        - 
+        columnA, column 1, row 2
+      </p>
     </div>
     <div
       aria-rowindex="2"
-      class="euiDataGridRowCell euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
+      class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
       data-gridcell-column-id="columnB"
       data-gridcell-column-index="1"
       data-gridcell-row-index="1"
@@ -220,22 +208,18 @@ exports[`EuiDataGridBodyCustomRender treats \`renderCustomGridBody\` as a render
       tabindex="-1"
     >
       <div
-        class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+        class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+        data-datagrid-cellcontent="true"
       >
-        <div
-          class="euiDataGridRowCell__content eui-textTruncate"
-          data-datagrid-cellcontent="true"
-        >
-          ipsum
-        </div>
-        <p
-          class="emotion-euiScreenReaderOnly"
-          hidden=""
-        >
-          - 
-          columnB, column 2, row 2
-        </p>
+        ipsum
       </div>
+      <p
+        class="emotion-euiScreenReaderOnly"
+        hidden=""
+      >
+        - 
+        columnB, column 2, row 2
+      </p>
     </div>
   </div>
 </div>
diff --git a/src/components/datagrid/body/__snapshots__/data_grid_body_virtualized.test.tsx.snap b/src/components/datagrid/body/__snapshots__/data_grid_body_virtualized.test.tsx.snap
index c58ccaf130d0..7452e75b2c3f 100644
--- a/src/components/datagrid/body/__snapshots__/data_grid_body_virtualized.test.tsx.snap
+++ b/src/components/datagrid/body/__snapshots__/data_grid_body_virtualized.test.tsx.snap
@@ -116,7 +116,7 @@ exports[`EuiDataGridBodyVirtualized renders 1`] = `
     </div>
     <div
       aria-rowindex="1"
-      class="euiDataGridRowCell euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
+      class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--boolean euiDataGridRowCell--firstColumn"
       data-gridcell-column-id="columnA"
       data-gridcell-column-index="0"
       data-gridcell-row-index="0"
@@ -127,28 +127,24 @@ exports[`EuiDataGridBodyVirtualized renders 1`] = `
       tabindex="-1"
     >
       <div
-        class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+        class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+        data-datagrid-cellcontent="true"
       >
-        <div
-          class="euiDataGridRowCell__content eui-textTruncate"
-          data-datagrid-cellcontent="true"
-        >
-          <span>
-            cell content
-          </span>
-        </div>
-        <p
-          class="emotion-euiScreenReaderOnly"
-          hidden=""
-        >
-          - 
-          columnA, column 1, row 1
-        </p>
+        <span>
+          cell content
+        </span>
       </div>
+      <p
+        class="emotion-euiScreenReaderOnly"
+        hidden=""
+      >
+        - 
+        columnA, column 1, row 1
+      </p>
     </div>
     <div
       aria-rowindex="1"
-      class="euiDataGridRowCell euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
+      class="euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--string euiDataGridRowCell--lastColumn"
       data-gridcell-column-id="columnB"
       data-gridcell-column-index="1"
       data-gridcell-row-index="0"
@@ -159,24 +155,20 @@ exports[`EuiDataGridBodyVirtualized renders 1`] = `
       tabindex="-1"
     >
       <div
-        class="euiDataGridRowCell__contentWrapper euiDataGridRowCell__defaultHeight"
+        class="euiDataGridRowCell__content euiDataGridRowCell__content--defaultHeight eui-textTruncate"
+        data-datagrid-cellcontent="true"
       >
-        <div
-          class="euiDataGridRowCell__content eui-textTruncate"
-          data-datagrid-cellcontent="true"
-        >
-          <span>
-            cell content
-          </span>
-        </div>
-        <p
-          class="emotion-euiScreenReaderOnly"
-          hidden=""
-        >
-          - 
-          columnB, column 2, row 1
-        </p>
+        <span>
+          cell content
+        </span>
       </div>
+      <p
+        class="emotion-euiScreenReaderOnly"
+        hidden=""
+      >
+        - 
+        columnB, column 2, row 1
+      </p>
     </div>
   </div>
 </div>
diff --git a/src/components/datagrid/body/footer/data_grid_footer_row.test.tsx b/src/components/datagrid/body/footer/data_grid_footer_row.test.tsx
index 92e93e3acea1..8eae820cf207 100644
--- a/src/components/datagrid/body/footer/data_grid_footer_row.test.tsx
+++ b/src/components/datagrid/body/footer/data_grid_footer_row.test.tsx
@@ -52,6 +52,7 @@ describe('EuiDataGridFooterRow', () => {
               "popoverIsOpen": false,
               "setCellPopoverProps": [Function],
               "setPopoverAnchor": [Function],
+              "setPopoverAnchorPosition": [Function],
               "setPopoverContent": [Function],
             }
           }
@@ -79,6 +80,7 @@ describe('EuiDataGridFooterRow', () => {
               "popoverIsOpen": false,
               "setCellPopoverProps": [Function],
               "setPopoverAnchor": [Function],
+              "setPopoverAnchorPosition": [Function],
               "setPopoverContent": [Function],
             }
           }
@@ -132,6 +134,7 @@ describe('EuiDataGridFooterRow', () => {
                 "popoverIsOpen": false,
                 "setCellPopoverProps": [Function],
                 "setPopoverAnchor": [Function],
+                "setPopoverAnchorPosition": [Function],
                 "setPopoverContent": [Function],
               }
             }
@@ -184,6 +187,7 @@ describe('EuiDataGridFooterRow', () => {
                 "popoverIsOpen": false,
                 "setCellPopoverProps": [Function],
                 "setPopoverAnchor": [Function],
+                "setPopoverAnchorPosition": [Function],
                 "setPopoverContent": [Function],
               }
             }
diff --git a/src/components/datagrid/data_grid.test.tsx b/src/components/datagrid/data_grid.test.tsx
index fac6ca20d3fc..337c1a083e64 100644
--- a/src/components/datagrid/data_grid.test.tsx
+++ b/src/components/datagrid/data_grid.test.tsx
@@ -537,7 +537,7 @@ describe('EuiDataGrid', () => {
         Array [
           Object {
             "aria-rowindex": 1,
-            "className": "euiDataGridRowCell euiDataGridRowCell--firstColumn customClass",
+            "className": "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn customClass",
             "data-gridcell-column-id": "A",
             "data-gridcell-column-index": 0,
             "data-gridcell-row-index": 0,
@@ -563,7 +563,7 @@ describe('EuiDataGrid', () => {
           },
           Object {
             "aria-rowindex": 1,
-            "className": "euiDataGridRowCell euiDataGridRowCell--lastColumn customClass",
+            "className": "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn customClass",
             "data-gridcell-column-id": "B",
             "data-gridcell-column-index": 1,
             "data-gridcell-row-index": 0,
@@ -589,7 +589,7 @@ describe('EuiDataGrid', () => {
           },
           Object {
             "aria-rowindex": 2,
-            "className": "euiDataGridRowCell euiDataGridRowCell--firstColumn customClass",
+            "className": "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--firstColumn customClass",
             "data-gridcell-column-id": "A",
             "data-gridcell-column-index": 0,
             "data-gridcell-row-index": 1,
@@ -615,7 +615,7 @@ describe('EuiDataGrid', () => {
           },
           Object {
             "aria-rowindex": 2,
-            "className": "euiDataGridRowCell euiDataGridRowCell--lastColumn customClass",
+            "className": "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn customClass",
             "data-gridcell-column-id": "B",
             "data-gridcell-column-index": 1,
             "data-gridcell-row-index": 1,
@@ -778,17 +778,17 @@ describe('EuiDataGrid', () => {
         expect(gridCellClassNames).toMatchInlineSnapshot(`
           Array [
             "euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignRight euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
             "euiDataGridRowCell--lastColumn",
-            "euiDataGridRowCell euiDataGridRowCell--customFormatName euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--customFormatName euiDataGridRowCell--lastColumn",
             "euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignRight euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
             "euiDataGridRowCell--lastColumn",
-            "euiDataGridRowCell euiDataGridRowCell--customFormatName euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--customFormatName euiDataGridRowCell--lastColumn",
             "euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignRight euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
             "euiDataGridRowCell--lastColumn",
-            "euiDataGridRowCell euiDataGridRowCell--customFormatName euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--customFormatName euiDataGridRowCell--lastColumn",
           ]
         `);
       });
@@ -821,12 +821,12 @@ describe('EuiDataGrid', () => {
           .map((x) => x.props().className);
         expect(gridCellClassNames).toMatchInlineSnapshot(`
           Array [
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--boolean",
-            "euiDataGridRowCell euiDataGridRowCell--lastColumn",
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--boolean",
-            "euiDataGridRowCell euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--boolean",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--boolean",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--lastColumn",
           ]
         `);
       });
@@ -853,10 +853,10 @@ describe('EuiDataGrid', () => {
           .map((x) => x.props().className);
         expect(gridCellClassNames).toMatchInlineSnapshot(`
           Array [
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--alphanumeric euiDataGridRowCell--lastColumn",
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--alphanumeric euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--alphanumeric euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--alphanumeric euiDataGridRowCell--lastColumn",
           ]
         `);
       });
@@ -890,13 +890,13 @@ describe('EuiDataGrid', () => {
           .map((x) => x.props().className);
         expect(gridCellClassNames).toMatchInlineSnapshot(`
           Array [
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--boolean",
-            "euiDataGridRowCell euiDataGridRowCell--currency",
-            "euiDataGridRowCell euiDataGridRowCell--datetime",
-            "euiDataGridRowCell euiDataGridRowCell--datetime",
-            "euiDataGridRowCell euiDataGridRowCell--datetime",
-            "euiDataGridRowCell euiDataGridRowCell--datetime euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--boolean",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--currency",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--datetime",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--datetime",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--datetime",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--datetime euiDataGridRowCell--lastColumn",
           ]
         `);
       });
@@ -939,8 +939,8 @@ describe('EuiDataGrid', () => {
           .map((x) => x.props().className);
         expect(gridCellClassNames).toMatchInlineSnapshot(`
           Array [
-            "euiDataGridRowCell euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
-            "euiDataGridRowCell euiDataGridRowCell--ipaddress euiDataGridRowCell--lastColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--numeric euiDataGridRowCell--firstColumn",
+            "euiDataGridRowCell euiDataGridRowCell--alignLeft euiDataGridRowCell--ipaddress euiDataGridRowCell--lastColumn",
           ]
         `);
       });