diff --git a/rowers/mytypes.py b/rowers/mytypes.py
index 8ba51758..9249b0a6 100644
--- a/rowers/mytypes.py
+++ b/rowers/mytypes.py
@@ -41,6 +41,39 @@ workouttypes_ordered = collections.OrderedDict({
     }
 )
 
+workouttypes_icons = collections.OrderedDict({
+    'water':'far fa-water',
+    'rower':'far fa-tire',
+    'skierg':'far fa-tire',
+    'bikeerg':'far fa-biking',
+    'dynamic':'far fa-tire',
+    'slides':'far fa-tire',
+    'paddle':'far fa-utensil-spoon',
+    'snow':'far fa-snowflakes',
+    'coastal':'far fa-water',
+    'c-boat':'far fa-water',
+    'churchboat':'far fa-water',
+    'Ride':'far fa-biking',
+    'bike':'far fa-biking',
+    'Run':'far fa-running',
+    'NordicSki':'far fa-skiing-nordic',
+    'Swim':'far fa-swimmer',
+    'Hike':'far fa-hiking',
+    'Walk':'far fa-walking',
+    'Canoeing':'far fa-blind',
+    'Crossfit':'far fa-dumbbell',
+    'StandUpPaddling':'far fa-blind',
+    'IceSkate':'far fa-skating',
+    'WeightTraining':'far fa-dumbbell',
+    'InlineSkate':'far fa-skating',
+    'Kayaking':'far fa-water',
+    'Workout':'far fa-dumbbell',
+    'Yoga':'far fa-pray',
+#    'bike':'Bike',
+    'other':'far fa-biking',
+    }
+)
+
 workouttypes = tuple((key, value) for key, value in workouttypes_ordered.items())
 
 def Reverse(tuples):
diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 2ca57e6f..cf3dca27 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -174,7 +174,7 @@
           </div>
           <div class="columns">
           <div>
-            {{ workout.workouttype }}
+            {{ workout.workouttype|icon|safe }}
           </div>
           <div>
             <span style="color:#555">Distance</span><br>
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 05f6edde..18c2b1d4 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -25,6 +25,7 @@ from rowers.c2stuff import c2_open
 from rowers.rower_rules import is_coach_user, is_workout_user, isplanmember,ispromember
 from rowers.mytypes import (
     otwtypes,adaptivetypes,sexcategories,weightcategories,workouttypes,
+    workouttypes_icons,
     )
 from rowers.utils import NoTokenError, step_to_string
 
@@ -488,6 +489,20 @@ def jsdict(dict,key): # pragma: no cover
     s = dict.get(key)
     return mark_safe(json.dumps(s))
 
+@register.filter
+def icon(workouttype):
+    try:
+        s = workouttypes_icons.get(workouttype)
+    except KeyError:
+        s = "far fa-biking"
+
+    iconstring =  """
+    <span style="font-size: 24px">
+     <i class="{s}"></i>
+     </span>
+    """.format(s=s)
+
+    return iconstring
 
 
 @register.filter
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index 9c62a2e5..8efecb58 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -328,8 +328,8 @@ th.rotate > div > span {
     border-width: 1px 0 0 0;
     border-color: #333 #333 #333 #333;
     border-style: solid;
-    padding: 5px;
-    margin: 2px;
+    padding: 2px;
+    margin: 0px;
 }
 
 .whiteborder {