diff --git a/src/stubs/resources/views/full/index-formfield.stub b/src/stubs/resources/views/full/index-formfield.stub
index 6e11c3f..14e1738 100644
--- a/src/stubs/resources/views/full/index-formfield.stub
+++ b/src/stubs/resources/views/full/index-formfield.stub
@@ -17,9 +17,9 @@
         <div class="card table-responsive">
             <div class="card-header">
                 {{ Form::open(['method' => 'get', 'class' => 'form-inline']) }}
-                {!! FormField::text('q', ['label' => __('master.search'), 'placeholder' => __('master.search_text'), 'class' => 'form-control-sm']) !!}
-                {{ Form::submit(__('master.search'), ['class' => 'btn btn-sm']) }}
-                {{ link_to_route('masters.index', __('app.reset')) }}
+                {!! FormField::text('q', ['label' => __('master.search'), 'placeholder' => __('master.search_text'), 'class' => 'mr-sm-2']) !!}
+                {{ Form::submit(__('master.search'), ['class' => 'btn btn-secondary']) }}
+                {{ link_to_route('masters.index', __('app.reset'), [], ['class' => 'btn btn-link']) }}
                 {{ Form::close() }}
             </div>
             <table class="table table-sm">
diff --git a/src/stubs/resources/views/full/index.stub b/src/stubs/resources/views/full/index.stub
index 8ed31e2..7881ae3 100644
--- a/src/stubs/resources/views/full/index.stub
+++ b/src/stubs/resources/views/full/index.stub
@@ -19,10 +19,10 @@
                 <form method="GET" action="" accept-charset="UTF-8" class="form-inline">
                     <div class="form-group">
                         <label for="q" class="control-label mr-sm-2">{{ __('master.search') }}</label>
-                        <input placeholder="{{ __('master.search_text') }}" name="q" type="text" id="q" class="form-control form-control-sm mr-sm-2" value="{{ request('q') }}">
+                        <input placeholder="{{ __('master.search_text') }}" name="q" type="text" id="q" class="form-control mr-sm-2" value="{{ request('q') }}">
                     </div>
-                    <input type="submit" value="{{ __('master.search') }}" class="btn btn-sm">
-                    <a href="{{ route('masters.index') }}" class="btn btn-link btn-sm">{{ __('app.reset') }}</a>
+                    <input type="submit" value="{{ __('master.search') }}" class="btn btn-secondary">
+                    <a href="{{ route('masters.index') }}" class="btn btn-link">{{ __('app.reset') }}</a>
                 </form>
             </div>
             <table class="table table-sm">
diff --git a/tests/CommandOptions/FullCrudFormfieldOptionsTest.php b/tests/CommandOptions/FullCrudFormfieldOptionsTest.php
index 1fc5c54..7360d9d 100644
--- a/tests/CommandOptions/FullCrudFormfieldOptionsTest.php
+++ b/tests/CommandOptions/FullCrudFormfieldOptionsTest.php
@@ -61,9 +61,9 @@ class FullCrudFormfieldOptionsTest extends TestCase
         <div class=\"card table-responsive\">
             <div class=\"card-header\">
                 {{ Form::open(['method' => 'get', 'class' => 'form-inline']) }}
-                {!! FormField::text('q', ['label' => __('{$this->lang_name}.search'), 'placeholder' => __('{$this->lang_name}.search_text'), 'class' => 'form-control-sm']) !!}
-                {{ Form::submit(__('{$this->lang_name}.search'), ['class' => 'btn btn-sm']) }}
-                {{ link_to_route('{$this->table_name}.index', __('app.reset')) }}
+                {!! FormField::text('q', ['label' => __('{$this->lang_name}.search'), 'placeholder' => __('{$this->lang_name}.search_text'), 'class' => 'mr-sm-2']) !!}
+                {{ Form::submit(__('{$this->lang_name}.search'), ['class' => 'btn btn-secondary']) }}
+                {{ link_to_route('{$this->table_name}.index', __('app.reset'), [], ['class' => 'btn btn-link']) }}
                 {{ Form::close() }}
             </div>
             <table class=\"table table-sm\">
diff --git a/tests/Generators/ViewsGeneratorTest.php b/tests/Generators/ViewsGeneratorTest.php
index d562cd1..c860169 100644
--- a/tests/Generators/ViewsGeneratorTest.php
+++ b/tests/Generators/ViewsGeneratorTest.php
@@ -35,10 +35,10 @@ class ViewsGeneratorTest extends TestCase
                 <form method=\"GET\" action=\"\" accept-charset=\"UTF-8\" class=\"form-inline\">
                     <div class=\"form-group\">
                         <label for=\"q\" class=\"control-label mr-sm-2\">{{ __('{$this->lang_name}.search') }}</label>
-                        <input placeholder=\"{{ __('{$this->lang_name}.search_text') }}\" name=\"q\" type=\"text\" id=\"q\" class=\"form-control form-control-sm mr-sm-2\" value=\"{{ request('q') }}\">
+                        <input placeholder=\"{{ __('{$this->lang_name}.search_text') }}\" name=\"q\" type=\"text\" id=\"q\" class=\"form-control mr-sm-2\" value=\"{{ request('q') }}\">
                     </div>
-                    <input type=\"submit\" value=\"{{ __('{$this->lang_name}.search') }}\" class=\"btn btn-sm\">
-                    <a href=\"{{ route('{$this->table_name}.index') }}\" class=\"btn btn-link btn-sm\">{{ __('app.reset') }}</a>
+                    <input type=\"submit\" value=\"{{ __('{$this->lang_name}.search') }}\" class=\"btn btn-secondary\">
+                    <a href=\"{{ route('{$this->table_name}.index') }}\" class=\"btn btn-link\">{{ __('app.reset') }}</a>
                 </form>
             </div>
             <table class=\"table table-sm\">