diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php
index 925f17048a..d12955607a 100644
--- a/database/seeds/TestDataSeeder.php
+++ b/database/seeds/TestDataSeeder.php
@@ -215,7 +215,7 @@ class TestDataSeeder extends Seeder
         $rule = new Rule;
         $rule->user()->associate($this->user);
         $rule->ruleGroup()->associate(RuleGroup::find(1));
-        $rule->order           = 2;
+        $rule->order           = 3;
         $rule->active          = 1;
         $rule->stop_processing = 0;
         $rule->title           = 'Move savings';
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 829b626fdd..bdce941bae 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -63,14 +63,25 @@
                                     <tr>
                                         <td>
                                             <div class="btn-group btn-group-xs">
+                                                {% if rule.order > 1 %}
                                                 <a title="{{ 'rule_priority_up'|_ }}" href="{{ route('rules.rule.up', rule.id) }}" class="btn btn-default"><span
-                                                            class="fa fa-arrow-up"></span></a>
+                                                            class="fa fa-fw fa-arrow-up"></span></a>
+                                                    {% else %}
+                                                        <a href="#" class="btn btn-default"><span
+                                                                    class="fa fa-fw"></span></a>
+                                                {% endif %}
+                                                {% if rule.order < ruleGroup.rules.count %}
                                                 <a title="{{ 'rule_priority_down'|_ }}" href="{{ route('rules.rule.down', rule.id) }}"
-                                                   class="btn btn-default"><span class="fa fa-arrow-down"></span></a>
+                                                   class="btn btn-default"><span class="fa fa-fw fa-arrow-down"></span>
+                                                </a>
+                                                {% else %}
+                                                    <a href="#" class="btn btn-default"><span
+                                                                class="fa fa-fw"></span></a>
+                                                {% endif %}
                                                 <a title="{{ 'edit'|_ }}" href="{{ route('rules.rule.edit', rule.id) }}" class="btn btn-default"><span
-                                                            class="fa fa-pencil"></span></a>
+                                                            class="fa fa-fw fa-pencil"></span></a>
                                                 <a title="{{ 'delete'|_ }}" href="{{ route('rules.rule.delete', rule.id) }}" class="btn btn-danger"><span
-                                                            class="fa fa-trash"></span></a>
+                                                            class="fa fa-fw fa-trash"></span></a>
                                             </div>
 
                                         </td>