diff --git a/src/components/Card/CardToolbar.jsx b/src/components/Card/CardToolbar.jsx
index 76f5d8ad21..6ee0de5a5f 100644
--- a/src/components/Card/CardToolbar.jsx
+++ b/src/components/Card/CardToolbar.jsx
@@ -49,6 +49,22 @@ const propTypes = {
    * i.e. { thisWeek: 'This week', lastWeek: 'Last week'}
    */
   timeRangeOptions: TimeRangeOptionsPropTypes, // eslint-disable-line react/require-default-props
+  i18n: PropTypes.shape({
+    last24Hours: PropTypes.string,
+    last7Days: PropTypes.string,
+    lastMonth: PropTypes.string,
+    lastQuarter: PropTypes.string,
+    lastYear: PropTypes.string,
+    thisWeek: PropTypes.string,
+    thisMonth: PropTypes.string,
+    thisQuarter: PropTypes.string,
+    thisYear: PropTypes.string,
+    overflowMenuDescription: PropTypes.string,
+    cloneCardLabel: PropTypes.string,
+    deleteCardLabel: PropTypes.string,
+    closeLabel: PropTypes.string,
+    expandLabel: PropTypes.string,
+  }),
 };
 
 const defaultProps = {
@@ -57,6 +73,22 @@ const defaultProps = {
   renderExpandIcon: Popup16,
   className: null,
   timeRangeOptions: null,
+  i18n: {
+    last24Hours: 'Last 24 hours',
+    last7Days: 'Last 7 days',
+    lastMonth: 'Last month',
+    lastQuarter: 'Last quarter',
+    lastYear: 'Last year',
+    thisWeek: 'This week',
+    thisMonth: 'This month',
+    thisQuarter: 'This quarter',
+    thisYear: 'This year',
+    overflowMenuDescription: 'Card actions menu',
+    cloneCardLabel: 'Clone card',
+    deleteCardLabel: 'Delete card',
+    closeLabel: 'Close',
+    expandLabel: 'Expand',
+  },
 };
 
 const CardToolbar = ({
@@ -71,56 +103,47 @@ const CardToolbar = ({
   onCardAction,
   className,
 }) => {
+  const mergedI18n = { ...defaultProps.i18n, ...i18n };
   // maps the timebox internal label to a translated string
   // Need the default here in case that the CardToolbar is used by multiple different components
   // Also needs to reassign itself if i18n changes
   const timeRangeOptions = useMemo(
     () =>
       timeRangeOptionsProp || {
-        last24Hours: i18n.last24HoursLabel,
-        last7Days: i18n.last7DaysLabel,
-        lastMonth: i18n.lastMonthLabel,
-        lastQuarter: i18n.lastQuarterLabel,
-        lastYear: i18n.lastYearLabel,
-        thisWeek: i18n.thisWeekLabel,
-        thisMonth: i18n.thisMonthLabel,
-        thisQuarter: i18n.thisQuarterLabel,
-        thisYear: i18n.thisYearLabel,
+        last24Hours: mergedI18n.last24HoursLabel,
+        last7Days: mergedI18n.last7DaysLabel,
+        lastMonth: mergedI18n.lastMonthLabel,
+        lastQuarter: mergedI18n.lastQuarterLabel,
+        lastYear: mergedI18n.lastYearLabel,
+        thisWeek: mergedI18n.thisWeekLabel,
+        thisMonth: mergedI18n.thisMonthLabel,
+        thisQuarter: mergedI18n.thisQuarterLabel,
+        thisYear: mergedI18n.thisYearLabel,
       },
     [
-      i18n.last24HoursLabel,
-      i18n.last7DaysLabel,
-      i18n.lastMonthLabel,
-      i18n.lastQuarterLabel,
-      i18n.lastYearLabel,
-      i18n.thisMonthLabel,
-      i18n.thisQuarterLabel,
-      i18n.thisWeekLabel,
-      i18n.thisYearLabel,
+      mergedI18n.last24HoursLabel,
+      mergedI18n.last7DaysLabel,
+      mergedI18n.lastMonthLabel,
+      mergedI18n.lastQuarterLabel,
+      mergedI18n.lastYearLabel,
+      mergedI18n.thisMonthLabel,
+      mergedI18n.thisQuarterLabel,
+      mergedI18n.thisWeekLabel,
+      mergedI18n.thisYearLabel,
       timeRangeOptionsProp,
     ]
   );
 
   return isEditable ? (
     <div className={classnames(className, `${iotPrefix}--card--toolbar`)}>
-      {(availableActions.edit ||
-        availableActions.clone ||
-        availableActions.delete) && (
-        <OverflowMenu flipped title={i18n.overflowMenuDescription}>
-          {availableActions.edit && (
-            <OverflowMenuItem
-              onClick={() => {
-                onCardAction(CARD_ACTIONS.EDIT_CARD);
-              }}
-              itemText={i18n.editCardLabel}
-            />
-          )}
+      {(availableActions.clone || availableActions.delete) && (
+        <OverflowMenu flipped title={mergedI18n.overflowMenuDescription}>
           {availableActions.clone && (
             <OverflowMenuItem
               onClick={() => {
                 onCardAction(CARD_ACTIONS.CLONE_CARD);
               }}
-              itemText={i18n.cloneCardLabel}
+              itemText={mergedI18n.cloneCardLabel}
             />
           )}
           {availableActions.delete && (
@@ -129,7 +152,7 @@ const CardToolbar = ({
               onClick={() => {
                 onCardAction(CARD_ACTIONS.DELETE_CARD);
               }}
-              itemText={i18n.deleteCardLabel}
+              itemText={mergedI18n.deleteCardLabel}
             />
           )}
         </OverflowMenu>
@@ -140,7 +163,7 @@ const CardToolbar = ({
       {availableActions.range ? (
         <CardRangePicker
           width={width}
-          i18n={i18n}
+          i18n={mergedI18n}
           timeRange={timeRange}
           timeRangeOptions={timeRangeOptions}
           onCardAction={onCardAction}
@@ -151,18 +174,18 @@ const CardToolbar = ({
         <>
           {isExpanded ? (
             <ToolbarSVGWrapper
-              title={i18n.closeLabel}
+              title={mergedI18n.closeLabel}
               onClick={() => onCardAction(CARD_ACTIONS.CLOSE_EXPANDED_CARD)}
-              iconDescription={i18n.closeLabel}
+              iconDescription={mergedI18n.closeLabel}
               renderIcon={Close16}
             />
           ) : (
             <ToolbarSVGWrapper
-              title={i18n.expandLabel}
+              title={mergedI18n.expandLabel}
               onClick={() => {
                 onCardAction(CARD_ACTIONS.OPEN_EXPANDED_CARD);
               }}
-              iconDescription={i18n.expandLabel}
+              iconDescription={mergedI18n.expandLabel}
               renderIcon={renderExpandIcon}
             />
           )}
diff --git a/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot b/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
index 71898ebec4..25e97bc574 100644
--- a/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
+++ b/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
@@ -1541,8 +1541,53 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <div
-                          className="react-grid-item react-resizable-hide react-resizable iot--card--toolbar"
+                          className="iot--card--toolbar"
                         >
+                          <div
+                            className="iot--card--toolbar-date-range-wrapper"
+                          >
+                            <button
+                              aria-expanded={false}
+                              aria-haspopup={true}
+                              aria-label="Menu"
+                              className="iot--card--toolbar-date-range-action bx--overflow-menu"
+                              onClick={[Function]}
+                              onClose={[Function]}
+                              onKeyDown={[Function]}
+                              open={false}
+                              tabIndex={0}
+                              title="Select time range"
+                              type="button"
+                            >
+                              <svg
+                                aria-label="Select time range"
+                                className="bx--overflow-menu__icon"
+                                fill="currentColor"
+                                focusable="false"
+                                height={16}
+                                onClick={[Function]}
+                                onKeyDown={[Function]}
+                                preserveAspectRatio="xMidYMid meet"
+                                role="img"
+                                viewBox="0 0 32 32"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M21,30a8,8,0,1,1,8-8A8,8,0,0,1,21,30Zm0-14a6,6,0,1,0,6,6A6,6,0,0,0,21,16Z"
+                                />
+                                <path
+                                  d="M22.59 25L20 22.41 20 18 22 18 22 21.59 24 23.59 22.59 25z"
+                                />
+                                <path
+                                  d="M28,6a2,2,0,0,0-2-2H22V2H20V4H12V2H10V4H6A2,2,0,0,0,4,6V26a2,2,0,0,0,2,2h4V26H6V6h4V8h2V6h8V8h2V6h4v6h2Z"
+                                />
+                                <title>
+                                  Select time range
+                                </title>
+                              </svg>
+                            </button>
+                          </div>
                           <button
                             className="iot--card--toolbar-action iot--card--toolbar-svg-wrapper bx--btn--icon-only bx--btn bx--btn--ghost"
                             disabled={false}
@@ -3868,8 +3913,53 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <div
-                          className="react-grid-item react-resizable-hide react-resizable iot--card--toolbar"
+                          className="iot--card--toolbar"
                         >
+                          <div
+                            className="iot--card--toolbar-date-range-wrapper"
+                          >
+                            <button
+                              aria-expanded={false}
+                              aria-haspopup={true}
+                              aria-label="Menu"
+                              className="iot--card--toolbar-date-range-action bx--overflow-menu"
+                              onClick={[Function]}
+                              onClose={[Function]}
+                              onKeyDown={[Function]}
+                              open={false}
+                              tabIndex={0}
+                              title="Select time range"
+                              type="button"
+                            >
+                              <svg
+                                aria-label="Select time range"
+                                className="bx--overflow-menu__icon"
+                                fill="currentColor"
+                                focusable="false"
+                                height={16}
+                                onClick={[Function]}
+                                onKeyDown={[Function]}
+                                preserveAspectRatio="xMidYMid meet"
+                                role="img"
+                                viewBox="0 0 32 32"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M21,30a8,8,0,1,1,8-8A8,8,0,0,1,21,30Zm0-14a6,6,0,1,0,6,6A6,6,0,0,0,21,16Z"
+                                />
+                                <path
+                                  d="M22.59 25L20 22.41 20 18 22 18 22 21.59 24 23.59 22.59 25z"
+                                />
+                                <path
+                                  d="M28,6a2,2,0,0,0-2-2H22V2H20V4H12V2H10V4H6A2,2,0,0,0,4,6V26a2,2,0,0,0,2,2h4V26H6V6h4V8h2V6h8V8h2V6h4v6h2Z"
+                                />
+                                <title>
+                                  Select time range
+                                </title>
+                              </svg>
+                            </button>
+                          </div>
                           <button
                             className="iot--card--toolbar-action iot--card--toolbar-svg-wrapper bx--btn--icon-only bx--btn bx--btn--ghost"
                             disabled={false}
@@ -6223,8 +6313,53 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <div
-                          className="react-grid-item react-resizable-hide react-resizable iot--card--toolbar"
+                          className="iot--card--toolbar"
                         >
+                          <div
+                            className="iot--card--toolbar-date-range-wrapper"
+                          >
+                            <button
+                              aria-expanded={false}
+                              aria-haspopup={true}
+                              aria-label="Menu"
+                              className="iot--card--toolbar-date-range-action bx--overflow-menu"
+                              onClick={[Function]}
+                              onClose={[Function]}
+                              onKeyDown={[Function]}
+                              open={false}
+                              tabIndex={0}
+                              title="Select time range"
+                              type="button"
+                            >
+                              <svg
+                                aria-label="Select time range"
+                                className="bx--overflow-menu__icon"
+                                fill="currentColor"
+                                focusable="false"
+                                height={16}
+                                onClick={[Function]}
+                                onKeyDown={[Function]}
+                                preserveAspectRatio="xMidYMid meet"
+                                role="img"
+                                viewBox="0 0 32 32"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M21,30a8,8,0,1,1,8-8A8,8,0,0,1,21,30Zm0-14a6,6,0,1,0,6,6A6,6,0,0,0,21,16Z"
+                                />
+                                <path
+                                  d="M22.59 25L20 22.41 20 18 22 18 22 21.59 24 23.59 22.59 25z"
+                                />
+                                <path
+                                  d="M28,6a2,2,0,0,0-2-2H22V2H20V4H12V2H10V4H6A2,2,0,0,0,4,6V26a2,2,0,0,0,2,2h4V26H6V6h4V8h2V6h8V8h2V6h4v6h2Z"
+                                />
+                                <title>
+                                  Select time range
+                                </title>
+                              </svg>
+                            </button>
+                          </div>
                           <button
                             className="iot--card--toolbar-action iot--card--toolbar-svg-wrapper bx--btn--icon-only bx--btn bx--btn--ghost"
                             disabled={false}
@@ -7928,37 +8063,53 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <div
-                          className="react-grid-item react-resizable-hide react-resizable iot--card--toolbar"
+                          className="iot--card--toolbar"
                         >
-                          <button
-                            className="iot--card--toolbar-action iot--card--toolbar-svg-wrapper bx--btn--icon-only bx--btn bx--btn--ghost"
-                            disabled={false}
-                            onClick={[Function]}
-                            tabIndex={0}
-                            title="Expand to fullscreen"
-                            type="button"
+                          <div
+                            className="iot--card--toolbar-date-range-wrapper"
                           >
-                            <svg
-                              aria-hidden="true"
-                              aria-label="Expand to fullscreen"
-                              className="bx--btn__icon"
-                              fill="currentColor"
-                              focusable="false"
-                              height={16}
-                              preserveAspectRatio="xMidYMid meet"
-                              role="img"
-                              viewBox="0 0 32 32"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
+                            <button
+                              aria-expanded={false}
+                              aria-haspopup={true}
+                              aria-label="Menu"
+                              className="iot--card--toolbar-date-range-action bx--overflow-menu"
+                              onClick={[Function]}
+                              onClose={[Function]}
+                              onKeyDown={[Function]}
+                              open={false}
+                              tabIndex={0}
+                              title="Select time range"
+                              type="button"
                             >
-                              <path
-                                d="M28,4H10A2.0059,2.0059,0,0,0,8,6V20a2.0059,2.0059,0,0,0,2,2H28a2.0059,2.0059,0,0,0,2-2V6A2.0059,2.0059,0,0,0,28,4Zm0,16H10V6H28Z"
-                              />
-                              <path
-                                d="M18,26H4V16H6V14H4a2.0059,2.0059,0,0,0-2,2V26a2.0059,2.0059,0,0,0,2,2H18a2.0059,2.0059,0,0,0,2-2V24H18Z"
-                              />
-                            </svg>
-                          </button>
+                              <svg
+                                aria-label="Select time range"
+                                className="bx--overflow-menu__icon"
+                                fill="currentColor"
+                                focusable="false"
+                                height={16}
+                                onClick={[Function]}
+                                onKeyDown={[Function]}
+                                preserveAspectRatio="xMidYMid meet"
+                                role="img"
+                                viewBox="0 0 32 32"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M21,30a8,8,0,1,1,8-8A8,8,0,0,1,21,30Zm0-14a6,6,0,1,0,6,6A6,6,0,0,0,21,16Z"
+                                />
+                                <path
+                                  d="M22.59 25L20 22.41 20 18 22 18 22 21.59 24 23.59 22.59 25z"
+                                />
+                                <path
+                                  d="M28,6a2,2,0,0,0-2-2H22V2H20V4H12V2H10V4H6A2,2,0,0,0,4,6V26a2,2,0,0,0,2,2h4V26H6V6h4V8h2V6h8V8h2V6h4v6h2Z"
+                                />
+                                <title>
+                                  Select time range
+                                </title>
+                              </svg>
+                            </button>
+                          </div>
                         </div>
                       </div>
                     </section>
@@ -11132,8 +11283,53 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <div
-                          className="react-grid-item react-resizable-hide react-resizable iot--card--toolbar"
+                          className="iot--card--toolbar"
                         >
+                          <div
+                            className="iot--card--toolbar-date-range-wrapper"
+                          >
+                            <button
+                              aria-expanded={false}
+                              aria-haspopup={true}
+                              aria-label="Menu"
+                              className="iot--card--toolbar-date-range-action bx--overflow-menu"
+                              onClick={[Function]}
+                              onClose={[Function]}
+                              onKeyDown={[Function]}
+                              open={false}
+                              tabIndex={0}
+                              title="Select time range"
+                              type="button"
+                            >
+                              <svg
+                                aria-label="Select time range"
+                                className="bx--overflow-menu__icon"
+                                fill="currentColor"
+                                focusable="false"
+                                height={16}
+                                onClick={[Function]}
+                                onKeyDown={[Function]}
+                                preserveAspectRatio="xMidYMid meet"
+                                role="img"
+                                viewBox="0 0 32 32"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M21,30a8,8,0,1,1,8-8A8,8,0,0,1,21,30Zm0-14a6,6,0,1,0,6,6A6,6,0,0,0,21,16Z"
+                                />
+                                <path
+                                  d="M22.59 25L20 22.41 20 18 22 18 22 21.59 24 23.59 22.59 25z"
+                                />
+                                <path
+                                  d="M28,6a2,2,0,0,0-2-2H22V2H20V4H12V2H10V4H6A2,2,0,0,0,4,6V26a2,2,0,0,0,2,2h4V26H6V6h4V8h2V6h8V8h2V6h4v6h2Z"
+                                />
+                                <title>
+                                  Select time range
+                                </title>
+                              </svg>
+                            </button>
+                          </div>
                           <button
                             className="iot--card--toolbar-action iot--card--toolbar-svg-wrapper bx--btn--icon-only bx--btn bx--btn--ghost"
                             disabled={false}
@@ -25862,8 +26058,53 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <div
-                          className="react-grid-item react-resizable-hide react-resizable iot--card--toolbar"
+                          className="iot--card--toolbar"
                         >
+                          <div
+                            className="iot--card--toolbar-date-range-wrapper"
+                          >
+                            <button
+                              aria-expanded={false}
+                              aria-haspopup={true}
+                              aria-label="Menu"
+                              className="iot--card--toolbar-date-range-action bx--overflow-menu"
+                              onClick={[Function]}
+                              onClose={[Function]}
+                              onKeyDown={[Function]}
+                              open={false}
+                              tabIndex={0}
+                              title="Select time range"
+                              type="button"
+                            >
+                              <svg
+                                aria-label="Select time range"
+                                className="bx--overflow-menu__icon"
+                                fill="currentColor"
+                                focusable="false"
+                                height={16}
+                                onClick={[Function]}
+                                onKeyDown={[Function]}
+                                preserveAspectRatio="xMidYMid meet"
+                                role="img"
+                                viewBox="0 0 32 32"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M21,30a8,8,0,1,1,8-8A8,8,0,0,1,21,30Zm0-14a6,6,0,1,0,6,6A6,6,0,0,0,21,16Z"
+                                />
+                                <path
+                                  d="M22.59 25L20 22.41 20 18 22 18 22 21.59 24 23.59 22.59 25z"
+                                />
+                                <path
+                                  d="M28,6a2,2,0,0,0-2-2H22V2H20V4H12V2H10V4H6A2,2,0,0,0,4,6V26a2,2,0,0,0,2,2h4V26H6V6h4V8h2V6h8V8h2V6h4v6h2Z"
+                                />
+                                <title>
+                                  Select time range
+                                </title>
+                              </svg>
+                            </button>
+                          </div>
                           <button
                             className="iot--card--toolbar-action iot--card--toolbar-svg-wrapper bx--btn--icon-only bx--btn bx--btn--ghost"
                             disabled={false}
diff --git a/src/components/DashboardEditor/_dashboard-editor.scss b/src/components/DashboardEditor/_dashboard-editor.scss
index e3e92e0262..0e327d78a0 100644
--- a/src/components/DashboardEditor/_dashboard-editor.scss
+++ b/src/components/DashboardEditor/_dashboard-editor.scss
@@ -57,7 +57,7 @@
     flex: 1;
 
     &__selected-card {
-      border: solid $spacing-01 $interactive-04;
+      border: dotted $spacing-01 $interactive-04;
       box-sizing: content-box;
       margin: -$spacing-01;
     }
diff --git a/src/components/DashboardEditor/editorUtils.jsx b/src/components/DashboardEditor/editorUtils.jsx
index aa0c310163..6876ea609c 100644
--- a/src/components/DashboardEditor/editorUtils.jsx
+++ b/src/components/DashboardEditor/editorUtils.jsx
@@ -210,11 +210,7 @@ const renderTableCard = (cardJson, commonProps) => (
 );
 
 const renderImageCard = (cardJson, commonProps) => (
-  <ImageCard
-    isEditable={cardJson?.content?.src === undefined}
-    {...cardJson}
-    {...commonProps}
-  />
+  <ImageCard isEditable {...cardJson} {...commonProps} />
 );
 
 /**
diff --git a/src/components/ImageCard/ImageCard.jsx b/src/components/ImageCard/ImageCard.jsx
index 05d134f4f3..a9e0209d75 100644
--- a/src/components/ImageCard/ImageCard.jsx
+++ b/src/components/ImageCard/ImageCard.jsx
@@ -43,6 +43,7 @@ const ImageCard = ({
   values,
   size,
   onCardAction,
+  availableActions,
   isEditable,
   isExpanded,
   error,
@@ -66,7 +67,7 @@ const ImageCard = ({
     CARD_SIZES.LARGEWIDE,
   ];
   const supportedSize = supportedSizes.includes(newSize);
-  const availableActions = { expand: supportedSize };
+  const mergedAvailableActions = { expand: supportedSize, ...availableActions };
 
   const isCardLoading = isNil(src) && !isEditable && !error;
 
@@ -75,9 +76,10 @@ const ImageCard = ({
       title={title}
       size={newSize}
       onCardAction={onCardAction}
-      availableActions={availableActions}
+      availableActions={mergedAvailableActions}
       isLoading={isCardLoading} // only show the spinner if we don't have an image
       isExpanded={isExpanded}
+      isEditable={isEditable}
       {...others}
       error={error}
       i18n={otherLabels}>
diff --git a/src/components/ImageCard/__snapshots__/ImageCard.story.storyshot b/src/components/ImageCard/__snapshots__/ImageCard.story.storyshot
index a7f74a560d..87fdefa0bb 100644
--- a/src/components/ImageCard/__snapshots__/ImageCard.story.storyshot
+++ b/src/components/ImageCard/__snapshots__/ImageCard.story.storyshot
@@ -1150,37 +1150,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Image
           </span>
           <div
             className="iot--card--toolbar"
-          >
-            <button
-              className="iot--card--toolbar-action iot--card--toolbar-svg-wrapper bx--btn--icon-only bx--btn bx--btn--ghost"
-              disabled={false}
-              onClick={[Function]}
-              tabIndex={0}
-              title="Expand to fullscreen"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                aria-label="Expand to fullscreen"
-                className="bx--btn__icon"
-                fill="currentColor"
-                focusable="false"
-                height={16}
-                preserveAspectRatio="xMidYMid meet"
-                role="img"
-                viewBox="0 0 32 32"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M28,4H10A2.0059,2.0059,0,0,0,8,6V20a2.0059,2.0059,0,0,0,2,2H28a2.0059,2.0059,0,0,0,2-2V6A2.0059,2.0059,0,0,0,28,4Zm0,16H10V6H28Z"
-                />
-                <path
-                  d="M18,26H4V16H6V14H4a2.0059,2.0059,0,0,0-2,2V26a2.0059,2.0059,0,0,0,2,2H18a2.0059,2.0059,0,0,0,2-2V24H18Z"
-                />
-              </svg>
-            </button>
-          </div>
+          />
         </div>
         <div
           className="iot--card--content"
diff --git a/src/components/TableCard/TableCard.jsx b/src/components/TableCard/TableCard.jsx
index 777a0f4bd4..b4b31d5f09 100644
--- a/src/components/TableCard/TableCard.jsx
+++ b/src/components/TableCard/TableCard.jsx
@@ -334,8 +334,13 @@ const TableCard = ({
   i18n,
   tooltip,
   locale,
+  timeRange,
+  timeRangeOptions,
+  availableActions,
   ...others
 }) => {
+  const mergedI18n = { ...defaultProps.i18n, ...i18n };
+
   // Set the locale
   moment.locale(locale);
   /** Searches for variables and updates the card if it is passed the cardVariables prop */
@@ -387,7 +392,7 @@ const TableCard = ({
         renderIcon={() => (
           <OverflowMenuVertical16
             fill="#5a6872"
-            description={i18n.overflowMenuIconDescription}
+            description={mergedI18n.overflowMenuIconDescription}
           />
         )}>
         {actionList.map((item) => {
@@ -410,11 +415,6 @@ const TableCard = ({
     ) : null;
   };
 
-  const strings = {
-    ...defaultProps.i18n,
-    ...i18n,
-  };
-
   const renderThresholdIcon = (cellItem) => {
     const matchingThresholdValue = findMatchingThresholds(
       thresholds,
@@ -426,7 +426,7 @@ const TableCard = ({
       <ThresholdIcon
         title={`${matchingThresholdValue.dataSourceId}: ${matchingThresholdValue.currentValue} ${matchingThresholdValue.comparison} ${matchingThresholdValue.value}`}
         {...matchingThresholdValue}
-        strings={strings}
+        strings={mergedI18n}
         showSeverityLabel={matchingThresholdValue.showSeverityLabel}
         severityLabel={matchingThresholdValue.severityLabel}
         renderIconByName={others.renderIconByName}
@@ -486,25 +486,25 @@ const TableCard = ({
       id: `iconColumn-${columnId}`,
       label: uniqueThresholds[uniqueThresholdIndex].label
         ? uniqueThresholds[uniqueThresholdIndex].label
-        : `${capitalize(columnId)} ${strings.severityLabel}`,
+        : `${capitalize(columnId)} ${mergedI18n.severityLabel}`,
       width: uniqueThresholds[uniqueThresholdIndex].width,
       isSortable: true,
       renderDataFunction: renderThresholdIcon,
       priority: 1,
       filter: {
-        placeholderText: strings.selectSeverityPlaceholder,
+        placeholderText: mergedI18n.selectSeverityPlaceholder,
         options: [
           {
             id: 1,
-            text: strings.criticalLabel,
+            text: mergedI18n.criticalLabel,
           },
           {
             id: 2,
-            text: strings.moderateLabel,
+            text: mergedI18n.moderateLabel,
           },
           {
             id: 3,
-            text: strings.lowLabel,
+            text: mergedI18n.lowLabel,
           },
         ],
       },
@@ -564,7 +564,7 @@ const TableCard = ({
             : '', // force the text wrap
           filter: i.filter
             ? i.filter
-            : { placeholderText: strings.defaultFilterStringPlaceholdText }, // if filter not send we send empty object
+            : { placeholderText: mergedI18n.defaultFilterStringPlaceholdText }, // if filter not send we send empty object
         }))
         .concat(hasActionColumn ? actionColumn : [])
         .map((column) => {
@@ -589,9 +589,9 @@ const TableCard = ({
     [
       actionColumn,
       hasActionColumn,
+      mergedI18n.defaultFilterStringPlaceholdText,
       newColumns,
       newSize,
-      strings.defaultFilterStringPlaceholdText,
     ]
   );
 
@@ -802,14 +802,22 @@ const TableCard = ({
     ? columnsToRender.find((item) => item.priority === 1)
     : columnStartSortDefined;
 
+  const mergedAvailableActions = {
+    ...availableActions,
+    expand: isExpandable,
+    range: true,
+  };
+
   const cardToolbar = (
     <CardToolbar
-      availableActions={{ expand: isExpandable, range: true }}
-      i18n={i18n}
+      availableActions={mergedAvailableActions}
+      i18n={mergedI18n}
       isEditable={isEditable}
       isExpanded={isExpanded}
       onCardAction={cachedOnCardAction}
-      {...others}
+      width={newSize.width}
+      timeRange={timeRange}
+      timeRangeOptions={timeRangeOptions}
     />
   );
 
@@ -821,7 +829,7 @@ const TableCard = ({
       availableActions={{ expand: isExpandable, range: true }}
       isEditable={isEditable}
       isExpanded={isExpanded}
-      i18n={i18n}
+      i18n={mergedI18n}
       hideHeader
       {...others}>
       {({ height }) => {
@@ -882,12 +890,12 @@ const TableCard = ({
                     }
                   : {}),
                 emptyState: {
-                  message: emptyMessage || strings.emptyMessage,
+                  message: emptyMessage || mergedI18n.emptyMessage,
                 },
               },
             }}
             showHeader={showHeader !== undefined ? showHeader : true}
-            i18n={i18n} // TODO: add Card defaultprops ?
+            i18n={mergedI18n} // TODO: add Card defaultprops ?
           />
         );
       }}
diff --git a/src/components/TableCard/__snapshots__/TableCard.story.storyshot b/src/components/TableCard/__snapshots__/TableCard.story.storyshot
index 993ba33872..4034f02d83 100644
--- a/src/components/TableCard/__snapshots__/TableCard.story.storyshot
+++ b/src/components/TableCard/__snapshots__/TableCard.story.storyshot
@@ -10548,10 +10548,11 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       onKeyDown={[Function]}
                       open={false}
                       tabIndex={0}
+                      title="Select time range"
                       type="button"
                     >
                       <svg
-                        aria-label="open and close list of options"
+                        aria-label="Select time range"
                         className="bx--overflow-menu__icon"
                         fill="currentColor"
                         focusable="false"
@@ -10574,7 +10575,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           d="M28,6a2,2,0,0,0-2-2H22V2H20V4H12V2H10V4H6A2,2,0,0,0,4,6V26a2,2,0,0,0,2,2h4V26H6V6h4V8h2V6h8V8h2V6h4v6h2Z"
                         />
                         <title>
-                          open and close list of options
+                          Select time range
                         </title>
                       </svg>
                     </button>