diff --git a/legacy/elementary/data/themes/widgets/spinner.edc b/legacy/elementary/data/themes/widgets/spinner.edc
index ad58b657e0..6cec75a36e 100644
--- a/legacy/elementary/data/themes/widgets/spinner.edc
+++ b/legacy/elementary/data/themes/widgets/spinner.edc
@@ -370,7 +370,7 @@ group { name: "elm/spinner/base/default";
          target: "elm.text";
       }
       program { name: "dec";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "left_bt";
          action: SIGNAL_EMIT "elm,action,decrement,start" "";
       }
@@ -380,7 +380,7 @@ group { name: "elm/spinner/base/default";
          action: SIGNAL_EMIT "elm,action,decrement,stop" "";
       }
       program { name: "inc";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "right_bt";
          action: SIGNAL_EMIT "elm,action,increment,start" "";
       }
@@ -391,7 +391,7 @@ group { name: "elm/spinner/base/default";
       }
       program {
          name:   "left_bt_click";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "left_over2";
          action: STATE_SET "clicked" 0.0;
          target: "left_bt";
@@ -405,7 +405,7 @@ group { name: "elm/spinner/base/default";
       }
       program {
          name:   "left_bt_click2";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "left_over3";
          action: STATE_SET "clicked" 0.0;
          target: "left_over3";
@@ -443,7 +443,7 @@ group { name: "elm/spinner/base/default";
 
       program {
          name:   "right_bt_click";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "right_over2";
          action: STATE_SET "clicked" 0.0;
          target: "right_bt";
@@ -457,7 +457,7 @@ group { name: "elm/spinner/base/default";
       }
       program {
          name:   "right_bt_click2";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "right_over3";
          action: STATE_SET "clicked" 0.0;
          target: "right_over3";
@@ -847,6 +847,7 @@ group { name: "elm/spinner/base/vertical";
          description { state: "default" 0.0;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
+            fixed: 1 1;
             color: 0 0 0 0;
          }
       }
@@ -857,11 +858,11 @@ group { name: "elm/spinner/base/vertical";
             align: 0.5 0.5;
             rel1 { relative: 0.0 0.5;
                offset: 3 2;
-               to: "bg";
+               to: "elm.text";
             }
             rel2 { relative: 1.0 0.5;
                offset: -3 -2;
-               to: "bg";
+               to: "elm.text";
             }
             fixed: 1 1;
             color: 0 0 0 0;
@@ -906,7 +907,7 @@ group { name: "elm/spinner/base/vertical";
          target: "elm.text";
       }
       program { name: "dec";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "down_bt";
          action: SIGNAL_EMIT "elm,action,decrement,start" "";
       }
@@ -916,7 +917,7 @@ group { name: "elm/spinner/base/vertical";
          action: SIGNAL_EMIT "elm,action,decrement,stop" "";
       }
       program { name: "inc";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "up_bt";
          action: SIGNAL_EMIT "elm,action,increment,start" "";
       }
@@ -927,7 +928,7 @@ group { name: "elm/spinner/base/vertical";
       }
       program {
          name:   "down_bt_click2";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "down_over3";
          action: STATE_SET "clicked" 0.0;
          target: "down_over3";
@@ -942,7 +943,7 @@ group { name: "elm/spinner/base/vertical";
       }
       program {
          name:   "up_bt_click2";
-         signal: "mouse,down,1";
+         signal: "mouse,down,1*";
          source: "up_over3";
          action: STATE_SET "clicked" 0.0;
          target: "up_over3";