diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index b571b9d2..9464cfbb 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -244,6 +244,11 @@ module.controller('ToolbarCtrl', function($scope, $http, $state, $stateParams,
 	$scope.showButtons = function() {
 		return !$stateParams._keywords;
 	};
+	
+	$scope.toggleOrder = function() {
+		var settings = $scope.settingsService.settings;
+		settings.readingOrder = settings.readingOrder == 'asc' ? 'desc' : 'asc'; 
+	};
 
 	$scope.toAdmin = function() {
 		$location.path('admin');
diff --git a/src/main/webapp/templates/_toolbar.html b/src/main/webapp/templates/_toolbar.html
index 80b75ae3..c8ab74a9 100644
--- a/src/main/webapp/templates/_toolbar.html
+++ b/src/main/webapp/templates/_toolbar.html
@@ -5,10 +5,10 @@
 				<button type="button" class="btn" ng-model="settingsService.settings.readingMode" btn-radio="'unread'">Unread</button>
 				<button type="button" class="btn" ng-model="settingsService.settings.readingMode" btn-radio="'all'">All</button>
 			</div>
-			<div class="btn-group" data-toggle="buttons-radio">
-				<button type="button" class="btn" ng-model="settingsService.settings.readingOrder" btn-radio="'desc'">Newest</button>
-				<button type="button" class="btn" ng-model="settingsService.settings.readingOrder" btn-radio="'asc'">Oldest</button>
-			</div>
+			
+			<button type="button" class="btn" ng-click="toggleOrder()">
+				<i ng-class="{'icon-arrow-up' : settingsService.settings.readingOrder == 'asc', 'icon-arrow-down': settingsService.settings.readingOrder == 'desc'}"></i>
+			</button>
 			
 			<button type="button" class="btn" ng-click="refresh()"><i class="icon-refresh"></i> Refresh</button>
 			<button type="button" class="btn" ng-click="markAllAsRead()"><i class="icon-ok"></i> Mark all as read</button>