diff --git a/drag_and_drop_v2/public/css/drag_and_drop.css b/drag_and_drop_v2/public/css/drag_and_drop.css
index 6e4992034..72bcd31d4 100644
--- a/drag_and_drop_v2/public/css/drag_and_drop.css
+++ b/drag_and_drop_v2/public/css/drag_and_drop.css
@@ -307,34 +307,70 @@
 
 
 /* Font Awesome icons have different width - margin-right tries to compensate it */
-.xblock--drag-and-drop .feedback p:before {
+.ltr .xblock--drag-and-drop .feedback p:before,
+.rtl .xblock--drag-and-drop .feedback p:after {
     content: "\f129";
     font-family: FontAwesome;
+}
+
+.ltr .xblock--drag-and-drop .feedback p:before {
     margin-right: 0.7em;
     margin-left: 0.3em;
 }
 
-.xblock--drag-and-drop .feedback p.correct:before {
+.rtl .xblock--drag-and-drop .feedback p:after {
+    margin-left: 0.7em;
+    margin-right: 0.3em;
+}
+
+.ltr .xblock--drag-and-drop .feedback p.correct:before,
+.rtl .xblock--drag-and-drop .feedback p.correct:after {
     content: "\f00c";
     font-family: FontAwesome;
+}
+
+.ltr .xblock--drag-and-drop .feedback p.correct:before {
     margin-right: 0.3em;
     margin-left: 0;
 }
 
-.xblock--drag-and-drop .feedback p.partial:before {
+.rtl .xblock--drag-and-drop .feedback p.correct:after {
+    margin-left: 0.3em;
+    margin-right: 0;
+}
+
+.ltr .xblock--drag-and-drop .feedback p.partial:before,
+.rtl .xblock--drag-and-drop .feedback p.partial:after {
     content: "\f069";
     font-family: FontAwesome;
+}
+
+.ltr .xblock--drag-and-drop .feedback p.partial:before {
     margin-right: 0.3em;
     margin-left: 0;
 }
 
-.xblock--drag-and-drop .feedback p.incorrect:before {
+.rtl .xblock--drag-and-drop .feedback p.partial:after {
+    margin-left: 0.3em;
+    margin-right: 0;
+}
+
+.ltr .xblock--drag-and-drop .feedback p.incorrect:before,
+.rtl .xblock--drag-and-drop .feedback p.incorrect:after {
     content: "\f00d";
     font-family: FontAwesome;
+}
+
+.ltr .xblock--drag-and-drop .feedback p.incorrect:before {
     margin-right: 0.45em;
     margin-left: 0.1em;
 }
 
+.rtl .xblock--drag-and-drop .feedback p.incorrect:after {
+    margin-left: 0.45em;
+    margin-right: 0.1em;
+}
+
 .xblock--drag-and-drop .popup {
     position: absolute;
     display: none;
@@ -360,17 +396,30 @@
     font-size: 14px;
 }
 
+.xblock--drag-and-drop .popup .popup-content img {
+    max-width: 100%;
+}
+
 .xblock--drag-and-drop .popup .close-feedback-popup-button {
     cursor: pointer;
-    float: right;
-    margin-right: 8px;
     margin-top: 8px;
-    margin-left: 20px;
     color: #ffffff;
     font-family: "fontawesome";
     font-size: 18pt;
 }
 
+.ltr .xblock--drag-and-drop .popup .close-feedback-popup-button {
+    float: right;
+    margin-right: 8px;
+    margin-left: 20px;
+}
+
+.rtl .xblock--drag-and-drop .popup .close-feedback-popup-button {
+    float: left;
+    margin-right: 20px;
+    margin-left: 8px;
+}
+
 .xblock--drag-and-drop .popup .close-feedback-popup-button:focus {
     outline: 2px solid white;
 }
@@ -487,41 +536,79 @@
 }
 
 .xblock--drag-and-drop .attempts-used {
-    margin-left: 0.675em;
     font-size: 0.875em;
     color: #666;
 }
 
+.ltr .xblock--drag-and-drop .attempts-used {
+    margin-left: 0.675em;
+}
+
+.rtl .xblock--drag-and-drop .attempts-used {
+    margin-right: 0.675em;
+}
+
 .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
-    text-align: left;
     display: block;
 }
 
+.ltr .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
+    text-align: left;
+}
+
+.rtl .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
+    text-align: right;
+}
+
 @media (min-width: 768px) {
     .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
-        float: right;
         margin: 0;
+    }
+
+    .ltr .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
+        float: right;
         padding-right: -5px;
     }
+
+    .rtl .xblock--drag-and-drop .actions-toolbar .action-toolbar-item.sidebar-buttons {
+        float: left;
+        padding-left: -5px;
+    }
 }
 
 .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper {
-    border-right: 1px solid #ddd;
     border-collapse: collapse;
     padding: 0 5px;
     display: inline-block;
     height: 100%;
 }
 
