diff --git a/css/GridField.css b/css/GridField.css
index 830e33de3..a0f85745a 100644
--- a/css/GridField.css
+++ b/css/GridField.css
@@ -37,7 +37,8 @@
 .cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { color: #fff !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
 .cms table.ss-gridfield-table tr th button.ss-gridfield-sort { background: transparent url(../images/arrows.png) no-repeat right 6px; border: none; width: 100%; text-align: left; padding: 4px 0; text-shadow: rgba(0, 0, 0, 0.3) 0px -1px 0; color: #fff; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; }
 .cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { background-position: right -34px; }
-.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted { background-position: right -116px; }
+.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted-desc { background-position: right -72px; }
+.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted-asc { background-position: right -116px; }
 .cms table.ss-gridfield-table tr th input.ss-gridfield-sort { padding: 2px; }
 .cms table.ss-gridfield-table tr th input.ss-gridfield-sort:focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
 .cms table.ss-gridfield-table tr td { border-right: 1px solid rgba(0, 0, 0, 0.1); padding: 6.4px 12px; color: #666666; }
diff --git a/forms/gridfield/GridFieldFilter.php b/forms/gridfield/GridFieldFilter.php
index c1b1d2dd2..acf2c4859 100644
--- a/forms/gridfield/GridFieldFilter.php
+++ b/forms/gridfield/GridFieldFilter.php
@@ -84,8 +84,8 @@ class GridFieldFilter implements GridField_HTMLProvider, GridField_DataManipulat
 					$resetbutton = new GridField_Action($gridField, 'reset', _t('GridField.ResetFilter', "Reset"), 'reset', null)
 					);
 
-				$filterbutton->addExtraClass('gridfield-button-filter');
-				$resetbutton->addExtraClass('gridfield-button-reset');
+				$filterbutton->addExtraClass('ss-gridfield-button-filter');
+				$resetbutton->addExtraClass('ss-gridfield-button-reset');
 				
 			}
 			$field->iteratorProperties($currentColumn-1, count($columns));
diff --git a/images/icons/filter-icons.png b/images/icons/filter-icons.png
new file mode 100644
index 000000000..8ccd35f6f
Binary files /dev/null and b/images/icons/filter-icons.png differ
diff --git a/scss/GridField.scss b/scss/GridField.scss
index 68c906446..cc2267044 100644
--- a/scss/GridField.scss
+++ b/scss/GridField.scss
@@ -227,9 +227,15 @@ $gf_grid_x:	16px;
 						&:hover {
 							background-position: right -34px;
 						}
-						&.ss-gridfield-sorted {
+						&.ss-gridfield-sorted-desc {
+							background-position: right -72px;
+						}
+						&.ss-gridfield-sorted-asc {
 							background-position: right -116px;
 						}
+					}
+					&.ss-gridfield-button-filter{
+						background: transparent url(../images/icons/filter-icons.png) no-repeat right 6px;
 					}		
 				}
 				input {