diff --git a/app/views/account/password_recovery.html.erb b/app/views/account/password_recovery.html.erb
index 9ef7c8e1c..72310aefc 100644
--- a/app/views/account/password_recovery.html.erb
+++ b/app/views/account/password_recovery.html.erb
@@ -5,8 +5,8 @@
 <% form_tag({:token => @token.value}) do %>
 <div class="box tabular">
 <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
-<%= password_field_tag 'new_password', nil, :size => 25 %><br />
-<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
+<%= password_field_tag 'new_password', nil, :size => 25 %>
+<em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
 
 <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
 <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index adf131965..adb436326 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -7,8 +7,8 @@
 <% if @user.auth_source_id.nil? %>
   <p><%= f.text_field :login, :size => 25, :required => true %></p>
 
-  <p><%= f.password_field :password, :size => 25, :required => true %><br />
-  <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
+  <p><%= f.password_field :password, :size => 25, :required => true %>
+  <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
 
   <p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p>
 <% end %>
diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index d09653b04..84f08457e 100644
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -78,7 +78,7 @@ function toggle_custom_field_format() {
 <p><%= f.text_field :regexp, :size => 50 %><br />(<%=l(:text_regexp_info)%>)</p>
 <p>
   <%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15 %>
-  <br /><em><%= l(:text_custom_field_possible_values_info) %></em>
+  <em class="info"><%= l(:text_custom_field_possible_values_info) %></em>
 </p>
 <p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
 <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
diff --git a/app/views/my/password.html.erb b/app/views/my/password.html.erb
index cac79342c..61d5c56ca 100644
--- a/app/views/my/password.html.erb
+++ b/app/views/my/password.html.erb
@@ -8,8 +8,8 @@
 <%= password_field_tag 'password', nil, :size => 25 %></p>
 
 <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
-<%= password_field_tag 'new_password', nil, :size => 25 %><br />
-<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
+<%= password_field_tag 'new_password', nil, :size => 25 %>
+<em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
 
 <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
 <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index a41b00e50..d7b7554f9 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -11,7 +11,7 @@
 <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
 <p><%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen? %>
 <% unless @project.identifier_frozen? %>
-<br /><em><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
+  <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
 <% end %></p>
 <p><%= f.text_field :homepage, :size => 60 %></p>
 <p><%= f.check_box :is_public %></p>
diff --git a/app/views/projects/settings/_wiki.html.erb b/app/views/projects/settings/_wiki.html.erb
index e627adc07..0ef494ba3 100644
--- a/app/views/projects/settings/_wiki.html.erb
+++ b/app/views/projects/settings/_wiki.html.erb
@@ -4,8 +4,8 @@
 <%= error_messages_for 'wiki' %>
 
 <div class="box tabular">
-<p><%= f.text_field :start_page, :size => 60, :required => true %><br />
-<em><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em></p>
+<p><%= f.text_field :start_page, :size => 60, :required => true %>
+<em class="info"><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em></p>
 </div>
 
 <div class="contextual">
diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb
index 4e14e4b99..b8dfbd653 100644
--- a/app/views/repositories/_form.html.erb
+++ b/app/views/repositories/_form.html.erb
@@ -4,8 +4,7 @@
 <p>
 <%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %>
 <% if @repository && ! @repository.class.scm_available %>
-  <br />
-  <em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em>
+  <em class="info"><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em>
 <% end %>
 </p>
 
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 51f105e2a..befec041c 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -8,13 +8,13 @@
 
 <p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
 
-<p><%= setting_text_field :per_page_options, :size => 20 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
+<p><%= setting_text_field :per_page_options, :size => 20 %>
+<em class="info"><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
 
-<p><%= setting_text_field :host_name, :size => 60 %><br />
-<em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
+<p><%= setting_text_field :host_name, :size => 60 %>
+<em class="info"><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
 
 <p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
 
@@ -30,8 +30,8 @@
 
 <p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
 
-<p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
+<p><%= setting_text_field :repositories_encodings, :size => 60 %>
+<em class="info"><%= l(:text_comma_separated) %></em></p>
 
 <%= call_hook(:view_settings_general_form) %>
 </div>
diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb
index 83ef31edd..3da977353 100644
--- a/app/views/settings/_mail_handler.html.erb
+++ b/app/views/settings/_mail_handler.html.erb
@@ -3,7 +3,7 @@
 <div class="box tabular settings">
   <p>
     <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
-    <br /><em><%= l(:text_line_separated) %></em>
+    <em class="info"><%= l(:text_line_separated) %></em>
   </p>
 </div>
 
diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb
index 12631c0cc..9593a14c4 100644
--- a/app/views/settings/_repositories.html.erb
+++ b/app/views/settings/_repositories.html.erb
@@ -41,7 +41,7 @@
      </tr>
   <% end %>
 </table>
-<p><em><%= l(:text_scm_config) %></em></p>
+<p><em class="info"><%= l(:text_scm_config) %></em></p>
 </fieldset>
 
 <div class="box tabular settings">
@@ -65,8 +65,8 @@
 
 <fieldset class="box tabular settings">
 <legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
-<p><%= setting_text_field :commit_ref_keywords, :size => 30 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
+<p><%= setting_text_field :commit_ref_keywords, :size => 30 %>
+<em class="info"><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
 &nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
@@ -79,7 +79,7 @@
                                                        (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
                                                        :blank => :label_no_change_option,
                                                        :label => false %>
-<br /><em><%= l(:text_comma_separated) %></em></p>
+<em class="info"><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_check_box :commit_cross_project_ref %></p>
 
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 72367fe96..96c8f04f1 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -28,8 +28,8 @@
   <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
   <% end %>
   <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
-  <p><%= f.password_field :password, :required => true, :size => 25  %><br />
-  <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
+  <p><%= f.password_field :password, :required => true, :size => 25  %>
+  <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
   <p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
   </div>
 </fieldset>
diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb
index 92bfa0650..58cb5a93f 100644
--- a/app/views/users/_mail_notifications.html.erb
+++ b/app/views/users/_mail_notifications.html.erb
@@ -7,7 +7,7 @@
 <p><% @user.projects.each do |project| %>
     <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %></label><br />
 <% end %></p>
-<p><em><%= l(:text_user_mail_option) %></em></p>
+<p><em class="info"><%= l(:text_user_mail_option) %></em></p>
 <% end %>
 <p><label><%= l(:label_user_mail_no_self_notified) %><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %></label></p>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7dc0ec6ba..5204df4cf 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -496,6 +496,8 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 
 a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
 
+em.info {font-style:normal;font-size:90%;color:#888;display:block;}
+
 /* Project members tab */
 div#tab-content-members .splitcontentleft, div#tab-content-memberships .splitcontentleft, div#tab-content-users .splitcontentleft { width: 64% }
 div#tab-content-members .splitcontentright, div#tab-content-memberships .splitcontentright, div#tab-content-users .splitcontentright { width: 34% }