-.xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:first-child {
+.ltr .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper {
+    border-right: 1px solid #ddd;
+}
+
+.rtl .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper {
+    border-left: 1px solid #ddd;
+}
+
+.ltr .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:first-child {
     padding-left: 0;
 }
 
-.xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:last-child {
+.rtl .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:first-child {
+    padding-right: 0;
+}
+
+.ltr .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:last-child {
     border-right: none;
     padding-right: 0;
 }
 
+.rtl .xblock--drag-and-drop .sidebar-buttons .sidebar-button-wrapper:last-child {
+    border-left: none;
+    padding-left: 0;
+}
+
 .xblock--drag-and-drop .sidebar-buttons .btn-brand {
     display: inline-block;
     padding: 3px 5px;
diff --git a/drag_and_drop_v2/templates/html/drag_and_drop_edit.html b/drag_and_drop_v2/templates/html/drag_and_drop_edit.html
index 3635f8ee1..e5c8e4457 100644
--- a/drag_and_drop_v2/templates/html/drag_and_drop_edit.html
+++ b/drag_and_drop_v2/templates/html/drag_and_drop_edit.html
@@ -6,9 +6,6 @@
 
     <section class="drag-builder">
         <div class="tab feedback-tab">
-            <p class="tab-content">
-                {% trans "Note: do not edit the problem if students have already completed it. Delete the problem and create a new one." %}
-            </p>
 
             <section class="tab-content">
                 <form class="feedback-form">
@@ -71,12 +68,12 @@
                     </div>
 
                     <label class="h4">
-                        <span>{% trans "Introductory Feedback" %}</span>
+                        <span>{% trans "Introductory feedback" %}</span>
                         <textarea class="intro-feedback">{{ self.data.feedback.start }}</textarea>
                     </label>
 
                     <label class="h4">
-                        <span>{% trans "Final Feedback" %}</span>
+                        <span>{% trans "Final feedback" %}</span>
                         <textarea class="final-feedback">{{ self.data.feedback.finish }}</textarea>
                     </label>
                 </form>
diff --git a/drag_and_drop_v2/templates/html/js_templates.html b/drag_and_drop_v2/templates/html/js_templates.html
index 7df03ddc0..60c213965 100644
--- a/drag_and_drop_v2/templates/html/js_templates.html
+++ b/drag_and_drop_v2/templates/html/js_templates.html
@@ -142,13 +142,13 @@
         </div>
         <div class="row">
             <label class="h4">
-                <span>{{i18n "Success Feedback"}}</span>
+                <span>{{i18n "Success feedback"}}</span>
                 <textarea class="success-feedback">{{ feedback.correct }}</textarea>
             </label>
         </div>
         <div class="row">
             <label class="h4">
-                <span>{{i18n "Error Feedback"}}</span>
+                <span>{{i18n "Error feedback"}}</span>
                 <textarea class="error-feedback">{{ feedback.incorrect }}</textarea>
             </label>
         </div>
diff --git a/drag_and_drop_v2/translations/en/LC_MESSAGES/text.po b/drag_and_drop_v2/translations/en/LC_MESSAGES/text.po
index bd8661ccc..9094d4a58 100644
--- a/drag_and_drop_v2/translations/en/LC_MESSAGES/text.po
+++ b/drag_and_drop_v2/translations/en/LC_MESSAGES/text.po
@@ -304,11 +304,11 @@ msgid ""
 msgstr ""
 
 #: templates/html/js_templates.html
-msgid "Success Feedback"
+msgid "Success feedback"
 msgstr ""
 
 #: templates/html/js_templates.html
-msgid "Error Feedback"
+msgid "Error feedback"
 msgstr ""
 
 #: templates/html/js_templates.html
@@ -340,11 +340,11 @@ msgid ""
 msgstr ""
 
 #: templates/html/drag_and_drop_edit.html
-msgid "Introductory Feedback"
+msgid "Introductory feedback"
 msgstr ""
 
 #: templates/html/drag_and_drop_edit.html
-msgid "Final Feedback"
+msgid "Final feedback"
 msgstr ""
 
 #: templates/html/drag_and_drop_edit.html
diff --git a/drag_and_drop_v2/translations/eo/LC_MESSAGES/text.po b/drag_and_drop_v2/translations/eo/LC_MESSAGES/text.po
index d982bc9df..3af229897 100644
--- a/drag_and_drop_v2/translations/eo/LC_MESSAGES/text.po
+++ b/drag_and_drop_v2/translations/eo/LC_MESSAGES/text.po
@@ -366,12 +366,12 @@ msgstr ""
 "évén ïf thé ïmägé dïd nöt löäd) Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт #"
 
 #: templates/html/js_templates.html
-msgid "Success Feedback"
-msgstr "Süççéss Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
+msgid "Success feedback"
+msgstr "Süççéss féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
 
 #: templates/html/js_templates.html
-msgid "Error Feedback"
-msgstr "Érrör Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+msgid "Error feedback"
+msgstr "Érrör féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
 
 #: templates/html/js_templates.html
 msgid "Show advanced settings"
@@ -413,12 +413,12 @@ msgstr ""
 "thé prößlém änd çréäté ä néw öné. Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
 #: templates/html/drag_and_drop_edit.html
-msgid "Introductory Feedback"
-msgstr "Ìntrödüçtörý Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
+msgid "Introductory feedback"
+msgstr "Ìntrödüçtörý féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
 
 #: templates/html/drag_and_drop_edit.html
-msgid "Final Feedback"
-msgstr "Fïnäl Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
+msgid "Final feedback"
+msgstr "Fïnäl féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
 
 #: templates/html/drag_and_drop_edit.html
 msgid "Background URL"