diff --git a/.gitignore b/.gitignore
index e871b19be..ce516a617 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,5 @@
 /venv
 /node_modules/
 npm-debug.log
-/.idea
+*/.idea/
 /*.egg/
diff --git a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html
index 4c45926a9..88bffbe1b 100644
--- a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html
+++ b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/add.html
@@ -1,6 +1,6 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
-{% block titletag %}{% trans "Add search pick" %}{% endblock %}
+{% block titletag %}{% trans "Add search promotion" %}{% endblock %}
 {% block content %}
     {% trans "Add search pick" as add_str %}
     {% include "wagtailadmin/shared/header.html" with title=add_str icon="pick" %}
diff --git a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/list.html b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/list.html
index a47e79def..def5a4329 100644
--- a/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/list.html
+++ b/wagtail/contrib/wagtailsearchpromotions/templates/wagtailsearchpromotions/list.html
@@ -14,7 +14,7 @@
         {% for query in queries %}
             <tr>
                 <td class="title">
-                    <h2><a href="{% url 'wagtailsearchpromotions:edit' query.id %}" title="{% trans 'Edit this pick' %}">{{ query.query_string }}</a></h2>
+                    <h2><a href="{% url 'wagtailsearchpromotions:edit' query.id %}" title="{% trans 'Edit this promotion' %}">{{ query.query_string }}</a></h2>
                 </td>
                 <td>
                     {% for searchpick in query.editors_picks.all %}
diff --git a/wagtail/contrib/wagtailsearchpromotions/tests.py b/wagtail/contrib/wagtailsearchpromotions/tests.py
index 3207023ce..bf1a5a4fd 100644
--- a/wagtail/contrib/wagtailsearchpromotions/tests.py
+++ b/wagtail/contrib/wagtailsearchpromotions/tests.py
@@ -14,7 +14,7 @@ class TestSearchPromotions(TestCase):
             query=Query.get("root page"),
             page_id=1,
             sort_order=0,
-            description="First search pick",
+            description="First search promotion",
         )
 
         # Check
diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index 465ba82ab..6f6055ae5 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -572,7 +572,7 @@
                 <li class="icon icon-order-up">order-up</li>
                 <li class="icon icon-bin">bin</li>
                 <li class="spinner"><div class="icon icon-spinner">spinner</div> spinner</li>
-                <li class="icon icon-pick">pick</li>
+                <li class="icon icon-pick">promotion</li>
                 <li class="icon icon-redirect">redirect</li>
                 <li class="icon icon-view">view</li>
                 <li class="icon icon-no-view">no-view</li>