diff --git a/css/paragraphs.widget.css b/css/paragraphs.widget.css
index a5bdcef..2248789 100644
--- a/css/paragraphs.widget.css
+++ b/css/paragraphs.widget.css
@@ -169,11 +169,24 @@
   margin-right: -11px;
 }
 
+.js .field--widget-paragraphs .form-actions {
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+}
+
+.js .field--widget-paragraphs .form-actions .dropbutton-multiple {
+  margin-right: .5rem;
+}
+
 .js .field--widget-paragraphs .paragraphs-dropbutton-wrapper {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
   display: -ms-inline-flexbox;
   display: inline-flex;
+  margin: 0;
+  padding: 0;
 }
 
 .js .field--widget-paragraphs .dropbutton-wrapper {
@@ -182,10 +195,6 @@
   padding-right: 0;
 }
 
-.js .field--widget-paragraphs .dropbutton-widget {
-  position: static;
-}
-
 .js .field--widget-paragraphs .field-multiple-table {
   margin-bottom: 10px;
 }
diff --git a/css/paragraphs.widget.scss b/css/paragraphs.widget.scss
index 0aac231..eb01a07 100644
--- a/css/paragraphs.widget.scss
+++ b/css/paragraphs.widget.scss
@@ -92,10 +92,23 @@
       margin-right: -11px;
     }
 
+    // Fix alignment of form-actions
+    .form-actions {
+      align-items: center;
+
+      // Fix alignment to content
+      .dropbutton-multiple {
+        margin-right: .5rem;
+      }
+    }
+
     .paragraphs-dropbutton-wrapper {
       // We are using inline-flex here so 'Add type' dropdown button is inline
       // and aligned 'to type' text.
       display: inline-flex;
+      // Remove margins and paddings that come from Claro theme.
+      margin: 0;
+      padding: 0;
     }
 
     .dropbutton-wrapper {
@@ -108,11 +121,6 @@
       padding-right: 0;
     }
 
-    // Reset some CSS that are coming from core.
-    .dropbutton-widget {
-      position: static;
-    }
-
     .field-multiple-table {
       margin-bottom: 10px;
     }
diff --git a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
index 7812796..fc20968 100644
--- a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
+++ b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
@@ -413,7 +413,7 @@ class InlineParagraphsWidget extends WidgetBase {
               'effect' => 'fade',
             ],
             '#access' => $button_access,
-            '#prefix' => '<li class="remove">',
+            '#prefix' => '<li class="remove dropbutton__item  dropbutton__item--extrasmall">',
             '#suffix' => '</li>',
             '#paragraphs_mode' => 'remove',
           ];
@@ -437,7 +437,7 @@ class InlineParagraphsWidget extends WidgetBase {
                 'effect' => 'fade',
               ),
               '#access' => $paragraphs_entity->access('update'),
-              '#prefix' => '<li class="collapse">',
+              '#prefix' => '<li class="collapse dropbutton__item  dropbutton__item--extrasmall">',
               '#suffix' => '</li>',
               '#paragraphs_mode' => 'collapsed',
               '#paragraphs_show_warning' => TRUE,
@@ -480,7 +480,7 @@ class InlineParagraphsWidget extends WidgetBase {
               'effect' => 'fade',
             ),
             '#access' => $paragraphs_entity->access('update'),
-            '#prefix' => '<li class="edit">',
+            '#prefix' => '<li class="edit dropbutton__item  dropbutton__item--extrasmall">',
             '#suffix' => '</li>',
             '#paragraphs_mode' => 'edit',
           );
@@ -540,7 +540,7 @@ class InlineParagraphsWidget extends WidgetBase {
               'wrapper' => $widget_state['ajax_wrapper_id'],
               'effect' => 'fade',
             ],
-            '#prefix' => '<li class="confirm-remove">',
+            '#prefix' => '<li class="confirm-remove dropbutton__item  dropbutton__item--extrasmall">',
             '#suffix' => '</li>',
             '#paragraphs_mode' => 'removed',
           ];
@@ -558,7 +558,7 @@ class InlineParagraphsWidget extends WidgetBase {
               'wrapper' => $widget_state['ajax_wrapper_id'],
               'effect' => 'fade',
             ],
