diff --git a/sapl/compilacao/forms.py b/sapl/compilacao/forms.py
index 8d27f24b9..d8e984e3e 100644
--- a/sapl/compilacao/forms.py
+++ b/sapl/compilacao/forms.py
@@ -714,7 +714,7 @@ class DispositivoEdicaoBasicaForm(ModelForm):
 
         buttons = FormActions(*more, css_class='form-group')
 
-        _fields = [Div(*layout, css_class="row-fluid")] + \
+        _fields = [Div(*layout, css_class="row")] + \
             [to_row([(buttons, 12)])]
         self.helper.layout = Layout(*_fields)
 
@@ -1364,7 +1364,7 @@ class DispositivoRegistroAlteracaoForm(Form):
 
         buttons = FormActions(*more, css_class='form-group')
 
-        _fields = [Div(*layout, css_class="row-fluid")] + \
+        _fields = [Div(*layout, css_class="row")] + \
             [to_row([(buttons, 12)])]
 
         self.helper = FormHelper()
@@ -1421,7 +1421,7 @@ class DispositivoRegistroRevogacaoForm(Form):
 
         buttons = FormActions(*more, css_class='form-group')
 
-        _fields = [Div(*layout, css_class="row-fluid")] + \
+        _fields = [Div(*layout, css_class="row")] + \
             [to_row([(buttons, 12)])]
 
         self.helper = FormHelper()
@@ -1471,7 +1471,7 @@ class DispositivoRegistroInclusaoForm(Form):
 
         buttons = FormActions(*more, css_class='form-group')
 
-        _fields = [Div(*layout, css_class="row-fluid")] + \
+        _fields = [Div(*layout, css_class="row")] + \
             [to_row([(buttons, 12)])]
 
         self.helper = FormHelper()
diff --git a/sapl/crispy_layout_mixin.py b/sapl/crispy_layout_mixin.py
index 506f67886..0c9debb77 100644
--- a/sapl/crispy_layout_mixin.py
+++ b/sapl/crispy_layout_mixin.py
@@ -21,7 +21,7 @@ def to_column(name_span):
 
 
 def to_row(names_spans):
-    return Div(*map(to_column, names_spans), css_class='row-fluid')
+    return Div(*map(to_column, names_spans), css_class='row')
 
 
 def to_fieldsets(fields):
diff --git a/sapl/templates/crud/detail.html b/sapl/templates/crud/detail.html
index 513a18173..5b0710503 100644
--- a/sapl/templates/crud/detail.html
+++ b/sapl/templates/crud/detail.html
@@ -58,7 +58,7 @@
       {% for fieldset in view.layout_display %}
         <h2 class="legend">{{ fieldset.legend }}</h2>
         {% for row in fieldset.rows %}
-          <div class="row-fluid">
+          <div class="row">
             {% for column in row %}
               {% if column.verbose_name or column.text %}
                 <div class="col-sm-{{ column.span }}">
diff --git a/sapl/templates/crud/detail_detail.html b/sapl/templates/crud/detail_detail.html
index bf86be347..54daf38b4 100644
--- a/sapl/templates/crud/detail_detail.html
+++ b/sapl/templates/crud/detail_detail.html
@@ -45,7 +45,7 @@
     {% for fieldset in view.layout_display %}
     <h2 class="legend">{{ fieldset.legend }}</h2>
     {% for row in fieldset.rows %}
-    <div class="row-fluid">
+    <div class="row">
       {% for column in row %}
       <div class="col-sm-{{ column.span }}">
         <div id="div_id_{{ column.id }}" class="form-group">
diff --git a/sapl/templates/materia/proposicao_detail.html b/sapl/templates/materia/proposicao_detail.html
index f3e0dcd75..81ebb349a 100644
--- a/sapl/templates/materia/proposicao_detail.html
+++ b/sapl/templates/materia/proposicao_detail.html
@@ -49,7 +49,7 @@
 
   <h2 class="legend">{% model_verbose_name 'sapl.materia.models.Proposicao' %}</h2>
 
