diff --git a/Resources/Private/Partials/IndexedSearch/Form.html b/Resources/Private/Partials/IndexedSearch/Form.html
index 488c9d919..794857412 100644
--- a/Resources/Private/Partials/IndexedSearch/Form.html
+++ b/Resources/Private/Partials/IndexedSearch/Form.html
@@ -28,21 +28,47 @@
                 <f:form.submit name="search[submitButton]" value="{f:translate(key: 'form.submit')}" id="tx-indexedsearch-searchbox-button-submit" class="btn btn-primary" />
             </div>
         </div>
-        <f:if condition="{settings.displayAdvancedSearchLink}">
-            <p>
-                <f:if condition="{searchParams.extendedSearch}">
-                    <f:then>
-                        <f:link.action action="form" arguments="{search: {extendedSearch: 0}}">
-                            <f:translate key="form.linkToRegularSearch" />
-                        </f:link.action>
-                    </f:then>
-                    <f:else>
-                        <f:link.action action="form" arguments="{search: {extendedSearch: 1}}">
-                            <f:translate key="form.linkToAdvancedSearch" />
-                        </f:link.action>
-                    </f:else>
+
+        <f:if condition="{settings.displayAdvancedSearchLink} || {settings.displayRules}">
+            <div class="form-group">
+                <f:if condition="{settings.displayAdvancedSearchLink}">
+                    <f:if condition="{searchParams.extendedSearch}">
+                        <f:then>
+                            <f:link.action class="btn btn-secondary active" action="form" arguments="{search: {extendedSearch: 0}}">
+                                <f:translate key="form.linkToRegularSearch" />
+                            </f:link.action>
+                        </f:then>
+                        <f:else>
+                            <f:link.action class="btn btn-secondary" action="form" arguments="{search: {extendedSearch: 1}}">
+                                <f:translate key="form.linkToAdvancedSearch" />
+                            </f:link.action>
+                        </f:else>
+                    </f:if>
+                </f:if>
+                <f:if condition="{settings.displayRules}">
+                    <button type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#rulesModal">
+                        <f:translate key="rules.headline" />
+                    </button>
+                    <div class="modal fade" id="rulesModal" tabindex="-1" aria-labelledby="searchRulesLabel" aria-hidden="true">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <h5 class="modal-title" id="searchRulesLabel">
+                                        <f:translate key="rules.headline" />
+                                    </h5>
+                                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                </div>
+                                <div class="modal-body">
+                                    <f:format.raw><f:translate key="rules.text" /></f:format.raw>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </f:if>
-            </p>
+            </div>
         </f:if>
 
         <f:if condition="{searchParams.extendedSearch}">
diff --git a/Resources/Private/Partials/IndexedSearch/Rules.html b/Resources/Private/Partials/IndexedSearch/Rules.html
deleted file mode 100644
index 9ba7bcdfa..000000000
--- a/Resources/Private/Partials/IndexedSearch/Rules.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:if condition="{settings.displayRules}">
-
-    <div class="form-group">
-        <a href="#" data-toggle="popover" data-trigger="focus" title="{f:translate(key:'rules.headline')}" data-html="true" data-content="{f:translate(key:'rules.text') -> f:format.htmlentities()}">
-            <f:translate key="rules.headline" />
-        </a>
-    </div>
-
-</f:if>
-</html>