-            '#prefix' => '<li class="restore">',
+            '#prefix' => '<li class="restore dropbutton__item  dropbutton__item--extrasmall">',
             '#suffix' => '</li>',
             '#paragraphs_mode' => 'edit',
           ];
@@ -578,7 +578,7 @@ class InlineParagraphsWidget extends WidgetBase {
             if ($show_links > 1) {
               $element['top']['links']['#theme_wrappers'] = array('dropbutton_wrapper', 'paragraphs_dropbutton_wrapper');
               $element['top']['links']['prefix'] = array(
-                '#markup' => '<ul class="dropbutton">',
+                '#markup' => '<ul class="dropbutton dropbutton--multiple dropbutton--extrasmall">',
                 '#weight' => -999,
               );
               $element['top']['links']['suffix'] = array(
@@ -1034,7 +1034,7 @@ class InlineParagraphsWidget extends WidgetBase {
       $drop_button = TRUE;
       $add_more_elements['#theme_wrappers'] = ['dropbutton_wrapper'];
       $add_more_elements['prefix'] = [
-        '#markup' => '<ul class="dropbutton">',
+        '#markup' => '<ul class="dropbutton dropbutton--multiple dropbutton--extrasmall">',
         '#weight' => -999,
       ];
       $add_more_elements['suffix'] = [
@@ -1061,7 +1061,7 @@ class InlineParagraphsWidget extends WidgetBase {
       ];
 
       if ($drop_button) {
-        $add_more_elements['add_more_button_' . $machine_name]['#prefix'] = '<li>';
+        $add_more_elements['add_more_button_' . $machine_name]['#prefix'] = '<li class="dropbutton__item dropbutton__item--extrasmall">';
         $add_more_elements['add_more_button_' . $machine_name]['#suffix'] = '</li>';
       }
     }
diff --git a/src/Plugin/Field/FieldWidget/ParagraphsWidget.php b/src/Plugin/Field/FieldWidget/ParagraphsWidget.php
index 9c7245f..1548f38 100644
--- a/src/Plugin/Field/FieldWidget/ParagraphsWidget.php
+++ b/src/Plugin/Field/FieldWidget/ParagraphsWidget.php
@@ -645,7 +645,7 @@ class ParagraphsWidget extends WidgetBase {
               '#paragraphs_mode' => 'closed',
               '#paragraphs_show_warning' => TRUE,
               '#attributes' => [
-                'class' => ['paragraphs-icon-button', 'paragraphs-icon-button-collapse'],
+                'class' => ['paragraphs-icon-button', 'paragraphs-icon-button-collapse', 'button--extrasmall'],
                 'title' => $this->t('Collapse'),
               ],
             ];
@@ -669,7 +669,7 @@ class ParagraphsWidget extends WidgetBase {
             '#access' => $paragraphs_entity->access('update') && !$translating_force_close,
             '#paragraphs_mode' => 'edit',
             '#attributes' => [
-              'class' => ['paragraphs-icon-button', 'paragraphs-icon-button-edit'],
+              'class' => ['paragraphs-icon-button', 'paragraphs-icon-button-edit', 'button--extrasmall'],
               'title' => $this->t('Edit'),
             ],
           ]);
@@ -2562,7 +2562,7 @@ class ParagraphsWidget extends WidgetBase {
       // order and with the right settings.
       if ($mode === 'closed') {
         $edit_all['#attributes'] = [
-          'class' => ['paragraphs-icon-button', 'paragraphs-icon-button-edit'],
+          'class' => ['paragraphs-icon-button', 'paragraphs-icon-button-edit', 'button--extrasmall'],
           'title' => $this->t('Edit all'),
         ];
         $edit_all['#title'] = $this->t('Edit All');
@@ -2571,7 +2571,7 @@ class ParagraphsWidget extends WidgetBase {
       }
       else {
         $collapse_all['#attributes'] = [
-          'class' => ['paragraphs-icon-button', 'paragraphs-icon-button-collapse'],
+          'class' => ['paragraphs-icon-button', 'paragraphs-icon-button-collapse', 'button--extrasmall'],
           'title' => $this->t('Collapse all'),
         ];
         $actions['actions']['collapse_all'] = $collapse_all;