diff --git a/application/views/accumulate/index.php b/application/views/accumulate/index.php
index 4b5b4524..85a5e8af 100644
--- a/application/views/accumulate/index.php
+++ b/application/views/accumulate/index.php
@@ -83,7 +83,7 @@
                 <!-- Button (Double) -->
                 <div class="form-group row">
                     <div class="col-md-10">
-                        <button id="button1id" type="button" name="button1id" class="btn btn-success btn-primary ld-ext-right" onclick="accumulatePlot(this.form)">Show<div class="ld ld-ring ld-spin"></div></button>
+                        <button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="accumulatePlot(this.form)">Show<div class="ld ld-ring ld-spin"></div></button>
                     </div>
                 </div>
 
diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index 05d42407..444357ad 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -115,11 +115,11 @@
               </div>
           </div>
 
-    <button type="submit" class="btn btn-outline-secondary btn-sm" value="Export">Export QSOs</button>
+    <button type="submit" class="btn btn-primary" value="Export">Export QSOs</button>
       </form>
 
     <br><br>
-      <h6>Logbook of The World</h6>
+      <h5>Logbook of The World</h5>
       <p>If no date are chosen, that means all QSOs will be marked!</p>
       <form class="form" action="<?php echo site_url('adif/mark_lotw'); ?>" method="post" enctype="multipart/form-data">
           <p class="card-text">From date:</p>
@@ -141,14 +141,14 @@
           </div>
       </div>
       <br>
-      <button type="submit" class="btn btn-outline-secondary btn-sm" value="Export">Mark QSOs as exported to LoTW</button>
+      <button type="submit" class="btn btn-primary" value="Export">Mark QSOs as exported to LoTW</button>
       </form>
       <br><br>
 
-    <h6>Export Satellite Only QSOs</h6>
-    <a href="<?php echo site_url('adif/exportsat'); ?>" title="Export All Satellite Contacts" target="_blank" class="btn btn-outline-secondary btn-sm">Export All Satellite QSOs</a>
-
-    <a href="<?php echo site_url('adif/exportsatlotw'); ?>" title="Export All Satellite QSOS Confirmed on LoTW" target="_blank" class="btn btn-outline-secondary btn-sm">Export All Satellite QSOs Confirmed on LoTW</a>
+    <h5>Export Satellite Only QSOs</h5>
+    <p><a href="<?php echo site_url('adif/exportsat'); ?>" title="Export All Satellite Contacts" target="_blank" class="btn btn-primary">Export All Satellite QSOs</a></p>
+    
+    <p><a href="<?php echo site_url('adif/exportsatlotw'); ?>" title="Export All Satellite QSOS Confirmed on LoTW" target="_blank" class="btn btn-primary">Export All Satellite QSOs Confirmed on LoTW</a></p>
   </div>
 </div>
 
diff --git a/application/views/api/help.php b/application/views/api/help.php
index b2e83584..9c806591 100644
--- a/application/views/api/help.php
+++ b/application/views/api/help.php
@@ -32,7 +32,7 @@
 		  <tbody>
 			<?php foreach ($api_keys->result() as $row) { ?>
 				<tr>
-					<td><?php echo $row->key; ?></td>
+					<td><i class="fas fa-key"></i> <?php echo $row->key; ?></td>
 					<td><?php echo $row->description; ?></td>
 					<td>
 						<?php
@@ -67,8 +67,8 @@
 		<?php } ?>
 
 		<p>
-			<a href="<?php echo site_url('api/generate/rw'); ?>" class="btn btn-outline-primary btn-sm">Generate Key with Read & Write Access</a>
-			<a href="<?php echo site_url('api/generate/r'); ?>" class="btn btn-outline-primary btn-sm">Generate Key with Read Only Access</a>
+			<a href="<?php echo site_url('api/generate/rw'); ?>" class="btn btn-primary "><i class="fas fa-plus"></i> Create a read & write key</a>
+			<a href="<?php echo site_url('api/generate/r'); ?>" class="btn btn-primary"><i class="fas fa-plus"></i> Create a read-only key</a>
 		</p>
 
   </div>
diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php
index ed5a53b7..e8a64823 100644
--- a/application/views/awards/cq/index.php
+++ b/application/views/awards/cq/index.php
@@ -134,8 +134,8 @@
             <div class="form-group row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
