diff --git a/src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-embed.js b/src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-embed.js
index 5d73a8b2a0..8ddef7b390 100644
--- a/src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-embed.js
+++ b/src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-embed.js
@@ -15,6 +15,8 @@ export default class EzBtnEmbed extends EzEmbedDiscoverContentButton {
      * @return {Boolean} True if the command is disabled, false otherwise.
      */
     isDisabled() {
+        console.warn('[DEPRECATED] EzBtnEmbed.isDisabled method is deprecated');
+        console.warn('[DEPRECATED] it will be removed from ezplatform-admin-ui 2.0');
         return !this.props.editor.get('nativeEditor').ezembed.canBeAdded();
     }
 
@@ -55,13 +57,11 @@ export default class EzBtnEmbed extends EzEmbedDiscoverContentButton {
      */
     render() {
         const css = 'ae-button ez-btn-ae ez-btn-ae--embed ' + this.getStateClasses();
-        const disabled = this.isDisabled();
         const label = Translator.trans(/*@Desc("Embed")*/ 'embed_btn.label', {}, 'alloy_editor');
 
         return (
             <button
                 className={css}
-                disabled={disabled}
                 onClick={this.chooseContent.bind(this)}
                 tabIndex={this.props.tabIndex}
                 title={label}>
diff --git a/src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-image.js b/src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-image.js
index f09e4ca4c3..72dfed0545 100644
--- a/src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-image.js
+++ b/src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-image.js
@@ -15,6 +15,8 @@ export default class EzBtnImage extends EzEmbedImageButton {
      * @return {Boolean} True if the command is disabled, false otherwise.
      */
     isDisabled() {
+        console.warn('[DEPRECATED] EzBtnImage.isDisabled method is deprecated');
+        console.warn('[DEPRECATED] it will be removed from ezplatform-admin-ui 2.0');
         return !this.props.editor.get('nativeEditor').ezembed.canBeAdded();
     }
 
@@ -56,14 +58,12 @@ export default class EzBtnImage extends EzEmbedImageButton {
      * @return {Object} The content which should be rendered.
      */
     render() {
-        const css = 'ae-button ez-btn-ae ez-btn-ae--image ' + this.getStateClasses(),
-            disabled = this.isDisabled();
+        const css = 'ae-button ez-btn-ae ez-btn-ae--image ' + this.getStateClasses();
         const label = Translator.trans(/*@Desc("Image")*/ 'image_btn.label', {}, 'alloy_editor');
 
         return (
             <button
                 className={css}
-                disabled={disabled}
                 onClick={this.chooseContent.bind(this)}
                 tabIndex={this.props.tabIndex}
                 title={label}>
diff --git a/src/bundle/Resources/public/js/alloyeditor/src/plugins/ez-add-content.js b/src/bundle/Resources/public/js/alloyeditor/src/plugins/ez-add-content.js
index b1b7b59506..b73fe97bc9 100644
--- a/src/bundle/Resources/public/js/alloyeditor/src/plugins/ez-add-content.js
+++ b/src/bundle/Resources/public/js/alloyeditor/src/plugins/ez-add-content.js
@@ -59,7 +59,14 @@
 
         if (elementPath && elementPath.block) {
             const elements = elementPath.elements;
-            const insertIndex = !elementPath.contains(isCustomTag, true) ? elements.length - 2 : 0;
+            const insideTableCell = elementPath.blockLimit && elementPath.blockLimit.getName() === 'td';
+            const insideCustomTag = elementPath.contains(isCustomTag, true);
+            const insideListItem = elementPath.lastElement.getName() == 'li';
+            let insertIndex = insideTableCell || insideCustomTag || insideListItem ? 0 : elements.length - 2;
+
+            if (elementPath.lastElement.getName() == 'li') {
+                insertIndex++;
+            }
 
             element.insertAfter(elements[insertIndex]);
         } else if (editor.widgets && editor.widgets.focused) {
diff --git a/src/bundle/Resources/public/js/alloyeditor/src/plugins/ez-embed.js b/src/bundle/Resources/public/js/alloyeditor/src/plugins/ez-embed.js
index 1254b1c8d8..63fffa91f1 100644
--- a/src/bundle/Resources/public/js/alloyeditor/src/plugins/ez-embed.js
+++ b/src/bundle/Resources/public/js/alloyeditor/src/plugins/ez-embed.js
@@ -19,9 +19,9 @@ import embedBaseDefinition from '../widgets/ez-embed-base';
         init: function(editor) {
             editor.ezembed = {
                 canBeAdded: () => {
-                    const path = editor.elementPath();
-
-                    return !path || path.contains('table', true) === null;
+                    console.warn('[DEPRECATED] canBeAdded method is deprecated');
+                    console.warn('[DEPRECATED] it will be removed from ezplatform-admin-ui 2.0');
+                    return true;
                 },
             };
 
diff --git a/src/bundle/Resources/public/js/alloyeditor/src/toolbars/config/ez-table-cell.js b/src/bundle/Resources/public/js/alloyeditor/src/toolbars/config/ez-table-cell.js
index ea08d07d99..5069330c65 100644
--- a/src/bundle/Resources/public/js/alloyeditor/src/toolbars/config/ez-table-cell.js
+++ b/src/bundle/Resources/public/js/alloyeditor/src/toolbars/config/ez-table-cell.js
@@ -12,6 +12,8 @@ export default class EzTableCellConfig extends EzConfigTableBase {
             editAttributesButton,
             'tableHeading',
             'ezembedinline',
+            'ezembed',
+            'ezimage',
             'ezanchor',
             'eztablerow',
             'eztablecolumn',