diff --git a/sources/entity/ui/tmgmt_entity_ui.test b/sources/entity/ui/tmgmt_entity_ui.test
index d31e357..fe273c2 100644
--- a/sources/entity/ui/tmgmt_entity_ui.test
+++ b/sources/entity/ui/tmgmt_entity_ui.test
@@ -68,8 +68,8 @@ class TMGMTEntitySourceListTestCase extends TMGMTEntityTestCaseUtility {
     $langstatus_en = array_shift($this->xpath('//table[@id="tmgmt-entities-list"]/tbody/tr[1]/td[@class="langstatus-en"]'));
     $langstatus_de = array_shift($this->xpath('//table[@id="tmgmt-entities-list"]/tbody/tr[1]/td[@class="langstatus-de"]'));
 
-    $this->assertEqual($langstatus_en->img['title'], t('Source'));
-    $this->assertEqual($langstatus_de->img['title'], t('Missing'));
+    $this->assertEqual($langstatus_en->div['title'], t('Source'));
+    $this->assertEqual($langstatus_de->div['title'], t('Missing'));
 
     // Test status: Active job item.
     $job = $this->createJob('en', 'de');
@@ -86,7 +86,7 @@ class TMGMTEntitySourceListTestCase extends TMGMTEntityTestCaseUtility {
     $wrapper = entity_metadata_wrapper('tmgmt_job_item', array_shift($job->getItems()));
     $label = t('Active job item: @state', array('@state' => $wrapper->state->label()));
 
-    $this->assertEqual($langstatus_de->img['title'], $label);
+    $this->assertEqual($langstatus_de->div['title'], $label);
 
     // Test status: Current
     foreach ($job->getItems() as $job_item) {
@@ -96,7 +96,7 @@ class TMGMTEntitySourceListTestCase extends TMGMTEntityTestCaseUtility {
     $this->drupalGet('admin/config/regional/tmgmt/entity/node');
     $langstatus_de = array_shift($this->xpath('//table[@id="tmgmt-entities-list"]/tbody/tr[1]/td[@class="langstatus-de"]'));
 
-    $this->assertEqual($langstatus_de->img['title'], t('Current'));
+    $this->assertEqual($langstatus_de->div['title'], t('Current'));
   }
 
   function testTranslationSubmissions() {
diff --git a/ui/css/tmgmt_ui.admin.css b/ui/css/tmgmt_ui.admin.css
index 57f1c1d..1ad6ff2 100644
--- a/ui/css/tmgmt_ui.admin.css
+++ b/ui/css/tmgmt_ui.admin.css
@@ -72,6 +72,20 @@ table.tmgmt-ui-review tbody th {
   background : -moz-linear-gradient(top, #aaa, #666);
 }
 
+.tmgmt-ui-icon-white {
+  border-color: #080f00;
+  background: #fff;
+  background : -webkit-gradient(linear, left top, left bottom, from(#fff), to(#aaa));
+  background : -moz-linear-gradient(top, #fff, #aaa);
+}
+
+.tmgmt-ui-icon-blue {
+  border-color: #080f00;
+  background: #007fff;
+  background : -webkit-gradient(linear, left top, left bottom, from(#007fff), to(#0050A0));
+  background : -moz-linear-gradient(top, #007fff, #0050A0);
+}
+
 .tmgmt-ui-icon-yellow {
   border-color: #544300;
   background: #a88700;
@@ -79,11 +93,18 @@ table.tmgmt-ui-review tbody th {
   background : -moz-linear-gradient(top, #ffcc00, #a88700);
 }
 
-.tmgmt-ui-icon-red {
+.tmgmt-ui-icon-yellow {
+  border-color: #544300;
+  background: #a88700;
+  background : -webkit-gradient(linear, left top, left bottom, from(#ffcc00), to(#a88700));
+  background : -moz-linear-gradient(top, #ffcc00, #a88700);
+}
+
+.tmgmt-ui-icon-orange {
   border-color: #210000;
-  background: #750000;
-  background : -webkit-gradient(linear, left top, left bottom, from(#cc0000), to(#750000));
-  background : -moz-linear-gradient(top, #cc0000, #750000);
+  background: #FF7f00;
+  background : -webkit-gradient(linear, left top, left bottom, from(#FF7f00), to(#A55000));
+  background : -moz-linear-gradient(top, #FF7f00, #A55000);
 }
 
 /* Icon sizes. */
@@ -128,3 +149,14 @@ table.tmgmt-ui-review tbody th {
 .tmgmt-ui-icon.tmgmt-ui-icon-32 span {
   font-size: 23px;
 }
+
+.tmgmt-ui-icon-10 {
+  width: 10px;
+  height: 10px;
+  border-width: 1px;
+  line-height: 16px;
+  text-shadow: 0 -1px 0 rgba(0,0,0,0.5);
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  margin-left: 20px;
+}
diff --git a/ui/images/active.png b/ui/images/active.png
deleted file mode 100644
index 883f5453f3ab7fbc03e1439d75a1c426bfeaaea6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1(!3HE9-^k4aQjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&aw0qiB7zOL+d*qOvsOe(*v*asAf^K@|xu{fRl
z=l_3uW?e>M=H7!VSXmgkdlJKTPgr!r?yAgrj|=SX=lqgf(heIa8ZK%+am?bq{Vuhn
zqaA(BSyFxG9UfnKJy&)_wIy$Dxb^V>hjw?yR3Axq?%fab85uH8MOj-}C;tT6#Ng@b
K=d#Wzp$Pzkdq-ga

diff --git a/ui/images/current.png b/ui/images/current.png
deleted file mode 100644
index 1c5edf1b7919096537ccffef9a4628281eda0177..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1(!3HE9-^k4aQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=eYCT;XLn>}1{rUgjo>`ai@e0=F<4kUD$Jo4hm}XsW@NQzv
z;#3tgIdI1DxDSsB+hQ@EJ*+w}RwkOL_eVJxF>n|#1TM8p%(du#2{eqs)78&qol`;+
E0D6!wm;e9(

diff --git a/ui/images/missing.png b/ui/images/missing.png
deleted file mode 100644
index 6aa6ca1e52c0fbefbffc814011bac15ec6b32f2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1(!3HE9-^k4aQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JicCCR978H@CH?vT-=0~QQJA^+;0jh2M(&=2Cr)?-<}eF$
rKhBWpi864}O_0%j)3%?Lfsu_NbSjs;NcHU_K>ZA!u6{1-oD!M<>Lw~R

diff --git a/ui/images/original.png b/ui/images/original.png
deleted file mode 100644
index ca729721a6f9f5c88448c7574af982e485fa817b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1(!3HE9-^k4aQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JiuyfW978H@CH?vT-=0~QQJA^+;0o3!(FabP;5a1cu!p(h
zzT-!}6%rrK8iEAPcvu7-YGga28zaQKq8BC!?)Z{8qxpD~Yyk5`MvokJQ=JO-Qd292
z&b`XlnizdumoNC(z^AmJ$c0hNrii;?huo>S#*_*H0rMbb(Stm97<>E61Ik$JYG2GK
i+_FLXpBMv+1Vc#KZT^~*>UBV;F?hQAxvX<aXaWFd*iViC

diff --git a/ui/images/outofdate.png b/ui/images/outofdate.png
deleted file mode 100644
index e68a802b1aad7c54dd2cbb05f9746c05466f250a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1(!3HE9-^k4aQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jio!fy978H@CH?vT-=0~Q@$m}Q=HpCmZf;#UOtTJqTwt1@
zq|!aX^npn8OT|-6DTPTq?n25ZnSyxLPcm)dQMclou-9i%zQ?8py@@`5Q>>ywc;dMk
bn0Oe}Ul!ffP`zIXw1L6X)z4*}Q$iB}NOd^2

diff --git a/ui/images/translated.png b/ui/images/translated.png
deleted file mode 100644
index 5b38ebc80d5acac57ab244babe01e339a46cc69e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1(!3HE9-^k4aQjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&aw0qiB7zOL+d*qOvsRE6C-e1Jkmo-U3d7N?W{
z{Qqyytjj3O+<R~ZD+?ocPh!~a35#ynU6na+A;rE}j3<y=!kv5f!+b`Dl~=jszkfIj
Pas-2?tDnm{r-UW|nV2xG

diff --git a/ui/includes/tmgmt_ui.theme.inc b/ui/includes/tmgmt_ui.theme.inc
index cb08dea..6f36f1e 100644
--- a/ui/includes/tmgmt_ui.theme.inc
+++ b/ui/includes/tmgmt_ui.theme.inc
@@ -51,22 +51,26 @@ function theme_tmgmt_ui_translation_language_status_single($variables) {
 
   switch ($variables['translation_status']) {
     case 'original':
-      $label = t('Source');
+      $label = t('Source language');
+      $icon_color = 'tmgmt-ui-icon-white';
       break;
 
     case 'missing':
-      $label = t('Missing');
-      break;
+      $label = t('Not translated');
+      $icon_color = 'tmgmt-ui-icon-grey';
+     break;
 
     case 'outofdate':
-      $label = t('Outdated');
+      $label = t('Translation Outdated');
+      $icon_color = 'tmgmt-ui-icon-orange';
       break;
 
     default:
-      $label = t('Current');
+      $label = t('Translation up to date');
+      $icon_color = 'tmgmt-ui-icon-green';
   }
 
-  // Override the image in case of an active job.
+  // Override the label and color in case of an active job.
   if (isset($variables['job_item'])) {
     $wrapper = entity_metadata_wrapper('tmgmt_job_item', $variables['job_item']);
 
@@ -75,26 +79,27 @@ function theme_tmgmt_ui_translation_language_status_single($variables) {
     switch ($variables['job_item']->state) {
       case TMGMT_JOB_ITEM_STATE_ACTIVE:
         $variables['translation_status'] = 'active';
+        $icon_color = 'tmgmt-ui-icon-blue';
         break;
 
       case TMGMT_JOB_ITEM_STATE_REVIEW:
         $variables['translation_status'] = 'translated';
+        $icon_color = 'tmgmt-ui-icon-yellow';
         break;
     }
   }
 
-  $url = drupal_get_path('module', 'tmgmt_ui') . '/images/' . $variables['translation_status'] . '.png';
 
-  // Theme the image.
-  $image_variables = array(
-    'path' => $url,
-    'alt' => $label,
-    'title' => $label,
-    'attributes' => array(
-      'class' => array('tmgmt-translation-status-image', 'tmgmt-translation-status-' . $variables['translation_status']),
-    ),
-  );
-  $status = theme('image', $image_variables);
+  // Add classes to show the correct html icon.
+  $classes = array();
+  $classes[] = 'tmgmt-ui-icon';
+  $classes[] = 'tmgmt-ui-icon-10'; // Icon size 10px square.
+  $classes[] = $icon_color;
+
+  // Load css file, @TODO: find the right place to load this.
+  drupal_add_css(drupal_get_path('module', 'tmgmt_ui') . '/css/tmgmt_ui.admin.css');
+
+  $status = sprintf('<div class="%s" title="%s"><span></span></div>', implode(' ', $classes), $label);
 
   // If we have an active job item, wrap it in a link.
   if (!empty($variables['job_item'])) {