diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 02b0a32539acab0947ffbbd9bcaf13855ce56629..be3b326075dc9e8803e35671d0e0ba60bbdc8ac4 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -212,7 +212,7 @@ $ ->
     $this = $(this)
     $this.attr 'value', $this.val()
 
-  $('.right-sidebar').on 'click', '.gutter-toggle', (e) ->
+  $(document).on 'click', 'aside .gutter-toggle', (e) ->
     e.preventDefault()
     $this = $(this)
     $thisIcon = $this.find 'i'
diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee
index c2144aea25ef24afa18ec884607ceca53c39534f..d17b11234188127ab4e00afd366a36110ce45a36 100644
--- a/app/assets/javascripts/issuable_context.js.coffee
+++ b/app/assets/javascripts/issuable_context.js.coffee
@@ -10,7 +10,7 @@ class @IssuableContext
     $(".issuable-sidebar .inline-update").on "change", ".js-assignee", ->
       $(this).submit()
 
-    $(".edit-link").click (e) ->
+    $(document).on "click",".edit-link", (e) ->
       block = $(@).parents('.block')
       block.find('.selectbox').show()
       block.find('.value').hide()
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 2c8fc509f202be6bb419f3ee7994c894637ae2ac..b10670afd40c54ae778206c6f5b1a6957643cd60 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -97,7 +97,7 @@
 
     .gutter-toggle {
       margin-left: 10px;
-      border-left: 1px solid #F0F0F0;
+      border-left: 1px solid $border-gray-light;
       padding-left: 10px;
     }
   }
@@ -221,6 +221,7 @@
       text-align: center;
       margin-left: -19px;
       padding-bottom: 10px;
+      color: #999999;
 
       span {
         display: block;
diff --git a/app/views/projects/issues/update.js.haml b/app/views/projects/issues/update.js.haml
index 2f0f3fcfb0657b340230b24d5d1d538e23707c85..3cec66d262b04b73958af6f7573b04f11f13affa 100644
--- a/app/views/projects/issues/update.js.haml
+++ b/app/views/projects/issues/update.js.haml
@@ -1,3 +1,3 @@
-$('.issuable-sidebar').html("#{escape_javascript(render 'shared/issuable/sidebar', issuable: @issue)}");
-$('.issuable-sidebar').parent().effect('highlight')
-new Issue();
+$('aside.right-sidebar').parent().html("#{escape_javascript(render 'shared/issuable/sidebar', issuable: @issue)}");
+$('aside.right-sidebar').effect('highlight')
+new Issue();
\ No newline at end of file
diff --git a/app/views/projects/merge_requests/update.js.haml b/app/views/projects/merge_requests/update.js.haml
index 93db65ddf798524b60a8bc8e15bfb1f4c5cfc134..ce5157d69a24026ccfe3de43d9b91f43c1ce42d4 100644
--- a/app/views/projects/merge_requests/update.js.haml
+++ b/app/views/projects/merge_requests/update.js.haml
@@ -1,3 +1,3 @@
-$('.issuable-sidebar').html("#{escape_javascript(render 'shared/issuable/sidebar', issuable: @merge_request)}");
-$('.issuable-sidebar').parent().effect('highlight')
+$('aside.right-sidebar')[0].outerHTML= "#{escape_javascript(render 'shared/issuable/sidebar', issuable: @merge_request)}";
+$('aside.right-sidebar').effect('highlight')
 merge_request = new MergeRequest();
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 0ed2c9c710dab5c785a30f803b80b9a071b0e382..f4f04a4219656b2b214932be70c91f6b353aa002 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -23,7 +23,7 @@
           %a.btn.btn-default.disabled{href: '#'}
             Next
 
-    = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update', 'data-type' => 'json'} do |f|
+    = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
       .block.assignee
         .sidebar-collapsed-icon
           - if issuable.assignee