diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php
index 826c2ab2eee407c314b3bd39aedfa12d111649b4..82653e9b4e54ef7fd8d9147d661e8745787c2b7c 100644
--- a/include/staff/department.inc.php
+++ b/include/staff/department.inc.php
@@ -31,7 +31,6 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
  <input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
  <input type="hidden" name="id" value="<?php echo $info['id']; ?>">
  <h2><?php echo __('Department');?></h2>
-<br>
 <ul class="clean tabs">
     <li class="active"><a href="#settings">
         <i class="icon-file"></i> <?php echo __('Settings'); ?></a></li>
diff --git a/include/staff/group.inc.php b/include/staff/group.inc.php
index d13205385c286281d85558dc028d42571b1ce781..032d0b3f05d5652ae8370449cb7a21373a81f9f6 100644
--- a/include/staff/group.inc.php
+++ b/include/staff/group.inc.php
@@ -29,7 +29,6 @@ $roles = Role::getActiveRoles();
     <input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
     <input type="hidden" name="id" value="<?php echo $info['id']; ?>">
 <h2> <?php echo $group ?: __('New Group'); ?></h2>
-<br>
 <ul class="clean tabs">
     <li class="active"><a href="#group">
         <i class="icon-file"></i> <?php echo __('Group'); ?></a></li>
diff --git a/include/staff/plugin.inc.php b/include/staff/plugin.inc.php
index 4b9726a3761f3f06267badf79fc160fe3c652fd4..65c8f5863c5895590b27ec0ed026f55238b51b66 100644
--- a/include/staff/plugin.inc.php
+++ b/include/staff/plugin.inc.php
@@ -23,7 +23,7 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
     <input type="hidden" name="do" value="<?php echo $action; ?>">
     <input type="hidden" name="id" value="<?php echo $info['id']; ?>">
     <h2><?php echo __('Manage Plugin'); ?>
-        <br/><small><?php echo $plugin->getName(); ?></small></h2>
+        <small><?php echo $plugin->getName(); ?></small></h2>
 
     <h3><?php echo __('Configuration'); ?></h3>
 <?php
diff --git a/include/staff/role.inc.php b/include/staff/role.inc.php
index 7730ea551f005c0f70dd72f021173b17ddcada52..0e982e044bc04cd69ea92d9568f3ef51ef7ba68b 100644
--- a/include/staff/role.inc.php
+++ b/include/staff/role.inc.php
@@ -24,7 +24,6 @@ $info = Format::htmlchars(($errors && $_POST) ? array_merge($info, $_POST) : $in
     <input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
     <input type="hidden" name="id" value="<?php echo $info['id']; ?>">
 <h2> <?php echo $role ?: __('New Role'); ?></h2>
-<br>
 <ul class="clean tabs">
     <li class="active"><a href="#definition">
         <i class="icon-file"></i> <?php echo __('Definition'); ?></a></li>
diff --git a/include/staff/system.inc.php b/include/staff/system.inc.php
index a3a337f12a56b274093b97d3b6ab5025fd6e6472..3ea8767350538cd2493efdee571f93c7efee4cbb 100644
--- a/include/staff/system.inc.php
+++ b/include/staff/system.inc.php
@@ -45,7 +45,6 @@ $extensions = array(
 
 ?>
 <h2><?php echo __('About this osTicket Installation'); ?></h2>
-<br/>
 <table class="list" width="100%";>
 <thead>
     <tr><th colspan="2"><?php echo __('Server Information'); ?></th></tr>
diff --git a/include/staff/tasks.inc.php b/include/staff/tasks.inc.php
index e74a543994d0823b9cabd010c021e293c36d1769..4c0430b8498ab34d4bcf95875df6feac6aad2cec 100644
--- a/include/staff/tasks.inc.php
+++ b/include/staff/tasks.inc.php
@@ -223,7 +223,7 @@ if ($thisstaff->hasPerm(Task::PERM_DELETE)) {
             ?>
         </div>
 </div>
-<div class="clear" style="margin-bottom:10px;"></div>
+<div class="clear"></div>
 <form action="tasks.php" method="POST" name='tasks' id="tasks">
 <?php csrf_token(); ?>
  <input type="hidden" name="a" value="mass_process" >
diff --git a/include/staff/templates/task-preview.tmpl.php b/include/staff/templates/task-preview.tmpl.php
index 5203956880e919bd708714227f1af258bb5206d5..f23258ea0ef66a9f6675f75788030bf52fedc185 100644
--- a/include/staff/templates/task-preview.tmpl.php
+++ b/include/staff/templates/task-preview.tmpl.php
@@ -6,7 +6,7 @@ if($task->isOverdue())
 
 echo sprintf(
         '<div style="width:600px; padding: 2px 2px 0 5px;" id="t%s">
-         <h2>'.__('Task #%s').': %s</h2><br>',
+         <h2>'.__('Task #%s').': %s</h2>',
          $task->getNumber(),
          $task->getNumber(),
          Format::htmlchars($task->getTitle()));
diff --git a/include/staff/templates/ticket-preview.tmpl.php b/include/staff/templates/ticket-preview.tmpl.php
index f4091921f15fc4f32455e2fdd7aed9f94008f93d..168847fc8ee4fdfda4a9b590d3b69cf6b78b3941 100644
--- a/include/staff/templates/ticket-preview.tmpl.php
+++ b/include/staff/templates/ticket-preview.tmpl.php
@@ -17,7 +17,7 @@ elseif($ticket->isOverdue())
 
 echo sprintf(
         '<div style="width:600px; padding: 2px 2px 0 5px;" id="t%s">
-         <h2>'.__('Ticket #%s').': %s</h2><br>',
+         <h2>'.__('Ticket #%s').': %s</h2>',
          $ticket->getNumber(),
          $ticket->getNumber(),
          Format::htmlchars($ticket->getSubject()));
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 518d40896878cf171c909ed3dbe64f0917b2a306..3eb5ad822d3301b0f69fa12bbf78aa072a15aed5 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -359,7 +359,7 @@ return false;">
         </div>
     </div>
 </div>
-<div class="clear" style="margin-bottom:10px;"></div>
+<div class="clear"></div>
 <form action="tickets.php" method="POST" name='tickets' id="tickets">
 <?php csrf_token(); ?>
  <input type="hidden" name="a" value="mass_process" >
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 5867a3e68974fad96b672ad8e43df496fd1572c9..8bc4d42bc76f8c969bb75543950bb13f41c562a9 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -768,7 +768,7 @@ div.section-break h3 {
 }
 
 h2 {
-    margin:0;
+    margin:0 0 0.7em;
     padding:0;
     font-size:12pt;
     color:#0A568E;
@@ -2003,7 +2003,7 @@ tr.disabled th {
 
 .tab_content {
     position: relative;
-    padding: 5px 0;
+    padding: 12px 0;
 }
 .left-tabs {
     margin-left: 48px;