-  <div class="row-fluid">
+  <div class="row">
 
       <div class="col-sm-3">
         <div id="div_id_tipo" class="form-group">
@@ -100,7 +100,7 @@
       {% endif %}
   </div>
 
-  <div class="row-fluid">
+  <div class="row">
       <div class="col-sm-12">
         <div id="div_id_descricao" class="form-group">
           <p class="control-label">{%field_verbose_name object 'descricao'%}</p>
@@ -113,7 +113,7 @@
 
 
   {% if object.observacao %}
-    <div class="row-fluid">
+    <div class="row">
         <div class="col-sm-12">
           <div id="div_id_obseracao" class="form-group">
             <p class="control-label">{%field_verbose_name object 'observacao'%}</p>
@@ -125,7 +125,7 @@
     </div>
   {% endif %}
 
-  <div class="row-fluid">
+  <div class="row">
     {% if object.conteudo_gerado_related %}
         <div class="col-sm-6">
           <h2 class="legend">{% trans "Conteúdo Gerado" %}</h2>
diff --git a/sapl/templates/norma/normajuridica_detail.html b/sapl/templates/norma/normajuridica_detail.html
index 0ead31671..edba18737 100644
--- a/sapl/templates/norma/normajuridica_detail.html
+++ b/sapl/templates/norma/normajuridica_detail.html
@@ -5,7 +5,7 @@
       {% for fieldset in view.layout_display %}
         <h2 class="legend">{{ fieldset.legend }}</h2>
         {% for row in fieldset.rows %}
-          <div class="row-fluid">
+          <div class="row">
             {% for column in row %}
               <div class="col-sm-{{ column.span }}">
                 <div id="div_id_{{ column.id }}" class="form-group">
@@ -33,7 +33,7 @@
       {% endfor %}
 
       <hr />
-      <div class="row-fluid">
+      <div class="row">
         <div class="col-sm-12">
           <p class="control-label">Normas Relacionadas</p>
 
@@ -62,7 +62,7 @@
         </div>
       </div>
       <hr />
-      <div class="row-fluid">
+      <div class="row">
         <div class="col-sm-12">
           &nbsp;<p class="control-label">Anexos Norma Jurídica</p>
       {% if object.get_anexos_norma_juridica|length > 0 %}
@@ -79,7 +79,7 @@
 
   {% if object.texto_articulado.exists and object.texto_articulado.first.has_view_permission %}
     <hr />
-    <div class="row-fluid">
+    <div class="row">
       <div class="col-sm-12">
         <br>
         <p class="control-label">{%trans 'Texto Multivigente' %}</p>
diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html
index d0336a2f1..67f60716b 100644
--- a/sapl/templates/painel/index.html
+++ b/sapl/templates/painel/index.html
@@ -72,7 +72,7 @@
 
 
     <div class="row container-detail clearfix">
-      <div class="row-fluid">
+      <div class="row">
         <div class="col-md-4">
           <h2><font color="#459170"><p align="center" style="font-family:Verdana">Parlamentares</p></b></font></h2>
           <table align="center">
@@ -84,7 +84,7 @@
       </div>
 
 
-      <div class="row-fluid">
+      <div class="row">
         <div class="col-md-4" id="aparecer_oradores">
           <h2><font color="#459170"><p align="center" style="font-family:Verdana">Oradores</p></b></font></h2>
           <table align="center">
@@ -114,7 +114,7 @@
         </table>
       </div>
 
-      <div class="row-fluid">
+      <div class="row">
         <div class="col-md-4">
           <h2><font color="#459170"><p align="center" style="font-family:Verdana">Resultado</p></b></font></h2>
           <table align="center">
diff --git a/sapl/templates/painel/voto_nominal.html b/sapl/templates/painel/voto_nominal.html
index 59a6a83b3..a646eac47 100644
--- a/sapl/templates/painel/voto_nominal.html
+++ b/sapl/templates/painel/voto_nominal.html
@@ -83,7 +83,7 @@
       <form method='POST'>
         {% csrf_token %}
         <div class="row container-detail clearfix" style="text-align:center">
