diff --git a/common/gnome-shell/3.18/common-assets/dash/running1-hover.svg b/common/gnome-shell/3.18/common-assets/dash/running1-hover.svg
deleted file mode 100644
index 7188705..0000000
--- a/common/gnome-shell/3.18/common-assets/dash/running1-hover.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="28"
-   height="4"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="running1.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#808080"
-     borderopacity="1"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="13.979167"
-     inkscape:cx="-3.8479251"
-     inkscape:cy="-0.62849914"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="851"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="selected_bg_color"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4137" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#selected_bg_color"
-       id="linearGradient4139"
-       x1="14"
-       y1="298"
-       x2="14"
-       y2="300"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-296)">
-    <rect
-       style="opacity:1;fill:url(#linearGradient4139);fill-opacity:1;stroke:none"
-       id="rect4270-9"
-       width="8"
-       height="2"
-       x="10"
-       y="298" />
-  </g>
-</svg>
diff --git a/common/gnome-shell/3.18/common-assets/dash/running2-hover.svg b/common/gnome-shell/3.18/common-assets/dash/running2-hover.svg
deleted file mode 100644
index 90fe3fb..0000000
--- a/common/gnome-shell/3.18/common-assets/dash/running2-hover.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="28"
-   height="4"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="running2.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#808080"
-     borderopacity="1"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="39.539055"
-     inkscape:cx="13.094903"
-     inkscape:cy="2.5928216"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="851"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="selected_bg_color"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4138" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#selected_bg_color"
-       id="linearGradient4140"
-       x1="11"
-       y1="298"
-       x2="11"
-       y2="300"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-296)">
-    <rect
-       style="opacity:1;fill:url(#linearGradient4140);fill-opacity:1;stroke:none"
-       id="rect4270-9"
-       width="4"
-       height="2"
-       x="9"
-       y="298" />
-    <rect
-       y="298"
-       x="15"
-       height="2"
-       width="4"
-       id="rect4239"
-       style="opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none" />
-  </g>
-</svg>
diff --git a/common/gnome-shell/3.18/common-assets/dash/running3-hover.svg b/common/gnome-shell/3.18/common-assets/dash/running3-hover.svg
deleted file mode 100644
index cf7c2fd..0000000
--- a/common/gnome-shell/3.18/common-assets/dash/running3-hover.svg
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="28"
-   height="4"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="running3.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#808080"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="13.979167"
-     inkscape:cx="6.8007789"
-     inkscape:cy="11.461748"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="851"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="selected_bg_color"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4139" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#selected_bg_color"
-       id="linearGradient4141"
-       x1="8"
-       y1="298"
-       x2="8"
-       y2="300"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-296)">
-    <rect
-       style="opacity:1;fill:url(#linearGradient4141);fill-opacity:1;stroke:none"
-       id="rect4270-9"
-       width="4"
-       height="2"
-       x="6"
-       y="298" />
-    <rect
-       y="298"
-       x="12"
-       height="2"
-       width="4"
-       id="rect4239"
-       style="opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none" />
-    <rect
-       style="opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none"
-       id="rect4140"
-       width="4"
-       height="2"
-       x="18"
-       y="298" />
-  </g>
-</svg>
diff --git a/common/gnome-shell/3.18/common-assets/dash/running4-hover.svg b/common/gnome-shell/3.18/common-assets/dash/running4-hover.svg
deleted file mode 100644
index 87fa0d2..0000000
--- a/common/gnome-shell/3.18/common-assets/dash/running4-hover.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="28"
-   height="4"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="running4.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#808080"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="19.769527"
-     inkscape:cx="10.256667"
-     inkscape:cy="-0.39615057"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="851"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="selected_bg_color"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#selected_bg_color"
-       id="linearGradient4142"
-       x1="5"
-       y1="298"
-       x2="5"
-       y2="300"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-296)">
-    <rect
-       style="opacity:1;fill:url(#linearGradient4142);fill-opacity:1;stroke:none"
-       id="rect4270-9"
-       width="4"
-       height="2"
-       x="3"
-       y="298" />
-    <rect
-       y="298"
-       x="9"
-       height="2"
-       width="4"
-       id="rect4202"
-       style="opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none" />
-    <rect
-       style="opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none"
-       id="rect4208"
-       width="4"
-       height="2"
-       x="15"
-       y="298" />
-    <rect
-       y="298"
-       x="21"
-       height="2"
-       width="4"
-       id="rect4214"
-       style="opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none" />
-  </g>
-</svg>
diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss
index 471b16e..64432e4 100644
--- a/common/gnome-shell/3.18/sass/_common.scss
+++ b/common/gnome-shell/3.18/sass/_common.scss
@@ -1659,13 +1659,9 @@ StScrollBar {
 
 .dash-item-container > StWidget {
 
-  &, &:rtl, .right & {
-    margin: 4px 8px;
-    padding: 0; }
+  &, &:rtl, .right & { padding: 4px 8px; }
 
-  .top &, .bottom & {
-    margin: 6px;
-    padding: 0; }
+  .top &, .bottom & { padding: 6px; }
 }
 
 //osd tooltip
@@ -1686,25 +1682,11 @@ StScrollBar {
 // Dash Buttons
 #dash .app-well-app {
 
-  &:hover,
-  .right &:hover,
-  .bottom &:hover,
-  .top &:hover {
-    background-color: $selected_bg_color;
-  }
-
-  &:active,
-  .right &:active,
-  .bottom &:active,
-  .top &:active {
-    background-color: darken($selected_bg_color, 10%);
-  }
-
   &:hover .overview-icon,
   .right &:hover .overview-icon,
   .bottom &:hover .overview-icon,
   .top &:hover .overview-icon {
-    background-color: transparent;
+    background-color: $selected_bg_color;
   }
 
   &:active .overview-icon,
@@ -1712,7 +1694,7 @@ StScrollBar {
   .bottom &:active .overview-icon,
   .top &:active .overview-icon {
     box-shadow: none;
-    background-color: transparent;
+    background-color: darken($selected_bg_color, 10%);
   }
 
   &-running-dot {
@@ -1721,11 +1703,6 @@ StScrollBar {
     margin-bottom: 2px;
     background-color: $selected_bg_color;
   }
-
-  &:hover .app-well-app-running-dot,
-  &:active .app-well-app-running-dot {
-    background-color: #ffffff;
-  }
 }
 
 #dashtodockContainer {
@@ -1735,10 +1712,6 @@ StScrollBar {
     height: 4px;
   }
 
-  .app-well-app:hover .app-well-app-running-dot,
-  .app-well-app:active .app-well-app-running-dot {
-    background-color: transparent;
-  }
   // Add missing 1px margin for finer .show-apps-icon alignment
   // via margin property instead to keep 1px smaller .show-apps-icon size
   // like standard #dash styling. Better than 1px transparent border.
@@ -1748,18 +1721,6 @@ StScrollBar {
     .running#{$var} .app-well-app-running-dot {
       background-image: url("common-assets/dash/running#{$var}.svg");
     }
-    .running#{$var}:hover .app-well-app-running-dot {
-      background-image: url("common-assets/dash/running#{$var}-hover.svg");
-    }
-  }
-
-  &.shrink {
-    .dash-item-container > StWidget, .dash-item-container > StWidget:rtl, .right .dash-item-container > StWidget {
-      margin: 0;
-    }
-    .top .dash-item-container > StWidget, .bottom .dash-item-container > StWidget {
-      margin: 0;
-    }
   }
 }
 
