diff --git a/composer.json b/composer.json
index 60a6f754c8d059649be16ea9e6548e05f218e6b3..2968906208483d33d00ab8f92b26963cbbb4807b 100644
--- a/composer.json
+++ b/composer.json
@@ -239,7 +239,7 @@
         "Issue #2461695: Support translatable paragraph entity reference revision field":
         "https://www.drupal.org/files/issues/meta_support-2461695-206.patch",
         "Issue #2877927: Show add widget between paragraphs on hover":
-        "https://www.drupal.org/files/issues/show_add_widget-2877927-6.patch"
+        "https://www.drupal.org/files/issues/show_add_widget-2877927-9.patch"
       },
       "drupal/adminimal_theme": {
         "Issue #2696393 by kasperg, ahmadhalah: Checkboxes with .error class are not usable":
diff --git a/drupal-org.make b/drupal-org.make
index 2cf1f0466261b2e9b0cc0fdbfe4ab20a9a6e27fc..31e822cf2ad6eff7e61cab343be3f775dde4bb58 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -219,7 +219,7 @@ projects[paragraphs][download][branch] = 8.x-1.x
 ;; Issue #2461695: Support translatable paragraph entity reference revision field
 projects[paragraphs][patch][] = https://www.drupal.org/files/issues/meta_support-2461695-206.patch
 ;; Issue #2877927: Show add widget between paragraphs on hover
-projects[paragraphs][patch][] = https://www.drupal.org/files/issues/show_add_widget-2877927-6.patch
+projects[paragraphs][patch][] = https://www.drupal.org/files/issues/show_add_widget-2877927-9.patch
 
 projects[color_field][type] = module
 projects[color_field][version] = 2.0-rc2
diff --git a/tests/features/varbase/step2-apply-tests/25-landing-page_add-any-paragraph-type-to-the-page.feature b/tests/features/varbase/step2-apply-tests/25-landing-page_add-any-paragraph-type-to-the-page.feature
index e042578f99d1eae4619415399650e51dbde12a06..8f3c261b5c6c345b04abb77068f9e53efecb01be 100755
--- a/tests/features/varbase/step2-apply-tests/25-landing-page_add-any-paragraph-type-to-the-page.feature
+++ b/tests/features/varbase/step2-apply-tests/25-landing-page_add-any-paragraph-type-to-the-page.feature
@@ -13,7 +13,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -71,7 +71,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait
       And I press "Accordion"
       And I wait for AJAX to finish
@@ -112,7 +112,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -137,7 +137,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -203,7 +203,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page description Columns (Two Uneven)" for "Page description"
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -222,7 +222,7 @@ So that the "Landing page" will show up having paragrpahs of different types
      Then I should see image with the "Embed Flag Earth all earth in space" title text
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
-      And I wait 
+      And I wait
 
       And I Expand the "1" select list "dropbutton-multiple"
       And I scrollup
@@ -268,7 +268,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -287,7 +287,7 @@ So that the "Landing page" will show up having paragrpahs of different types
      Then I should see image with the "Embed Flag Earth all earth in space" title text
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
-      And I wait 
+      And I wait
 
       And I Expand the "1" select list "dropbutton-multiple"
       And I scrollup
@@ -340,7 +340,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -372,7 +372,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -401,7 +401,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Simple" for "Title"
       And I fill in "Test Landing page description Simple" for "Page description"
       And I scrolldown
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -413,8 +413,6 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in the rich text editor field "Text" with "Simple text test"
       And I Expand the field "styling-settings"
       And I wait for AJAX to finish
-      And I scrolldown
-      And I wait for AJAX to finish
       And I press the "Select an image" button
       And I wait for AJAX to finish
      Then the image media browser should be open
@@ -441,14 +439,14 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
       And I press "Tabs"
       And I wait for AJAX to finish
       And I scrolldown
-      And I wait for AJAX to finish    
+      And I wait for AJAX to finish
       And I Expand the field "styling-settings"
       And I press the "Select an image" button
       And I wait for AJAX to finish
@@ -464,7 +462,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Tab 1" for "Tab Name"
       And I Expand the "1" select list "dropbutton-multiple"
       And I press "Add Simple"
-      And I wait 
+      And I wait
      Then I should see "Tab Body"
       And I fill in the rich text editor field "Text" with "Tab 1 - Body test"
      When I press "Save"
@@ -483,7 +481,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
diff --git a/tests/features/varbase/step2-apply-tests/26-content-structure-features_anding-pages-varbase-text-and-image-paragraphs.feature b/tests/features/varbase/step2-apply-tests/26-content-structure-features_anding-pages-varbase-text-and-image-paragraphs.feature
index 51a109c4616c100356c709b512d6c6673016bef7..fb21a5b9124909326e1cbd9afee8e471bd787f29 100755
--- a/tests/features/varbase/step2-apply-tests/26-content-structure-features_anding-pages-varbase-text-and-image-paragraphs.feature
+++ b/tests/features/varbase/step2-apply-tests/26-content-structure-features_anding-pages-varbase-text-and-image-paragraphs.feature
@@ -1,7 +1,7 @@
 Feature: Content Structure Features - Landing Pages - Varbase text and image paragraphs.
 As a logged in user with a permission to mange Landing pages
 I want to be able to add number of Text and image paragraph compoments
-So that the "Landing page" will have text and images in right and left view. 
+So that the "Landing page" will have text and images in right and left view.
 
 @javascript @local @development
   Scenario: Check if a user with a permission to manage "Landing page" content type create a new Landing page that will look like this page https://www.getopensocial.com/features
@@ -11,9 +11,9 @@ So that the "Landing page" will have text and images in right and left view.
       And I wait
       And I fill in "Test landing page title for text and image paragraphs" for "Title"
       And I fill in "Test landing page body description." for "Page description"
-  
+
   # Add Simple text centered
-      And I press "Add Component"
+      And I press "Add paragraph"
       And I wait
       And I scrolldown
       And I press "Simple"
@@ -24,12 +24,13 @@ So that the "Landing page" will have text and images in right and left view.
       And I wait
       And I press "Save"
      Then I should see "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur tortor diam, interdum in quam in, vehicula varius sem. Sed eu augue diam. Proin elementum bibendum tristique. Nam at ante sem. Mauris suscipit felis eget orci porttitor, feugiat viverra elit commodo. Proin quis erat laoreet, tempor nisl nec, varius quam. Maecenas malesuada est sollicitudin euismod posuere." in the "p" element with the "class" attribute set to "text-align-center"
-  
-  # Add Text and Image -> image to the right 
+
+  # Add Text and Image -> image to the right
      When I click "Edit"
       And I wait
       And I scrolldown
-      And I press the "2" "Add Component" button
+      # And I press the "2" "Add Component" button
+      And I press "Add paragraph"
       And I wait
       And I press "Text and image"
       And I wait for AJAX to finish
@@ -49,18 +50,19 @@ So that the "Landing page" will have text and images in right and left view.
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
       And I wait
-     Then I Expand the field "styling-settings" 
+     Then I Expand the field "styling-settings"
       And I select "Blue" from "Background Color"
       And I click "Content settings"
       And I select "Right" from "Image position"
       And I press "Save"
      Then I should see the "0" "wrapper" with "align2left" class
-  
-  # Add Text and Image -> image to the left 
+
+  # Add Text and Image -> image to the left
      When I click "Edit"
       And I wait
       And I scrolldown
-      And I press the "3" "Add Component" button
+      # And I press the "3" "Add Component" button
+      And I press "Add paragraph"
       And I wait
       And I press "Text and image"
       And I wait for AJAX to finish