diff --git a/check_login.php b/check_login.php
index d949a222..54a86e31 100644
--- a/check_login.php
+++ b/check_login.php
@@ -21,9 +21,6 @@
 	$session_name = $row['name'];
 	$session_email = $row['email'];
 	$session_avatar = $row['avatar'];
-	if(empty($session_avatar)){
-		$session_avatar = "dist/img/noone.png";
-	}
 	$session_company_id = $row['permission_default_company'];
 	$session_token = $row['token'];
 
@@ -66,4 +63,4 @@
 	$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('alert_id') AS num FROM alerts WHERE alert_ack_date IS NULL AND company_id = $session_company_id"));
   $num_alerts = $row['num'];
 
-?>
\ No newline at end of file
+?>
diff --git a/settings-user.php b/settings-user.php
index 5ce0bc73..bfce7e16 100644
--- a/settings-user.php
+++ b/settings-user.php
@@ -31,7 +31,11 @@ $password = $row['password'];
           <input type="hidden" name="current_password_hash" value="<?php echo $password; ?>">
 
           <center class="mb-3 p-4">
-            <img src="<?php echo "$session_avatar"; ?>" class="img-circle img-fluid elevation-2">
+            <?php if(empty($session_avatar)){ ?>
+            	<i class="fas fa-user-circle fa-8x text-secondary"></i>
+            <?php }else{ ?>
+            	<img src="<?php echo $session_avatar; ?>" class="img-circle img-fluid">
+            <?php } ?>
             <h4 class="text-secondary mt-2"><?php echo $session_permission_level_display; ?></h4>
           </center>
 
@@ -196,4 +200,4 @@ $password = $row['password'];
 
 </div>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/top_nav.php b/top_nav.php
index 5fdc61d5..1dc21825 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -34,14 +34,22 @@
     
     <li class="nav-item dropdown user-menu">
       <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">
-        <img src="<?php echo $session_avatar; ?>" class="user-image img-circle" alt="User Image">
+        <?php if(empty($session_avatar)){ ?>
+        	<i class="fas fa-user-circle"></i>
+        <?php }else{ ?>
+        <img src="<?php echo $session_avatar; ?>" class="user-image img-circle">
+        <?php } ?>
         <span class="d-none d-md-inline"><?php echo $session_name; ?></span>
       </a>
       <ul class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
         <!-- User image -->
         <li class="user-header bg-gray-dark">
-          <img src="<?php echo "$session_avatar"; ?>" class="img-circle" alt="User Image">
-
+          <?php if(empty($session_avatar)){ ?>
+          	<i class="fas fa-user-circle fa-6x"></i>
+          <?php }else{ ?>
+          
+          	<img src="<?php echo "$session_avatar"; ?>" class="img-circle">
+					<?php } ?>
           <p>
             <?php echo $session_name; ?>
             <small><?php echo $session_permission_level_display; ?></small>
@@ -57,4 +65,4 @@
     
   </ul>
 </nav>
-<!-- /.navbar -->
\ No newline at end of file
+<!-- /.navbar -->