diff --git a/common/gnome-shell/3.26/sass/_common.scss b/common/gnome-shell/3.26/sass/_common.scss
index c2980eb..650bf87 100644
--- a/common/gnome-shell/3.26/sass/_common.scss
+++ b/common/gnome-shell/3.26/sass/_common.scss
@@ -1658,13 +1658,9 @@ StScrollBar {
 
 .dash-item-container > StWidget {
 
-  &, &:rtl, .right & {
-    margin: 4px 8px;
-    padding: 0; }
+  &, &:rtl, .right & { padding: 4px 8px; }
 
-  .top &, .bottom & {
-    margin: 6px;
-    padding: 0; }
+  .top &, .bottom & { padding: 6px; }
 }
 
 //osd tooltip
@@ -1685,25 +1681,11 @@ StScrollBar {
 // Dash Buttons
 #dash .app-well-app {
 
-  &:hover,
-  .right &:hover,
-  .bottom &:hover,
-  .top &:hover {
-    background-color: $selected_bg_color;
-  }
-
-  &:active,
-  .right &:active,
-  .bottom &:active,
-  .top &:active {
-    background-color: darken($selected_bg_color, 10%);
-  }
-
   &:hover .overview-icon,
   .right &:hover .overview-icon,
   .bottom &:hover .overview-icon,
   .top &:hover .overview-icon {
-    background-color: transparent;
+    background-color: $selected_bg_color;
   }
 
   &:active .overview-icon,
@@ -1711,7 +1693,7 @@ StScrollBar {
   .bottom &:active .overview-icon,
   .top &:active .overview-icon {
     box-shadow: none;
-    background-color: transparent;
+    background-color: darken($selected_bg_color, 10%);
   }
 
   &-running-dot {
@@ -1720,11 +1702,6 @@ StScrollBar {
     margin-bottom: 2px;
     background-color: $selected_bg_color;
   }
-
-  &:hover .app-well-app-running-dot,
-  &:active .app-well-app-running-dot {
-    background-color: #ffffff;
-  }
 }
 
 #dashtodockContainer {
@@ -1734,10 +1711,6 @@ StScrollBar {
     height: 4px;
   }
 
-  .app-well-app:hover .app-well-app-running-dot,
-  .app-well-app:active .app-well-app-running-dot {
-    background-color: transparent;
-  }
   // Add missing 1px margin for finer .show-apps-icon alignment
   // via margin property instead to keep 1px smaller .show-apps-icon size
   // like standard #dash styling. Better than 1px transparent border.
@@ -1747,18 +1720,6 @@ StScrollBar {
     .running#{$var} .app-well-app-running-dot {
       background-image: url("common-assets/dash/running#{$var}.svg");
     }
-    .running#{$var}:hover .app-well-app-running-dot {
-      background-image: url("common-assets/dash/running#{$var}-hover.svg");
-    }
-  }
-
-  &.shrink {
-    .dash-item-container > StWidget, .dash-item-container > StWidget:rtl, .right .dash-item-container > StWidget {
-      margin: 0;
-    }
-    .top .dash-item-container > StWidget, .bottom .dash-item-container > StWidget {
-      margin: 0;
-    }
   }
 }
 
