diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 0f3c4f752eb69347df667e50b7937d7128a43cf2..b9a2c18efdc78bf99a02e08384bc5e8e1277fcf7 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -4,7 +4,7 @@
       = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
 
   .issue-title
-    %span.light= "##{issue.id}"
+    %span.light= "##{issue.iid}"
     = link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title"
 
   .issue-info
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index fc6faa9c19d175be36dc6c8e33e4ac2f0e5c381a..d36a831432d7e95b3fb2c2033b131cc66520f145 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  Issue ##{@issue.id}
+  Issue ##{@issue.iid}
 
   %small
     created at
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 276436a9c8e398529b90b002147893aac6dc3f8a..933d78bcbfbd5e12fe3b70e6e85470130d7017e5 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -1,6 +1,6 @@
 %li{ class: mr_css_classes(merge_request) }
   .merge-request-title
-    %span.light= "##{merge_request.id}"
+    %span.light= "##{merge_request.iid}"
     = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
     - if merge_request.merged?
       %small.pull-right
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 7dfc995121f7a0e19079578f9fdff9eaaab5f3ca..096a91676455682750feb3d7984fadf7ff28ff44 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  = "Merge Request ##{@merge_request.id}:"
+  = "Merge Request ##{@merge_request.iid}:"
    
   -if @merge_request.for_fork?
     %span.label-branch