diff --git a/app/views/features/_legend.html.erb b/app/views/features/_legend.html.erb
index 39d6af94..d4239bdd 100644
--- a/app/views/features/_legend.html.erb
+++ b/app/views/features/_legend.html.erb
@@ -1,4 +1,5 @@
-<div class="legend highlighttable">
-  <p class="gd">Removing from <%=h diff_for %></p>
-  <p class="gi">Adding to <%=h diff_for %></p>
+<div id="legend" class=" highlighttable">
+  <p>Legend</p>
+  <span class="gd">Removing from <%=h diff_for %></span>
+  <span class="gi">Adding to <%=h diff_for %></span>
 </div>
diff --git a/features/step_definitions/diff_legend_steps.rb b/features/step_definitions/diff_legend_steps.rb
index 14ea72c2..7a303f95 100644
--- a/features/step_definitions/diff_legend_steps.rb
+++ b/features/step_definitions/diff_legend_steps.rb
@@ -1,7 +1,6 @@
 Then /^changes on the "([^\"]*)" should be displayed as "([^\"]*)"$/ do |legend, class_name|
   legend_class = (class_name == "red")? "gd" : "gi"
-  response.should have_selector :p, attribute = {:class => legend_class} do |content|
+  response.should have_selector :span, attribute = {:class => legend_class} do |content|
     content.should contain legend
   end
-end
-
+end
\ No newline at end of file
diff --git a/spec/views/features/merge.html.erb_spec.rb b/spec/views/features/merge.html.erb_spec.rb
index c8181fd8..3709550b 100644
--- a/spec/views/features/merge.html.erb_spec.rb
+++ b/spec/views/features/merge.html.erb_spec.rb
@@ -25,16 +25,16 @@
     end
 
     it "should have a legend displaying system changes as green" do
-      response.should have_selector :div, attribute = {:class => "legend highlighttable"} do |legend_wrapper|
-        legend_wrapper.should have_selector :p, attribute = {:class => "gd"} do |content|
+      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+        legend_wrapper.should have_selector :span, attribute = {:class => "gd"} do |content|
           content.should contain "Removing from file"
         end
       end
     end
 
     it "should have a legend displaying file changes as red" do
-      response.should have_selector :div, attribute = {:class => "legend highlighttable"} do |legend_wrapper|
-        legend_wrapper.should have_selector :p, attribute = {:class => "gi"} do |content|
+      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+        legend_wrapper.should have_selector :span, attribute = {:class => "gi"} do |content|
           content.should contain "Adding to file"
         end
       end
diff --git a/spec/views/features/system_merge.html.erb_spec.rb b/spec/views/features/system_merge.html.erb_spec.rb
index 770986e3..2f00c1bd 100644
--- a/spec/views/features/system_merge.html.erb_spec.rb
+++ b/spec/views/features/system_merge.html.erb_spec.rb
@@ -17,16 +17,16 @@
     end
 
     it "should have a legend displaying system changes as green" do
-      response.should have_selector :div, attribute = {:class => "legend highlighttable"} do |legend_wrapper|
-        legend_wrapper.should have_selector :p, attribute = {:class => "gi"} do |content|
+      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+        legend_wrapper.should have_selector :span, attribute = {:class => "gi"} do |content|
           content.should contain "Adding to system"
         end
       end
     end
 
     it "should have a legend displaying file changes as red" do
-      response.should have_selector :div, attribute = {:class => "legend highlighttable"} do |legend_wrapper|
-        legend_wrapper.should have_selector :p, attribute = {:class => "gd"} do |content|
+      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+        legend_wrapper.should have_selector :span, attribute = {:class => "gd"} do |content|
           content.should contain "Removing from system"
         end
       end