-          <div  class="row-fluid">
+          <div  class="row">
             <div class="col-md-12" id="votos">
 
                <div id="votosim"><input type="submit" class="btn btn-lg btn-success" id="voto" name="voto" type="submit" value="Sim" /></div>
diff --git a/sapl/templates/parlamentares/frente_form.html b/sapl/templates/parlamentares/frente_form.html
index b38b487bd..2e6bdca3e 100644
--- a/sapl/templates/parlamentares/frente_form.html
+++ b/sapl/templates/parlamentares/frente_form.html
@@ -7,13 +7,13 @@
   <form method="POST">
 	  {% csrf_token %}
 
-    <div class="row-fluid">
+    <div class="row">
       <div class="col-md-12" >
         {{ form.nome|as_crispy_field }}
       </div>
     </div>
 
-    <div class="row-fluid">
+    <div class="row">
       <div class="col-md-6" >
         {{ form.data_criacao|as_crispy_field }}
       </div>
@@ -23,7 +23,7 @@
     </div>
 
     <div id="div_parlamentares">
-      <div class="row-fluid">
+      <div class="row">
         <div class="col-md-12" >
           <div class="checkbox">
             <label for="id_selecionar_ativos">
@@ -33,14 +33,14 @@
         </div>
       </div>
 
-      <div class="row-fluid">
+      <div class="row">
         <div class="col-md-12" >
           {{ form.parlamentares|as_crispy_field }}
         </div>
       </div>
     </div>
 
-    <div class="row-fluid">
+    <div class="row">
       <div class="col-md-12" >
         {{ form.descricao|as_crispy_field }}
       </div>
diff --git a/sapl/templates/parlamentares/parlamentar_perfil_publico.html b/sapl/templates/parlamentares/parlamentar_perfil_publico.html
index 705eac9f5..7a95b40fa 100644
--- a/sapl/templates/parlamentares/parlamentar_perfil_publico.html
+++ b/sapl/templates/parlamentares/parlamentar_perfil_publico.html
@@ -12,7 +12,7 @@
   {% block detail_content %}
   <p class="legend"></p>
 
-  <div class="row-fluid">
+  <div class="row">
     {% if parlamentar.fotografia %}
       <div class="col-sm-3">
         <div id="div_fotografia" class="form-group">
diff --git a/sapl/templates/search/search.html b/sapl/templates/search/search.html
index 66df7075c..e2d97e11f 100644
--- a/sapl/templates/search/search.html
+++ b/sapl/templates/search/search.html
@@ -10,27 +10,27 @@
     <form method="get" action=".">
         <div class="row container-detail clearfix">
 
-            <div  class="row-fluid">
+            <div  class="row">
                 <div class="col-md-8">
                     {{ form.q|as_crispy_field }}
                 </div>
             </div>
 
-            <div  class="row-fluid">
+            <div  class="row">
                 <div class="col-md-8">
                     </br>
                     <h4> Em quais tipos de documento deseja pesquisar?</h4>
                 </div>
             </div>
 
-            <div  class="row-fluid">
+            <div  class="row">
                 <div class="col-md-8">
                     {{ form.models }}
                 </div>
             </div>
 
 
-            <div  class="row-fluid">
+            <div  class="row">
                 <div class="col-md-12">
                     <input class="btn btn-primary float-right" type="submit" value="Pesquisar">
                 </div>
diff --git a/sapl/templates/sessao/expedientemateria_form.html b/sapl/templates/sessao/expedientemateria_form.html
index a392bc40a..60a547e54 100644
--- a/sapl/templates/sessao/expedientemateria_form.html
+++ b/sapl/templates/sessao/expedientemateria_form.html
@@ -21,8 +21,8 @@
         },
         function(data, status) {
           if ($(".ementa-materia").length === 0) {
-            $("#div_id_tipo_materia").closest('.row-fluid').after(
-              $('<div class="row-fluid"/>').append(
+            $("#div_id_tipo_materia").closest('.row').after(
+              $('<div class="row"/>').append(
                 $('<div class="col-xs-12"/>').append(
                   $('<div class="alert alert-info ementa-materia"/>').html(data.ementa))))
           }