-                    <button id="button2id" type="reset" name="button2id" class="btn btn-danger">Reset</button>
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
+                    <button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
+                    <button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
                 </div>
             </div>
 
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
index cf272f9e..01882037 100644
--- a/application/views/awards/dxcc/index.php
+++ b/application/views/awards/dxcc/index.php
@@ -101,8 +101,8 @@
             <div class="form-group row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
-                    <button id="button2id" type="reset" name="button2id" class="btn btn-danger">Reset</button>
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
+                    <button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
+                    <button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
                 </div>
             </div>
 
diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php
index 0a77fdac..9b859eb4 100644
--- a/application/views/awards/iota/index.php
+++ b/application/views/awards/iota/index.php
@@ -88,8 +88,8 @@
             <div class="form-group row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
-                    <button id="button2id" type="reset" name="button2id" class="btn btn-danger">Reset</button>
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
+                    <button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
+                    <button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
                 </div>
             </div>
 
diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php
index fb0e9da0..2556c162 100644
--- a/application/views/awards/was/index.php
+++ b/application/views/awards/was/index.php
@@ -57,8 +57,8 @@
             <div class="form-group row">
                 <label class="col-md-2 control-label" for="button1id"></label>
                 <div class="col-md-10">
-                    <button id="button2id" type="reset" name="button2id" class="btn btn-danger">Reset</button>
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
+                    <button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
+                    <button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
                 </div>
             </div>
 
diff --git a/application/views/distances/index.php b/application/views/distances/index.php
index 97ec574a..930ec2ca 100644
--- a/application/views/distances/index.php
+++ b/application/views/distances/index.php
@@ -10,7 +10,7 @@
             <select class="custom-select my-1 mr-sm-2"  id="distplot_bands">
                 <option value="sat">SAT</option>
             </select>
-            <button id="plot" type="button" name="plot" class="btn btn-success btn-primary" onclick="distPlot(this.form)">Plot</button>
+            <button id="plot" type="button" name="plot" class="btn btn-primary" onclick="distPlot(this.form)">Plot</button>
         </form>
     </div>
 
diff --git a/application/views/eqsl/export.php b/application/views/eqsl/export.php
index 9821b762..93bcc624 100644
--- a/application/views/eqsl/export.php
+++ b/application/views/eqsl/export.php
@@ -30,7 +30,7 @@
     	echo "<p>Clicking \"Upload QSOs\" will send QSO information to eQSL.cc.</p>";
 		echo form_open('eqsl/export');
 		echo "<input type=\"hidden\" name=\"eqslexport\" id=\"eqslexport\" value=\"export\" />";
