diff --git a/src/webui/app/helpers/request_helper.rb b/src/webui/app/helpers/request_helper.rb
index 35e2eb932c1..dee04ffec9d 100644
--- a/src/webui/app/helpers/request_helper.rb
+++ b/src/webui/app/helpers/request_helper.rb
@@ -11,13 +11,15 @@ def reqtype(req)
     type
   end
 
+  STATE_ICONS = {
+    'new'      => 'icons/flag_green.png',
+    'review'   => 'icons/flag_yellow.png',
+    'declined' => 'icons/flag_red.png',
+  }
+
+  # FIXME: belongs to CSS
   def request_state_icon(request)
-    case request.get('state')['name']
-      when 'new' then return 'flag_green'
-      when 'review' then return 'flag_yellow'
-      when 'declined' then return'flag_red'
-      else return ''
-    end
+    STATE_ICONS[request.get('state')['name']] || ''
   end
 
 end
diff --git a/src/webui/test/unit/request_helper_test.rb b/src/webui/test/unit/request_helper_test.rb
new file mode 100644
index 00000000000..d89b68c562f
--- /dev/null
+++ b/src/webui/test/unit/request_helper_test.rb
@@ -0,0 +1,28 @@
+require File.join File.dirname(__FILE__), '..', 'test_helper'
+
+include RequestHelper
+include ActionView::Helpers::TagHelper
+
+class RequestHelperTest < ActiveSupport::TestCase
+
+  def test_request_state_icon
+    request = RequestHelperTmp.new('new')
+    assert_equal 'icons/flag_green.png', request_state_icon(request)
+
+    request = RequestHelperTmp.new('unknown')
+    assert_equal '', request_state_icon(request)
+  end
+end
+
+class RequestHelperTmp
+  @ret = nil
+  def initialize(ret)
+    @ret = ret
+  end
+  def state
+    self
+  end
+  def value(key)
+    @ret
+  end
+end