diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
index 4d5afc9cd32965a0bed716ff68525e5afa8ac3c7..af712f0890a2d3d6b8c85dc25c326d7682419b27 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
@@ -264,6 +264,7 @@ export default ({ node, view, getPos }) => {
                           {option.label}  
                           {!readOnly && (
                             <ActionButton
+                              aria-label={`delete ${option.label}`}
                               onClick={() => removeOption(option.value)}
                               ref={setRef(option.value)}
                               type="button"
@@ -289,7 +290,12 @@ export default ({ node, view, getPos }) => {
                   type="text"
                   value={optionText}
                 />
-                <button onClick={addOption} ref={addOptionBtnRef} type="button">
+                <button
+                  aria-label="add new option"
+                  onClick={addOption}
+                  ref={addOptionBtnRef}
+                  type="button"
+                >
                   Add Option
                 </button>
               </AddOption>
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
index ea42dc3a5f38f069af116a627e922ec98b6409a0..ae3f045aa8329655e07164b47c9222063e6b5d7c 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
@@ -120,11 +120,19 @@ export default ({ node, view, getPos }) => {
     <Option>
       {!readOnly && (
         <ButtonsContainer>
-          <ActionButton onClick={addAnswer} type="button">
+          <ActionButton
+            aria-label="add new option"
+            onClick={addAnswer}
+            type="button"
+          >
             <StyledIconAction name="plusSquare" />
           </ActionButton>
           {!node.attrs.isfirst && (
-            <ActionButton onClick={removeAnswer} type="button">
+            <ActionButton
+              aria-label="delete this option"
+              onClick={removeAnswer}
+              type="button"
+            >
               <StyledIconAction name="deleteOutlined" />
             </ActionButton>
           )}
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js
index 1210e87c4b439fac88f218e75534666e896c7c56..f72dee0818ae44d19f9945c53e24b0ee9cf91da7 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js
@@ -230,6 +230,7 @@ export default ({ node, view, getPos }) => {
       <IconsWrapper>
         {!readOnly && (
           <ActionButton
+            aria-label="add new option"
             onClick={() => addOption(node.attrs.id)}
             ref={addOptionBtnRef}
             type="button"
@@ -239,6 +240,7 @@ export default ({ node, view, getPos }) => {
         )}
         {!readOnly && (
           <ActionButton
+            aria-label="delete this option"
             onClick={removeOption}
             ref={removeOptionBtnRef}
             type="button"
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js
index c96a6251f7560067298c4f390545f72ba4c6cc71..ced1bc08f53c27b6fb692eea20d5b241b735c7a1 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js
@@ -230,6 +230,7 @@ export default ({ node, view, getPos }) => {
       <IconsWrapper>
         {!readOnly && (
           <ActionButton
+            aria-label="add new option"
             onClick={() => addOption(node.attrs.id)}
             ref={addOptionBtnRef}
             type="button"
@@ -239,6 +240,7 @@ export default ({ node, view, getPos }) => {
         )}
         {!readOnly && (
           <ActionButton
+            aria-label="delete this option"
             onClick={removeOption}
             ref={removeOptionBtnRef}
             type="button"
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js
index 707d0eaf585ca185c4e1ab91cf5e1e88366f7915..175601897bc33178c23b28f3f6f4e8113cef2e80 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js
@@ -230,6 +230,7 @@ export default ({ node, view, getPos }) => {
       <IconsWrapper>
         {!readOnly && (
           <ActionButton
+            aria-label="add new option"
             onClick={() => addOption(node.attrs.id)}
             ref={addOptionBtnRef}
             type="button"
@@ -239,6 +240,7 @@ export default ({ node, view, getPos }) => {
         )}
         {!readOnly && (
           <ActionButton
+            aria-label="delete this option"
             onClick={removeOption}
             ref={removeOptionBtnRef}
             type="button"
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
index bd696b59e21cc48e6ed37e435b9efb76d4c3d17e..952db530481893825b54319e73556dd96c3296a5 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
@@ -228,6 +228,7 @@ export default ({ node, view, getPos }) => {
       <IconsWrapper>
         {!readOnly && (
           <ActionButton
+            aria-label="add new option"
             onClick={() => addOption(node.attrs.id)}
             ref={addOptionBtnRef}
             type="button"
@@ -237,6 +238,7 @@ export default ({ node, view, getPos }) => {
         )}
         {!readOnly && (
           <ActionButton
+            aria-label="delete this option"
             onClick={removeOption}
             ref={removeOptionBtnRef}
             type="button"