diff --git a/plugins/c9.ide.layout.classic/less/blackdg.less b/plugins/c9.ide.layout.classic/less/blackdg.less
index 5ae75cbc..a7d86c6c 100644
--- a/plugins/c9.ide.layout.classic/less/blackdg.less
+++ b/plugins/c9.ide.layout.classic/less/blackdg.less
@@ -211,7 +211,7 @@
     left : -2px;
     vertical-align : top;
     margin-right : 2px !important;
-    margin-left : 1px !important;
+    margin-left : @datagrid-row-toggler-loading !important;
 }
 .blackdg .loading.selected .toggler{
     background : url("@{datagrid-selected-spinner}") no-repeat 0 0;
diff --git a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
index fade7e71..1a58adf5 100644
--- a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
+++ b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
@@ -705,6 +705,7 @@
 @datagrid-row-padding: 2px 0 2px 4px;
 @datagrid-row-height: 18px;
 @datagrid-row-toggler: -1px 4px -3px 3px;
+@datagrid-row-toggler-loading: 1px;
 
 @datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset;
 
diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less
index 0b161787..ec2edd6a 100644
--- a/plugins/c9.ide.layout.classic/themes/default-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/default-dark.less
@@ -705,6 +705,7 @@
 @datagrid-row-padding: 2px 0 2px 4px;
 @datagrid-row-height: 18px;
 @datagrid-row-toggler: -1px 4px -3px 3px;
+@datagrid-row-toggler-loading: 1px;
 
 @datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset;
 
diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
index e4b4c579..11eaa05a 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
@@ -705,6 +705,7 @@
 @datagrid-row-padding: 5px 0 5px 7px;
 @datagrid-row-height: 24px;
 @datagrid-row-toggler: -1px 4px -3px -2px;
+@datagrid-row-toggler-loading: -4px;
 
 @datagrid-editor-box-shadow: none;
 
diff --git a/plugins/c9.ide.layout.classic/themes/default-light-gray.less b/plugins/c9.ide.layout.classic/themes/default-light-gray.less
index a4eaba3d..15e2ea44 100644
--- a/plugins/c9.ide.layout.classic/themes/default-light-gray.less
+++ b/plugins/c9.ide.layout.classic/themes/default-light-gray.less
@@ -705,6 +705,7 @@
 @datagrid-row-padding: 2px 0 2px 4px;
 @datagrid-row-height: 18px;
 @datagrid-row-toggler: -1px 4px -3px 3px;
+@datagrid-row-toggler-loading: 1px;
 
 @datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset;
 
diff --git a/plugins/c9.ide.layout.classic/themes/default-light.less b/plugins/c9.ide.layout.classic/themes/default-light.less
index efd55c6d..bc2cbbba 100644
--- a/plugins/c9.ide.layout.classic/themes/default-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-light.less
@@ -705,6 +705,7 @@
 @datagrid-row-padding: 2px 0 2px 4px;
 @datagrid-row-height: 18px;
 @datagrid-row-toggler: -1px 4px -3px 3px;
+@datagrid-row-toggler-loading: 1px;
 
 @datagrid-editor-box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.5) inset;