-		echo "<input class=\"btn primary\" type=\"submit\" value=\"Upload QSOs\" /></form>";
+		echo "<input class=\"btn btn-primary\" type=\"submit\" value=\"Upload QSOs\" /></form>";
 	}
 	else
 	{
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index d0af4c4e..c62189b6 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1428,7 +1428,7 @@ $(document).ready(function(){
                             message: html,
                             onshown: function(dialog) {
                                 var qsoid = $("#qsoid").text();
-                                $(".editButton").html('<a class="btn btn-success" id="edit_qso" href="javascript:qso_edit('+qsoid+')"><i class="fas fa-edit"></i> Edit QSO</a>');
+                                $(".editButton").html('<a class="btn btn-primary" id="edit_qso" href="javascript:qso_edit('+qsoid+')"><i class="fas fa-edit"></i> Edit QSO</a>');
                                 var lat = $("#lat").text();
                                 var long = $("#long").text();
                                 var callsign = $("#callsign").text();
diff --git a/application/views/mode/index.php b/application/views/mode/index.php
index 1cef8d20..788beaf9 100644
--- a/application/views/mode/index.php
+++ b/application/views/mode/index.php
@@ -16,7 +16,6 @@
   </div>
   <div class="card-body">
     <p class="card-text">This is the place you can customize your modes-list by activating/deactivating modes to be shown in the select-list.</p>
-      <p><button onclick="createModeDialog();" class="btn btn-primary"><i class="fas fa-plus"></i> Create a Mode</button></p>
     <div class="table-responsive">
 		<table style="width:100%" class="modetable table table-striped">
 			<thead>
@@ -37,15 +36,15 @@
 					<td><?php echo $row->submode;?></td>
 					<td><?php echo $row->qrgmode;?></td>
                     <td class='mode_<?php echo $row->id ?>'><?php if ($row->active == 1) { echo "active";} else { echo "not active";};?></td>
-                    <td>
+                    <td style="text-align: center">
                         <?php if ($row->active == 1) {
-                            echo "<button onclick='javascript:deactivateMode(". $row->id . ")' class='btn_" . $row->id . " btn btn-success btn-sm'><i class='fas fa-edit-alt'></i> Deactivate</button>";
+                            echo "<button onclick='javascript:deactivateMode(". $row->id . ")' class='btn_" . $row->id . " btn btn-secondary btn-sm'>Deactivate</button>";
                         } else {
-                            echo "<button onclick='javascript:activateMode(". $row->id . ")' class='btn_" . $row->id . " btn btn-success btn-sm'><i class='fas fa-edit-alt'></i> Activate</button>";
+                            echo "<button onclick='javascript:activateMode(". $row->id . ")' class='btn_" . $row->id . " btn btn-primary btn-sm'>Activate</button>";
                         };?>
                     </td>
 					<td>
-						<a href="<?php echo site_url('mode/edit')."/".$row->id; ?>" class="btn btn-info btn-sm"><i class="fas fa-edit-alt"></i> Edit</a>
+						<a href="<?php echo site_url('mode/edit')."/".$row->id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i> Edit</a>
 					</td>
 					<td>
 						<a href="javascript:deleteMode('<?php echo $row->id; ?>', '<?php echo $row->mode; ?>');" class="btn btn-danger btn-sm" ><i class="fas fa-trash-alt"></i> Delete</a>
@@ -55,11 +54,8 @@
 				<?php } ?>
 			</tbody>
 		<table>
-	</table>
-	
-
   </div>
+  <br/>
+  <p><button onclick="createModeDialog();" class="btn btn-primary"><i class="fas fa-plus"></i> Create a Mode</button></p>
 </div>
-
-
 </div>
\ No newline at end of file
diff --git a/application/views/notes/add.php b/application/views/notes/add.php
index c0de7d81..4cbeec9f 100644
--- a/application/views/notes/add.php
+++ b/application/views/notes/add.php
@@ -45,7 +45,7 @@
 		<textarea name="content" style="display:none" id="hiddenArea"></textarea>
 	</div>
 
-	<button type="submit" value="Submit" class="btn btn-primary">Submit</button>
+	<button type="submit" value="Submit" class="btn btn-primary">Save</button>
 	</form>
   </div>
 </div>
diff --git a/application/views/notes/edit.php b/application/views/notes/edit.php
index 6402473e..715fadb9 100644
--- a/application/views/notes/edit.php
+++ b/application/views/notes/edit.php
@@ -47,7 +47,7 @@
 	</div>
 
 	<input type="hidden" name="id" value="<?php echo $id; ?>" />
-	<button type="submit" value="Submit" class="btn btn-primary">Submit</button>
+	<button type="submit" value="Submit" class="btn btn-primary">Save</button>
 	</form>
   </div>
 
diff --git a/application/views/qrz/export.php b/application/views/qrz/export.php
index 006edbd2..7567429c 100644
--- a/application/views/qrz/export.php
+++ b/application/views/qrz/export.php
@@ -26,7 +26,7 @@
                     <td>Edited QSOs not uploaded</td>
                     <td>Total QSOs not uploaded</td>
                     <td>Total QSOs uploaded</td>
-                    <td></td>
+                    <td>Actions</td>
                 </thead>
                 <tbody>';
                 foreach ($station_profile->result() as $station) {      // Fills the table with the data
@@ -36,7 +36,7 @@
                     echo '<td id ="modcount'.$station->station_id.'">' . $station->modcount . '</td>';
                     echo '<td id ="notcount'.$station->station_id.'">' . $station->notcount . '</td>';
                     echo '<td id ="totcount'.$station->station_id.'">' . $station->totcount . '</td>';
-                    echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportQrz('. $station->station_id .')">Export<div class="ld ld-ring ld-spin"></div></button></td>';
+                    echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportQrz('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
                     echo '</tr>';
                 }
                 echo '</tfoot></table></div>';
diff --git a/application/views/qslprint/index.php b/application/views/qslprint/index.php
index 08980537..1553c7a1 100644
--- a/application/views/qslprint/index.php
+++ b/application/views/qslprint/index.php
@@ -20,13 +20,11 @@
 	    <p class="card-text">Requested QSLs are any QSOs with a value of "Requested" or "Queued" in their "QSL Sent" field.</p>
 	    <p class="card-text">Only QSOs under the active station profile will be exported.</p>
 		    
-    <a href="<?php echo site_url('qslprint/exportcsv'); ?>" title="Export CSV-file" target="_blank" class="btn btn-outline-secondary btn-sm">Export requested QSLs to CSV-file</a>
-    
-    <a href="<?php echo site_url('qslprint/exportadif'); ?>" title="Export ADIF" target="_blank" class="btn btn-outline-secondary btn-sm">Export requested QSLs to ADIF-file</a>
+		<p><a href="<?php echo site_url('qslprint/exportcsv'); ?>" title="Export CSV-file" target="_blank" class="btn btn-primary">Export requested QSLs to CSV-file</a></p>
 
-    <a href="<?php echo site_url('qslprint/qsl_printed'); ?>" title="Mark QSLs as printed" target="_blank" class="btn btn-outline-secondary btn-sm">Mark requested QSLs as sent</a>
- 
+		<p><a href="<?php echo site_url('qslprint/exportadif'); ?>" title="Export ADIF" target="_blank" class="btn btn-primary">Export requested QSLs to ADIF-file</a></p>
+
+		<p><a href="<?php echo site_url('qslprint/qsl_printed'); ?>" title="Mark QSLs as printed" target="_blank" class="btn btn-primary">Mark requested QSLs as sent</a></p>
 	  </div>
 	</div>
-
 </div>
diff --git a/application/views/qso/edit.php b/application/views/qso/edit.php
index a834c9ff..5f881db7 100755
--- a/application/views/qso/edit.php
+++ b/application/views/qso/edit.php
@@ -511,7 +511,7 @@
 		<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
 
 		<div class="actions">
-			<input type="submit" class="btn btn-success" value="Save changes" onclick="closeME();">
+			<input type="submit" class="btn btn-primary" value="Save changes" onclick="closeME();">
 			<a class="btn btn-danger float-right" href="<?php echo site_url('qso/delete'); ?>/<?php echo $qso->COL_PRIMARY_KEY; ?>" onclick="return confirm('Are you sure you want the delete QSO?');"><i class="fas fa-trash-alt"></i> Delete QSO</a>
 		</div>
 	</div>
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index 26435bf1..e0b2add0 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -557,7 +557,7 @@
                         <input type="hidden" name="id" value="<?php echo $qso->COL_PRIMARY_KEY; ?>" />
 
                         <div class="actions">
-                            <button id="show" type="button" name="download" class="btn btn-success btn-primary" onclick="qso_save();">Save changes</button>
+                            <button id="show" type="button" name="download" class="btn btn-primary" onclick="qso_save();">Save changes</button>
                             <a class="btn btn-danger float-right" href="javascript:qso_delete(<?php echo $qso->COL_PRIMARY_KEY; ?>, '<?php echo $qso->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> Delete QSO</a>
                         </div>
                     </div>
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index f006100d..3d70e202 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -405,7 +405,7 @@
         </div>
         
         <button type="reset" class="btn btn-light" onclick="reset_fields()">Reset</button>
-        <button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save QSO</button>
+        <button type="submit" class="btn btn-primary"><i class="fas fa-save"></i> Save QSO</button>
       </div>
     </form>
     </div>
diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php
index 406bd069..8c40f254 100644
--- a/application/views/station_profile/index.php
+++ b/application/views/station_profile/index.php
@@ -59,7 +59,7 @@
 					<td><?php echo $row->station_gridsquare;?></td>
 					<td><?php echo $row->station_city;?></td>	
 					<td><?php echo $row->qso_total;?></td>
-					<td>
+					<td style="text-align: center">
 						<?php if($row->station_active != 1) { ?>			
 							<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('Are you sure you want to make logbook <?php echo $row->station_profile_name; ?> the active logbook?');">Set Active</a>
 						<?php } else { ?>
@@ -71,7 +71,7 @@
 						<?php } ?>
 					</td>
 					<td>
-						<a href="<?php echo site_url('station/edit')."/".$row->station_id; ?>" class="btn btn-info btn-sm"><i class="fas fa-edit"></i> Edit</a>
+						<a href="<?php echo site_url('station/edit')."/".$row->station_id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i> Edit</a>
 					</td>
                     <td>
                         <a href="<?php echo site_url('station/deletelog')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" onclick="return confirm('Are you sure you want to delete all QSOs within this station profile?');"><i class="fas fa-trash-alt"></i> Empty Log</a></td>
diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php
index b5500901..e921e8d8 100644
--- a/application/views/timeline/index.php
+++ b/application/views/timeline/index.php
@@ -22,7 +22,7 @@
             <div class="form-group row">
                 <label class="col-md-1 control-label" for="button1id"></label>
                 <div class="col-md-10">
-                    <button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
+                    <button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
                 </div>
             </div>
 
diff --git a/application/views/timeplotter/index.php b/application/views/timeplotter/index.php
index 7b3fffd9..32a63465 100644
--- a/application/views/timeplotter/index.php
+++ b/application/views/timeplotter/index.php
@@ -49,7 +49,7 @@
 
             <div class="form-group row">
                 <div class="col-md-3">
-                    <button id="button1id" type="button" name="button1id" class="btn btn-success btn-primary ld-ext-right" onclick="timeplot(this.form);">Show<div class="ld ld-ring ld-spin"></div></button>
+                    <button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="timeplot(this.form);">Show<div class="ld ld-ring ld-spin"></div></button>
                 </div>
             </div>
 
diff --git a/application/views/update/index.php b/application/views/update/index.php
index fbe60ff6..eae5fa2c 100644
--- a/application/views/update/index.php
+++ b/application/views/update/index.php
@@ -14,14 +14,21 @@
 				You must install php-xml for this to work.
 				</div>
 			<?php } else { ?>
-				<input type="submit" id="btn_update_dxcc" value="Update Dxcc" />
+				<h5>Check for DXCC Data Updates</h5>
+				<input type="submit" class="btn btn-primary" id="btn_update_dxcc" value="Update DXCC Data" />
 
 				<div id="dxcc_update_status">Status:</br></div>
 					
 				<br/>
-					
-				<a href="<?php echo site_url('update/check_missing_dxcc');?>">Check missing DXCC/Countries values</a>
-				<a href="<?php echo site_url('update/check_missing_dxcc/all');?>">[Re-Check ALL]</a>
+				<br/>
+				<h5>Apply DXCC Data to Logbook</h5>
+				<p class="card-text">
+					After updating, Cloudlog can fill in missing callsign information in the logbook using the newly-obtained DXCC data.
+					You can choose to check just the QSOs in the logbook that are missing DXCC metadata or to re-check the entire logbook
+					and update existing metadata as well, in case it has changed.
+				</p>
+				<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc');?>">Check QSOs missing DXCC data</a></p>
+				<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc/all');?>">Re-check all QSOs in logbook</a></p>
 
 				<style>
 					#dxcc_update_status{
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index e99b4758..381891b5 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -262,7 +262,7 @@
 
 	<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
 	<br>
-	<button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save Account Changes</button>
+	<button type="submit" class="btn btn-primary"><i class="fas fa-save"></i> Save Account Changes</button>
 	<br>
 	<br>
 </form>
diff --git a/application/views/user/main.php b/application/views/user/main.php
index 3507612e..79c31d18 100644
--- a/application/views/user/main.php
+++ b/application/views/user/main.php
@@ -37,14 +37,14 @@
 					<td><a href="<?php echo site_url('user/edit')."/".$row->user_id; ?>"><?php echo $row->user_name; ?></a></td>
 					<td><?php echo $row->user_email; ?></td>
 					<td><?php $l = $this->config->item('auth_level'); echo $l[$row->user_type]; ?></td>
-					<td><a href="<?php echo site_url('user/edit')."/".$row->user_id; ?>" class="btn btn-primary btn-sm"><i class="fas fa-user-edit"></i> Edit</a> <a href="<?php echo site_url('user/delete')."/".$row->user_id; ?>" class="btn btn-danger btn-sm"><i class="fas fa-user-minus"></i> Delete</a></td>
+					<td><a href="<?php echo site_url('user/edit')."/".$row->user_id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-user-edit"></i> Edit</a> <a href="<?php echo site_url('user/delete')."/".$row->user_id; ?>" class="btn btn-danger btn-sm"><i class="fas fa-user-minus"></i> Delete</a></td>
 				</tr>
 				<?php $i++; } ?>
 			</tbody>
 		</table>
 	</div>
 		<p>
-			<a class="btn btn-primary" href="<?php echo site_url('user/add'); ?>">Add user</a>
+			<a class="btn btn-primary" href="<?php echo site_url('user/add'); ?>"><i class="fas fa-user-plus"></i> Create user</a>
 		</p>
   </div>
 </div>
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index c8c035eb..52a16e7b 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -249,7 +249,7 @@
 			
 			<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
 				<br>
-                    <p class="editButton"><a class="btn btn-success" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a></p>
+                    <p class="editButton"><a class="btn btn-primary" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a></p>
 			<?php } ?>
 
 			<?php