diff --git a/common/gnome-shell/3.30/sass/_common.scss b/common/gnome-shell/3.30/sass/_common.scss
index 17b4d66..fb63448 100644
--- a/common/gnome-shell/3.30/sass/_common.scss
+++ b/common/gnome-shell/3.30/sass/_common.scss
@@ -1662,13 +1662,9 @@ StScrollBar {
 
 .dash-item-container > StWidget {
 
-  &, &:rtl, .right & {
-    margin: 4px 8px;
-    padding: 0; }
+  &, &:rtl, .right & { padding: 4px 8px; }
 
-  .top &, .bottom & {
-    margin: 6px;
-    padding: 0; }
+  .top &, .bottom & { padding: 6px; }
 }
 
 //osd tooltip
@@ -1689,25 +1685,11 @@ StScrollBar {
 // Dash Buttons
 #dash .app-well-app {
 
-  &:hover,
-  .right &:hover,
-  .bottom &:hover,
-  .top &:hover {
-    background-color: $selected_bg_color;
-  }
-
-  &:active,
-  .right &:active,
-  .bottom &:active,
-  .top &:active {
-    background-color: darken($selected_bg_color, 10%);
-  }
-
   &:hover .overview-icon,
   .right &:hover .overview-icon,
   .bottom &:hover .overview-icon,
   .top &:hover .overview-icon {
-    background-color: transparent;
+    background-color: $selected_bg_color;
   }
 
   &:active .overview-icon,
@@ -1715,7 +1697,7 @@ StScrollBar {
   .bottom &:active .overview-icon,
   .top &:active .overview-icon {
     box-shadow: none;
-    background-color: transparent;
+    background-color: darken($selected_bg_color, 10%);
   }
 
   &-running-dot {
@@ -1724,11 +1706,6 @@ StScrollBar {
     margin-bottom: 2px;
     background-color: $selected_bg_color;
   }
-
-  &:hover .app-well-app-running-dot,
-  &:active .app-well-app-running-dot {
-    background-color: #ffffff;
-  }
 }
 
 #dashtodockContainer {
@@ -1738,10 +1715,6 @@ StScrollBar {
     height: 4px;
   }
 
-  .app-well-app:hover .app-well-app-running-dot,
-  .app-well-app:active .app-well-app-running-dot {
-    background-color: transparent;
-  }
   // Add missing 1px margin for finer .show-apps-icon alignment
   // via margin property instead to keep 1px smaller .show-apps-icon size
   // like standard #dash styling. Better than 1px transparent border.
@@ -1751,18 +1724,6 @@ StScrollBar {
     .running#{$var} .app-well-app-running-dot {
       background-image: url("common-assets/dash/running#{$var}.svg");
     }
-    .running#{$var}:hover .app-well-app-running-dot {
-      background-image: url("common-assets/dash/running#{$var}-hover.svg");
-    }
-  }
-
-  &.shrink {
-    .dash-item-container > StWidget, .dash-item-container > StWidget:rtl, .right .dash-item-container > StWidget {
-      margin: 0;
-    }
-    .top .dash-item-container > StWidget, .bottom .dash-item-container > StWidget {
-      margin: 0;
-    }
   }
 }