diff --git a/src/GridFieldAddExistingSearchButton.php b/src/GridFieldAddExistingSearchButton.php
index 7e991cb3..630a2c35 100755
--- a/src/GridFieldAddExistingSearchButton.php
+++ b/src/GridFieldAddExistingSearchButton.php
@@ -91,14 +91,15 @@ public function getHTMLFragments($grid)
     {
         GridFieldExtensions::include_requirements();
 
-        $data = new ArrayData(array(
+        $data = ArrayData::create([
             'Title' => $this->getTitle(),
-            'Link'  => $grid->Link('add-existing-search')
-        ));
+            'Classes' => 'action btn btn-primary font-icon-search add-existing-search',
+            'Link' => $grid->Link('add-existing-search'),
+        ]);
 
-        return array(
-            $this->fragment => $data->renderWith('Symbiote\\GridFieldExtensions\\GridFieldAddExistingSearchButton'),
-        );
+        return [
+            $this->fragment => $data->renderWith(__CLASS__),
+        ];
     }
 
     public function getURLHandlers($grid)
diff --git a/templates/Symbiote/GridFieldExtensions/GridFieldAddExistingSearchButton.ss b/templates/Symbiote/GridFieldExtensions/GridFieldAddExistingSearchButton.ss
index 3efa1ec3..ddebae0f 100644
--- a/templates/Symbiote/GridFieldExtensions/GridFieldAddExistingSearchButton.ss
+++ b/templates/Symbiote/GridFieldExtensions/GridFieldAddExistingSearchButton.ss
@@ -1,3 +1,3 @@
-<a href="$Link" class="action ss-ui-button ui-button add-existing-search" data-icon="magnifier">
-	$Title
-</a>
+<a href="$Link" class="$Classes">
+    <span class="btn__title">$Title</span>
+</a>