diff --git a/canvas_modules/common-canvas/assets/images/arrange_horizontally.svg b/canvas_modules/common-canvas/assets/images/arrange_horizontally.svg
deleted file mode 100644
index 1ef38b7eca..0000000000
--- a/canvas_modules/common-canvas/assets/images/arrange_horizontally.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><rect x="1.5" y="2" width="13" height="1"/><rect x="1.5" y="13" width="13" height="1"/><path d="M7,10.5H2a.47.47,0,0,1-.5-.5V6A.47.47,0,0,1,2,5.5H7a.47.47,0,0,1,.5.5v4A.47.47,0,0,1,7,10.5Zm-4.5-1h4v-3h-4Z"/><path d="M14,10.5H9a.47.47,0,0,1-.5-.5V6A.47.47,0,0,1,9,5.5h5a.47.47,0,0,1,.5.5v4A.47.47,0,0,1,14,10.5Zm-4.5-1h4v-3h-4Z"/></svg>
\ No newline at end of file
diff --git a/canvas_modules/common-canvas/assets/images/arrange_vertically.svg b/canvas_modules/common-canvas/assets/images/arrange_vertically.svg
deleted file mode 100644
index ac1b5228fd..0000000000
--- a/canvas_modules/common-canvas/assets/images/arrange_vertically.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><rect x="2" y="1.5" width="1" height="13"/><rect x="13" y="1.5" width="1" height="13"/><path d="M10.5,7.5h-5A.47.47,0,0,1,5,7V3a.47.47,0,0,1,.5-.5h5A.47.47,0,0,1,11,3V7A.47.47,0,0,1,10.5,7.5ZM6,6.5h4v-3H6Z"/><path d="M10.5,13.5h-5A.47.47,0,0,1,5,13V9a.47.47,0,0,1,.5-.5h5A.47.47,0,0,1,11,9v4A.47.47,0,0,1,10.5,13.5ZM6,12.5h4v-3H6Z"/></svg>
\ No newline at end of file
diff --git a/canvas_modules/common-canvas/assets/images/notification_counter_icon.svg b/canvas_modules/common-canvas/assets/images/notification_counter_icon.svg
index a250f462bc..b45a724677 100644
--- a/canvas_modules/common-canvas/assets/images/notification_counter_icon.svg
+++ b/canvas_modules/common-canvas/assets/images/notification_counter_icon.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="currentColor">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="currentColor" aria-label="Notification Icon">
 	<path d="M27,12V27H5V5H20V3H5A2,2,0,0,0,3,5V27a2,2,0,0,0,2,2H27a2,2,0,0,0,2-2V12Z"/>
 	<circle class="dot" cx="26.5" cy="5.5" r="3.5"/></svg>
diff --git a/canvas_modules/common-canvas/src/common-canvas/cc-contents.jsx b/canvas_modules/common-canvas/src/common-canvas/cc-contents.jsx
index 8dc0953913..739e1ab446 100644
--- a/canvas_modules/common-canvas/src/common-canvas/cc-contents.jsx
+++ b/canvas_modules/common-canvas/src/common-canvas/cc-contents.jsx
@@ -479,6 +479,7 @@ class CanvasContents extends React.Component {
 					onMouseDown={this.onMouseDown} onMouseLeave={this.onMouseLeave}
 					onBlur={this.onBlur}
 					onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp}
+					role="application" aria-label="canvas-keyboard-navigation" // Resolve Accessibility Violation of role and label
 				/>
 			);
 		}
diff --git a/canvas_modules/common-canvas/src/icons/icon.jsx b/canvas_modules/common-canvas/src/icons/icon.jsx
index 26c0b20e58..83ee080589 100644
--- a/canvas_modules/common-canvas/src/icons/icon.jsx
+++ b/canvas_modules/common-canvas/src/icons/icon.jsx
@@ -124,7 +124,7 @@ export default class Icon extends React.Component {
 			icon = this.getCanvasIcon(this.props.type);
 			if (typeof icon !== "undefined") {
 				const className = classNames("canvas-icon", iconClassName, this.props.className);
-				icon = <SVG src={icon} className={className} disabled={this.props.disabled} />;
+				icon = <SVG src={icon} className={className} disabled={this.props.disabled} aria-label={this.props.type} />;
 			} else {
 				icon = <div />;
 			}
diff --git a/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx b/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx
index e13b580ee5..c9b19a8dec 100644
--- a/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx
+++ b/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx
@@ -18,8 +18,6 @@ import React from "react";
 import PropTypes from "prop-types";
 
 import Tooltip from "../tooltip/tooltip.jsx";
-import ArrangeHorizontally from "./../../assets/images/arrange_horizontally.svg";
-import ArrangeVertically from "./../../assets/images/arrange_vertically.svg";
 import ToggleNotificationPanel from "./../../assets/images/notification_counter_icon.svg";
 
 import { Button } from "@carbon/react";
@@ -29,7 +27,7 @@ import { StopFilledAlt, Play, Undo, Redo, Chat, ChatOff, Result,
 	Cut, Copy, Paste, Edit,	ColorPalette, Maximize, Minimize,
 	Launch, AddComment, TrashCan, ZoomIn, ZoomOut,
 	Checkmark, ChevronRight, ChevronDown, ChevronUp,
-	CenterToFit, OpenPanelFilledLeft } from "@carbon/react/icons";
+	CenterToFit, OpenPanelFilledLeft, ArrangeVertical, ArrangeHorizontal } from "@carbon/react/icons";
 import { TOOLBAR_STOP, TOOLBAR_RUN, TOOLBAR_UNDO, TOOLBAR_REDO,
 	TOOLBAR_CUT, TOOLBAR_COPY, TOOLBAR_PASTE, TOOLBAR_CLIPBOARD,
 	TOOLBAR_CREATE_COMMENT, TOOLBAR_CREATE_AUTO_COMMENT,
@@ -123,12 +121,10 @@ class ToolbarButtonItem extends React.Component {
 			return <OpenPanelFilledLeft disabled={disabled} />;
 		case (TOOLBAR_TOGGLE_PALETTE):
 			return <OpenPanelFilledLeft disabled={disabled} />;
-
-		// Non-carbon icons
 		case (TOOLBAR_ARRANGE_HORIZONALLY):
-			return <SVG src={ArrangeHorizontally} disabled={disabled} />;
+			return <ArrangeHorizontal disabled={disabled} />;
 		case (TOOLBAR_ARRANGE_VERTICALLY):
-			return <SVG src={ArrangeVertically} disabled={disabled} />;
+			return <ArrangeVertical disabled={disabled} />;
 		case (TOOLBAR_TOGGLE_NOTIFICATION_PANEL):
 			return <SVG src={ToggleNotificationPanel} disabled={disabled} />;