diff --git a/www/templates/pokemonliste/html/pokemon-list.html b/www/templates/pokemonliste/html/pokemon-list.html
index 63a4360..9e34d22 100644
--- a/www/templates/pokemonliste/html/pokemon-list.html
+++ b/www/templates/pokemonliste/html/pokemon-list.html
@@ -31,7 +31,7 @@
         <md-list>
             <!--Below code it will disable animation to better performance-->
             <div ng-if="!isAnimated" class="row pokemon-list-item md-list-item-default"
-                 ng-repeat="pokemon in pokemons  | filter: filterText | orderBy: 'pokemonname' | limitTo: numberOfItemsToDisplay">
+                 ng-repeat="pokemon in pokemons  | filter: filterText | orderBy:propertyName:reverse | limitTo: numberOfItemsToDisplay">
                 <div class="col-25 icon-user">
                     <img ng-src="{{ pokemon.pokemonimage }}" class="image-list-thumb"/>
 
diff --git a/www/templates/pokemonliste/html/pokemon-setting.html b/www/templates/pokemonliste/html/pokemon-setting.html
index b888d82..2c6003a 100644
--- a/www/templates/pokemonliste/html/pokemon-setting.html
+++ b/www/templates/pokemonliste/html/pokemon-setting.html
@@ -17,30 +17,22 @@
         <!--list section-->
         <md-list>
             <md-list-item class="md-list-item-default" ng-click="orderby('asc')">
-                <i class="fa fa-play"></i>
-                <p>Sortierung aufsteigend</p>
+                <i class="fa fa-sort-alpha-asc"></i><p>Sortierung aufsteigend</p>
             </md-list-item>
-
             <md-list-item class="md-list-item-default" ng-click="orderby('desc')">
-                <i class="fa fa-stop"></i>
-                <p>Sortierung absteigend</p>
+                <i class="fa fa-sort-alpha-desc"></i><p>Sortierung absteigend</p>
             </md-list-item>
-
             <md-list-item class="md-list-item-default" ng-click="sortby('pokedexid')">
-                <i class="ion-android-delete"></i>
-                <p>Nach PokedexID sortieren</p>
+                <i class="fa fa-tag"></i><p>Nach PokedexID sortieren</p>
             </md-list-item>
             <md-list-item class="md-list-item-default" ng-click="sortby('pokemonname')">
-                <i class="ion-android-delete"></i>
-                <p>Nach Namen sortieren</p>
+                <i class="fa fa-paw"></i><p>Nach Namen sortieren</p>
             </md-list-item>
             <md-list-item class="md-list-item-default" ng-click="sortby('pokemontyp')">
-                <i class="ion-android-delete"></i>
-                <p>Nach Typ sortieren</p>
+                <i class="fa fa-tags"></i><p>Nach Typ sortieren</p>
             </md-list-item>
             <md-list-item class="md-list-item-default" ng-click="refreshData()">
-                <i class="ion-android-refresh"></i>
-                <p>Liste aktualisieren</p>
+                <i class="ion-android-refresh"></i><p>Liste aktualisieren</p>
             </md-list-item>
         </md-list><!--end list section-->
     </ion-content>
diff --git a/www/templates/pokemonliste/js/controllers.js b/www/templates/pokemonliste/js/controllers.js
index 89a7ace..1935f5a 100644
--- a/www/templates/pokemonliste/js/controllers.js
+++ b/www/templates/pokemonliste/js/controllers.js
@@ -13,7 +13,7 @@
 // http://ngcordova.com/docs/plugins/sqlite/
 //
 // Controller of Pokemon List Page.
-appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$ionicScrollDelegate, $filter, $mdDialog, $timeout, $ionicModal, $state, $mdBottomSheet, $ionicHistory,pokedexDB, dataShare) {
+appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$ionicScrollDelegate, $filter, $mdDialog, $timeout, $ionicModal, $state, $mdBottomSheet, $ionicHistory, pokedexDB, dataShare) {
     
     // initialForm is the first activity in the controller. 
     // It will initial all variable data and let the function works when page load.
@@ -50,8 +50,14 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$ion
             jQuery('#pokemon-list-loading-progress').hide();
             jQuery('#pokemon-list-content').fadeIn();
             $scope.isLoading = false;
+
+            //Standard orderby filter
+            $scope.propertyName = 'pokemonname';
+            $scope.reverse = true;
+
         }, 1000);// End loading progress.
 
+
         $scope.admob_key = window.globalVariable.adMob;
 
         // Calling to initial AdMob.
@@ -112,15 +118,15 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$ion
       if (data.command=='sortby'){
         
         if (data.direction=='pokemonname'){
-            $scope.pokemons = $filter('orderBy')($scope.pokemons, 'pokemonname');
+            $scope.propertyName = 'pokemonname';
         }
 
         if (data.direction=='pokedexid'){
-            $scope.pokemons = $filter('orderBy')($scope.pokemons, 'pokedexid');
+            $scope.propertyName = 'pokedexid';
         }
         
         if (data.direction=='pokemontyp'){
-            $scope.pokemons = $filter('orderBy')($scope.pokemons, 'pokemontypa');
+            $scope.propertyName = 'pokemontypa';
         }
 
       }
@@ -128,7 +134,10 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$ion
       if (data.command=='orderby'){
         
         if (data.direction=='asc'){
-            
+            $scope.reverse = false;
+        }
+        else{
+            $scope.reverse = true;
         }
 
       }