diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
index b6003fdf2..f94bc427d 100644
--- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
@@ -164,7 +164,7 @@ class forum_shortcodes extends e_shortcode
 		  return $text;
 	}
 
-	function sc_search()
+	function sc_search($parm='')
 	{
 
 		if(!deftrue('FONTAWESOME') || !$srchIcon = e107::getParser()->toGlyph('fa-search'))
@@ -172,6 +172,9 @@ class forum_shortcodes extends e_shortcode
 			$srchIcon = LAN_SEARCH;
 		}
 
+		$buttonclass = (!empty($parm['buttonclass'])) ? "class='".$parm['buttonclass']."'" : "class='btn btn-default btn-secondary button'";
+
+
 		// String candidate for USERLIST wrapper
 		return "
 		<form method='get' class='form-inline input-append' action='".e_HTTP."search.php'>
@@ -181,7 +184,7 @@ class forum_shortcodes extends e_shortcode
 		<input type='hidden' name='forum' value='all' />
 		<input class='tbox form-control' type='text' name='q' size='20' value='' maxlength='50' />
 		<span class='input-group-btn'>
-		<button class='btn btn-default btn-secondary button' type='submit' name='s' value='search' >".$srchIcon."</button>
+		<button ".$buttonclass." type='submit' name='s' value='search' >".$srchIcon."</button>
 		</span>
 		</div>
 
diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
index 84b99b2e0..eeb3297b5 100644
--- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
@@ -302,7 +302,7 @@
 		}
 
 
-		function sc_search()
+		function sc_search($parm='')
 		{
 
 			if(!deftrue('FONTAWESOME') || !$srchIcon = e107::getParser()->toGlyph('fa-search'))
@@ -310,6 +310,9 @@
 				$srchIcon = LAN_SEARCH;
 			}
 
+			$buttonclass = (!empty($parm['buttonclass'])) ? "class='".$parm['buttonclass']."'" : "class='btn btn-default btn-secondary button'";
+
+
 			// String candidate for USERLIST wrapper
 			return "
 			<form method='get' class='form-inline input-append' action='".e_HTTP."search.php'>
@@ -319,7 +322,7 @@
 			<input type='hidden' name='forum' value='all' />
 			<input class='tbox form-control' type='text' name='q' size='20' value='' maxlength='50' />
 			<span class='input-group-btn'>
-			<button class='btn btn-default btn-secondary button' type='submit' name='s' value='search' >".$srchIcon."</button>
+			<button ".$buttonclass." type='submit' name='s' value='search' >".$srchIcon."</button>
 			</span>
 			</div>