diff --git a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
index 7812796..9d7581e 100644
--- a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
+++ b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
@@ -413,8 +413,6 @@ class InlineParagraphsWidget extends WidgetBase {
               'effect' => 'fade',
             ],
             '#access' => $button_access,
-            '#prefix' => '<li class="remove">',
-            '#suffix' => '</li>',
             '#paragraphs_mode' => 'remove',
           ];
 
@@ -437,8 +435,6 @@ class InlineParagraphsWidget extends WidgetBase {
                 'effect' => 'fade',
               ),
               '#access' => $paragraphs_entity->access('update'),
-              '#prefix' => '<li class="collapse">',
-              '#suffix' => '</li>',
               '#paragraphs_mode' => 'collapsed',
               '#paragraphs_show_warning' => TRUE,
             );
@@ -480,8 +476,6 @@ class InlineParagraphsWidget extends WidgetBase {
               'effect' => 'fade',
             ),
             '#access' => $paragraphs_entity->access('update'),
-            '#prefix' => '<li class="edit">',
-            '#suffix' => '</li>',
             '#paragraphs_mode' => 'edit',
           );
 
@@ -540,8 +534,6 @@ class InlineParagraphsWidget extends WidgetBase {
               'wrapper' => $widget_state['ajax_wrapper_id'],
               'effect' => 'fade',
             ],
-            '#prefix' => '<li class="confirm-remove">',
-            '#suffix' => '</li>',
             '#paragraphs_mode' => 'removed',
           ];
 
@@ -558,8 +550,6 @@ class InlineParagraphsWidget extends WidgetBase {
               'wrapper' => $widget_state['ajax_wrapper_id'],
               'effect' => 'fade',
             ],
-            '#prefix' => '<li class="restore">',
-            '#suffix' => '</li>',
             '#paragraphs_mode' => 'edit',
           ];
         }
@@ -576,22 +566,10 @@ class InlineParagraphsWidget extends WidgetBase {
 
             $element['top']['links'] = $links;
             if ($show_links > 1) {
-              $element['top']['links']['#theme_wrappers'] = array('dropbutton_wrapper', 'paragraphs_dropbutton_wrapper');
-              $element['top']['links']['prefix'] = array(
-                '#markup' => '<ul class="dropbutton">',
-                '#weight' => -999,
-              );
-              $element['top']['links']['suffix'] = array(
-                '#markup' => '</li>',
-                '#weight' => 999,
-              );
+              $element['top']['links']['#type'] = 'splitbutton';
             }
             else {
               $element['top']['links']['#theme_wrappers'] = array('paragraphs_dropbutton_wrapper');
-              foreach($links as $key => $link_item) {
-                unset($element['top']['links'][$key]['#prefix']);
-                unset($element['top']['links'][$key]['#suffix']);
-              }
             }
             $element['top']['links']['#weight'] = 2;
           }
@@ -1032,16 +1010,7 @@ class InlineParagraphsWidget extends WidgetBase {
     $drop_button = FALSE;
     if (count($this->getAccessibleOptions()) > 1 && $this->getSetting('add_mode') == 'dropdown') {
       $drop_button = TRUE;
-      $add_more_elements['#theme_wrappers'] = ['dropbutton_wrapper'];
-      $add_more_elements['prefix'] = [
-        '#markup' => '<ul class="dropbutton">',
-        '#weight' => -999,
-      ];
-      $add_more_elements['suffix'] = [
-        '#markup' => '</ul>',
-        '#weight' => 999,
-      ];
-      $add_more_elements['#suffix'] = $this->t(' to %type', ['%type' => $title]);
+      $add_more_elements = ['#type' => 'splitbutton'];
     }
 
     foreach ($this->getAccessibleOptions() as $machine_name => $label) {
@@ -1059,11 +1028,6 @@ class InlineParagraphsWidget extends WidgetBase {
         ],
         '#bundle_machine_name' => $machine_name,
       ];
-
-      if ($drop_button) {
-        $add_more_elements['add_more_button_' . $machine_name]['#prefix'] = '<li>';
-        $add_more_elements['add_more_button_' . $machine_name]['#suffix'] = '</li>';
-      }
     }
 
     return $add_more_elements;
@@ -1130,11 +1094,15 @@ class InlineParagraphsWidget extends WidgetBase {
   public static function addMoreAjax(array $form, FormStateInterface $form_state) {
     $button = $form_state->getTriggeringElement();
     // Go one level up in the form, to the widgets container.
+    $element = NestedArray::getValue($form, ['field_paragraphs', 'widget']);
     $element = NestedArray::getValue($form, array_slice($button['#array_parents'], 0, -2));
 
+    $elemslice = implode('::', array_values(array_slice($button['#array_parents'], 0, -2)));
+
     // Add a DIV around the delta receiving the Ajax effect.
     $delta = $element['#max_delta'];
     $element[$delta]['#prefix'] = '<div class="ajax-new-content">' . (isset($element[$delta]['#prefix']) ? $element[$delta]['#prefix'] : '');
+    $element[$delta]['#prefix'] .= $elemslice;
     $element[$delta]['#suffix'] = (isset($element[$delta]['#suffix']) ? $element[$delta]['#suffix'] : '') . '</div>';
 
     return $element;