diff --git a/themes/bootprint/css/bootprint-custom.css b/themes/bootprint/css/bootprint-custom.css
index 99b280b24ddfa934764ecd3615488133f8f6e762..0bab11ff36ec6ead9c917c4fb214dd7018ee3a85 100644
--- a/themes/bootprint/css/bootprint-custom.css
+++ b/themes/bootprint/css/bootprint-custom.css
@@ -120,6 +120,11 @@ select, .btn:not(.btn-link){vertical-align:top}
 .filters li a:hover {color:#FFF}
 .filters li a i {display:inline-block;margin:2px 0 0 3px;vertical-align:top}
 
+.search-controls [class^=icon-] {background-position:0 0;background-repeat:no-repeat;height:14px;margin-top:1px;width:14px}
+.search-controls .icon-list {background:url('../images/view_list.png')}
+.search-controls .icon-grid {background:url('../images/view_grid.png')}
+.search-controls .pull-right > [class^=icon-] {border:1px solid #FFA500}
+
 /* --- MAIN --- */
 .centered-pills {border-bottom:1px solid #DDD;font-size:12px;margin-right:14px}
 .nav-pills {margin:3px 0 0 0}
diff --git a/themes/bootprint/css/icons.css b/themes/bootprint/css/icons.css
index d5b276b922f45b2e693e8b0f79921c8823b6d7a5..6b1dcf58d1fada7709673ef082d6ba92a4f5854d 100644
--- a/themes/bootprint/css/icons.css
+++ b/themes/bootprint/css/icons.css
@@ -18,10 +18,12 @@ i.icon-envelope-alt,
 i.icon-export,
 i.icon-exchange,
 i.icon-flag,
+i.icon-grid,
 i.icon-heart,
 i.icon-home,
 i.icon-inbox,
 i.icon-leaf,
+i.icon-list,
 i.icon-list-alt,
 i.icon-lock,
 i.icon-minus-sign,