diff --git a/nipap-www/nipapwww/public/templates/pool_form.html b/nipap-www/nipapwww/public/templates/pool_form.html
index b057671e8..a326e11e2 100644
--- a/nipap-www/nipapwww/public/templates/pool_form.html
+++ b/nipap-www/nipapwww/public/templates/pool_form.html
@@ -175,8 +175,8 @@ <h3 ng-show="method == 'add'" class="options-group-heading">Properties of new po
 					<dt>
 					</dt>
 					<dd>
-						<input type="submit" class="button button_green" value="Add pool" ng-show="method == 'add'">
-						<input type="submit" class="button button_green" value="Save pool" ng-show="method == 'edit'">
+						<button class="btn btn-success" ng-show="method == 'add'">Add pool</button>
+						<button class="btn btn-success" ng-show="method == 'edit'">Save pool</button>
 					</dd>
 				</dl>
 	 		</div>
diff --git a/nipap-www/nipapwww/public/templates/prefix_form.html b/nipap-www/nipapwww/public/templates/prefix_form.html
index eee769926..7f7d10dc7 100644
--- a/nipap-www/nipapwww/public/templates/prefix_form.html
+++ b/nipap-www/nipapwww/public/templates/prefix_form.html
@@ -132,7 +132,7 @@ <h3 class="options-group-heading">Prefix options</h3>
 						Expires
 						</dt>
 						<dd>
-						<div class="col-md-6">
+						<div class="col-md-6" style="padding: 0px">
 							<p class="input-group">
 							<input type="text" class="form-control input-sm" datepicker-popup="yyyy-MM-dd HH:mm:ss" ng-model="prefix.expires" is-open="$parent.dpOpened" starting-day="1" ng-required="true" close-text="Close" />
 							<span class="input-group-btn">
@@ -364,8 +364,8 @@ <h3 class="options-group-heading">Prefix options</h3>
 						<dt>
 						</dt>
 						<dd>
-							<input class="button button_green" type="submit" value="Add" ng-show="method == 'add'">
-							<input class="button button_green" type="submit" value="Save" ng-show="method == 'edit'">
+							<button class="btn btn-success" ng-show="method == 'add'">Add prefix</button>
+							<button class="btn btn-success" ng-show="method == 'edit'">Save prefix</button>
 						</dd>
 					</dl>
 				</div>
diff --git a/nipap-www/nipapwww/public/templates/vrf_form.html b/nipap-www/nipapwww/public/templates/vrf_form.html
index 8599a4082..a0ec9bd1a 100644
--- a/nipap-www/nipapwww/public/templates/vrf_form.html
+++ b/nipap-www/nipapwww/public/templates/vrf_form.html
@@ -120,8 +120,8 @@ <h3 class="options-group-heading" ng-show="method == 'edit'">
 				<dl>
 					<dt></dt>
 					<dd>
-						<input class="button button_green" type="submit" value="Add" ng-show="method == 'add'">
-						<input class="button button_green" type="submit" value="Save" ng-show="method == 'edit'">
+						<button class="btn btn-success" ng-show="method == 'add'">Add VRF</button>
+						<button class="btn btn-success" ng-show="method == 'edit'">Save VRF</button>
 					</dd>
 				</dl>
 			</div>
diff --git a/nipap-www/nipapwww/templates/macros.html b/nipap-www/nipapwww/templates/macros.html
index e8bc2ecab..b3da24c0b 100644
--- a/nipap-www/nipapwww/templates/macros.html
+++ b/nipap-www/nipapwww/templates/macros.html
@@ -27,9 +27,9 @@
 							</div>
 						</td>
 						<td style="vertical-align: top; width: 87px; !important">
-							<div id="sbd">
-								<input name="search_button" type="submit" value="Search">
-							</div>
+							<button class="btn btn-primary" style="width: 70px">
+								<span class="glyphicon glyphicon-search"></span>
+							</button>
 						</td>
 					</tr>
 				</table>
diff --git a/nipap-www/nipapwww/templates/pool_list.html b/nipap-www/nipapwww/templates/pool_list.html
index a78a671ce..909f1f61c 100644
--- a/nipap-www/nipapwww/templates/pool_list.html
+++ b/nipap-www/nipapwww/templates/pool_list.html
@@ -14,7 +14,7 @@
 </div>
 
 <div style="position: absolute; right: 20px; top: 14px;">
-	{{ nipap.button('Add pool', color='red', url=h.url(controller = 'pool', action = 'add')) }}
+	<a href="/ng/pool#/pool/add" class="btn btn-success">Add pool</a>
 </div>
 
 <div style="text-align: center; padding: 30px;">
diff --git a/nipap-www/nipapwww/templates/prefix_list.html b/nipap-www/nipapwww/templates/prefix_list.html
index 25d3d6fa3..12584f65f 100644
--- a/nipap-www/nipapwww/templates/prefix_list.html
+++ b/nipap-www/nipapwww/templates/prefix_list.html
@@ -124,7 +124,7 @@
 	{{ nipap.prefix_search_form(c.search_opt_parent, c.search_opt_child) }}
 	<div style="position: absolute; right: 20px; top: 55px;">
         <div class="btn-group" dropdown>
-            <button type="button" class="btn btn-danger dropdown-toggle">
+            <button type="button" class="btn btn-success dropdown-toggle">
                 Add prefix <span class="caret"></span>
             </button>
             <ul class="dropdown-menu" style="min-width: 120px">
diff --git a/nipap-www/nipapwww/templates/vrf_list.html b/nipap-www/nipapwww/templates/vrf_list.html
index 1274cb210..e37520e2b 100644
--- a/nipap-www/nipapwww/templates/vrf_list.html
+++ b/nipap-www/nipapwww/templates/vrf_list.html
@@ -6,7 +6,7 @@
 {% block content %}
 
 <div style="position: absolute; right: 20px; top: 14px;">
-	{{ nipap.button('Add VRF', color='red', url='/ng/vrf#/vrf/add') }}
+	<a href="/ng/vrf#/vrf/add" class="btn btn-success">Add VRF</a>
 </div>
 
 <div style="text-align: center; padding: 20px;">