diff --git a/myriad/__init__.py b/myriad/__init__.py
index 09b85ee..2a1d18c 100644
--- a/myriad/__init__.py
+++ b/myriad/__init__.py
@@ -60,9 +60,9 @@ def create_app():
             try:
                 icon_id = member[6]
                 icon_name = db.execute("SELECT * FROM icons WHERE id=(?)",(icon_id,)).fetchone()
+                return icon_name[2]
             except TypeError:
-                return 'any.jpg'
-            return icon_name[2]
+                return None
 
         def get_member_icons(mid):
             db = get_db()
diff --git a/myriad/templates/full.html b/myriad/templates/full.html
index c2fd425..d068b1d 100644
--- a/myriad/templates/full.html
+++ b/myriad/templates/full.html
@@ -27,13 +27,16 @@
     <div class="profile {{member[10]}}" id="m{{ member[0] }}">
         <div class="heading">{% if member[9]==0 %}<img class="minilock" src="{{ url_for('static', filename='lock.png') }}">{% endif %}<b>{{ member[3]|safe }}</b> {{ member[4]|safe }}</div>
         {% set icon = get_member_icon(member[0]) %}
-        <img src="{{ url_for('static', filename='icons/'+icon) }}" class="icon">
+        {% if icon %}
+            <img class="icon" src="{{ url_for('static', filename='icons/'+icon) }}">
+        {% else %}
+            <img class="icon" src="{{ url_for('static', filename='any.jpg') }}">
+        {% endif %}
         <div class="bio">
             {{ member[5].replace('\n', '<br>')|safe }} 
         </div>
         <br class="clear" />
         <div class="heading links"><a href="{{ url_for('home.page', mid=member[0]) }}">View Page</a>{% if g.user %} &#9734 {% if member[8]==0 %}<a href="{{ url_for('manage.add_to_front', mid=member[0],location='full') }}">Add to Front</a>{% else %}<a href="{{ url_for('manage.remove_front', mid=member[0],location='full') }}">Remove from Front</a>{% endif %} &#9734 <a href="{{ url_for('manage.edit', mid=member[0]) }}">Edit</a> &#9734 {% if member[7]==0 %}<a href="{{ url_for('manage.add_to_home', mid=member[0],location='full') }}">Pin to Homepage</a>{% else %}<a href="{{ url_for('manage.remove_home', mid=member[0],location='full') }}">Unpin from Homepage</a>{% endif %}{% endif %}</div>
-        <!-- <img src="/geo/dsgame.webp" class="dsgame"> -->
         <br class="clear" />
     </div>
     {% endif %}
diff --git a/myriad/templates/page.html b/myriad/templates/page.html
index ee237ee..f073c34 100644
--- a/myriad/templates/page.html
+++ b/myriad/templates/page.html
@@ -18,8 +18,9 @@
 
     {% if member[8]==1 %}<div class="heading"><i>Currently Fronting</i></div>{% endif %}
 
-    {% if icon %}
-    <img class="icon" src="{{ url_for('static', filename='icons/'+icon[0]) }}">
+    {% set main_icon = get_member_icon(member[0]) %}
+    {% if main_icon %}
+    <img class="icon" src="{{ url_for('static', filename='icons/'+main_icon) }}">
     {% else %}
     <img class="icon" src="{{ url_for('static', filename='any.jpg') }}">
     {% endif %}