Index: Dev/branches/rest-dojo-ui/client/rft/css/layout.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/layout.css	(revision 340)
+++ Dev/branches/rest-dojo-ui/client/rft/css/layout.css	(revision 342)
@@ -45,4 +45,5 @@
     /* Section headers */
     font-size: 18px;
+    margin: 0 0 4px 0;
 }
 .claro h4 {
@@ -69,4 +70,5 @@
     height: 16px;
     line-height: 16px;
+    margin: 0 0 4px 0;
 }
 .claro .breadcrumbs .breadcrumb {
Index: Dev/branches/rest-dojo-ui/client/rft/css/rftButtons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/rftButtons.css	(revision 340)
+++ Dev/branches/rest-dojo-ui/client/rft/css/rftButtons.css	(revision 342)
@@ -63,10 +63,11 @@
 }
 .claro .rftBlockButton .rftIcon {
-    height: 16px;
-    width: 16px;
-    background-image: url('images/icons/rftIcons16.png');
+    height: 16px !important;
+    width: 16px !important;
+    background-image: url('images/icons/rftIcons16.png') !important;
+    margin-right: 4px !important;
 }
 .claro .rftBlockButton.rftBlockButtonHover .rftIcon {
-    background-image: url('images/icons/rftIcons16black.png');
+    background-image: url('images/icons/rftIcons16black.png') !important;
 }
 .claro .rftBlockButton.rftBlockButtonHover .dijitButtonNode {
@@ -113,5 +114,11 @@
     color: #993dec;
 }
-
+.claro .rftBlockButton.trans .dijitButtonNode {
+    background: transparent;
+}
+.claro .rftBlockButton.trans.rftBlockButtonHover .dijitButtonNode {
+    background: #ffffff !important;
+    color: #000000;
+}
 
 /* InlineButton */
Index: Dev/branches/rest-dojo-ui/client/rft/css/rftIcons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/rftIcons.css	(revision 340)
+++ Dev/branches/rest-dojo-ui/client/rft/css/rftIcons.css	(revision 342)
@@ -34,92 +34,113 @@
     background-position: -64px 0px;
 }
-.rftIconSurvey {
+.rftIconSessionActive {
     background-position: -96px 0px;
 }
-.rftIconQuestion {
+.rftIconSessionTemplate {
     background-position: -128px 0px;
 }
-.rftIconQuestionAlt {
+.rftIconSurvey {
     background-position: -160px 0px;
 }
-.rftIconAccept {
+.rftIconQuestion {
     background-position: -192px 0px;
 }
-.rftIconCancel {
+.rftIconQuestionFill {
     background-position: -224px 0px;
 }
-.rftIconDelete {
+.rftIconRespondent {
     background-position: -256px 0px;
 }
-.rftIconHome {
+.rftIconAnswer {
     background-position: -288px 0px;
 }
-.rftIconPreview {
+.rftIconAnswerSet {
     background-position: -320px 0px;
 }
-.rftIconSave {
+.rftIconGameData {
     background-position: -352px 0px;
 }
-.rftIconSettings {
+.rftIconUser {
     background-position: -384px 0px;
 }
-.rftIconUndo {
+.rftIconAccept {
     background-position: -416px 0px;
 }
-.rftIconPrevious {
+.rftIconCancel {
     background-position: -448px 0px;
 }
-.rftIconNext {
+.rftIconPlus {
     background-position: -480px 0px;
 }
-.rftIconHalfArrowUp {
+.rftIconMinus {
     background-position: -512px 0px;
 }
-.rftIconHalfArrowDown {
+.rftIconIncrease {
     background-position: -544px 0px;
 }
-.rftIconHalfArrowLeft {
+.rftIconDecrease {
     background-position: -576px 0px;
 }
-.rftIconHalfArrowRight {
+.rftIconDelete {
     background-position: -608px 0px;
 }
-.rftIconFullArrowUp {
+.rftIconHome {
     background-position: -640px 0px;
 }
-.rftIconFullArrowDown {
+.rftIconPreview {
     background-position: -672px 0px;
 }
-.rftIconFullArrowLeft {
+.rftIconSave {
     background-position: -704px 0px;
 }
-.rftIconFullArrowRight {
+.rftIconDiscard {
     background-position: -736px 0px;
 }
-.rftIconHelp {
+.rftIconSettings {
     background-position: -768px 0px;
 }
-.rftIconInspect {
+.rftIconUndo {
     background-position: -800px 0px;
 }
-.rftIconMinus {
+.rftIconRedo {
     background-position: -832px 0px;
 }
-.rftIconPlus {
+.rftIconBack {
     background-position: -864px 0px;
 }
-
-/*  The following do not yet have an icon and are displaced a bit to make room for possible extra inlineIcons.
-    The reserved offsets are:  896, 928, 960, 992, 1024, 1056 and 1088 */
-.rftIconRespondent {
+.rftIconForward {
+    background-position: -896px 0px;
+}
+.rftIconRefresh {
+    background-position: -928px 0px;
+}
+.rftIconHelp {
+    background-position: -960px 0px;
+}
+.rftIconInspect {
+    background-position: -992px 0px;
+}
+.rftIconFullArrowUp {
+    background-position: -1024px 0px;
+}
+.rftIconFullArrowDown {
+    background-position: -1056px 0px;
+}
+.rftIconFullArrowLeft {
+    background-position: -1088px 0px;
+}
+.rftIconFullArrowRight {
     background-position: -1120px 0px;
 }
-.rftIconAnswerSet {
+.rftIconHalfArrowUp {
     background-position: -1152px 0px;
 }
-.rftIconAnswer {
+.rftIconHalfArrowDown {
     background-position: -1184px 0px;
 }
-.rftIconGameData {
+.rftIconHalfArrowLeft {
     background-position: -1216px 0px;
 }
+.rftIconHalfArrowRight {
+    background-position: -1248px 0px;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/rftSelector.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/rftSelector.css	(revision 340)
+++ Dev/branches/rest-dojo-ui/client/rft/css/rftSelector.css	(revision 342)
@@ -56,4 +56,8 @@
     color: #ffffff;
 }
+.claro .rftLineWithButtons.trans {
+    background-color: transparent;
+    color: #ffffff;
+}
 
 /* Background colour settings for the various contexts of rftLineWithButtons */
@@ -103,2 +107,18 @@
     background-color: #00ff00;
 }
+
+/* rftSessionBar */
+.claro .rftSessionBar {
+    margin: 8px 0;
+}
+.claro .rftSessionBar .rftIcon.typeIcon {
+    background-image: url('images/icons/rftIcons32.png');
+    height: 32px;
+    width: 32px;
+    margin: 20px 8px;
+    float: left;
+}
+.claro .rftSessionBar .rftLineWithButtons {
+    margin: 0;
+    padding: 0;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidgetThijs.js
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidgetThijs.js	(revision 340)
+++ Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidgetThijs.js	(revision 342)
@@ -28,12 +28,9 @@
                             baseClass: 'rftBlockButton',
                             modifiers: this.modifiers,
-                            label: action,
-                            iconClass: 'rftIcon rftIcon'+action,
+                            label: "Default",
+                            iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
                             title: action,
-                            onClick: lang.hitch(this, function(){
-                                this.actions[action].callback(this.userObject);
-                            })
-                        },
-                        this.actions[action].properties);
+                            onClick: lang.hitch(this, this.actions[action].callback)
+                        }, this.actions[action].properties);
                         properties["class"] = properties.modifiers;
                         new Button(properties).placeAt(this.buttonsNode);
@@ -42,12 +39,10 @@
                             baseClass: 'rftInlineButton',
                             modifiers: 'black',
+                            label: "Default",
                             showLabel: false,
-                            iconClass: 'rftIcon rftIcon'+action,
+                            iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
                             title: action,
-                            onClick: lang.hitch(this, function(){
-                                this.actions[action].callback(this.userObject);
-                            })
-                        },
-                        this.actions[action].properties);
+                            onClick: lang.hitch(this, this.actions[action].callback)
+                        }, this.actions[action].properties);
                         properties["class"] = properties.modifiers;
                         new Button(properties).placeAt(this.buttonsNode);
@@ -65,5 +60,9 @@
                 return !preventDefault;
             },
-            onClick: function(e) {}
+            onClick: function(e) {},
+            _setTitleAttr: function(value){
+                this.title = value;
+                this.refresh();
+            }
         });
     });
Index: Dev/branches/rest-dojo-ui/client/rft/ui/SelectorThijs.js
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/ui/SelectorThijs.js	(revision 340)
+++ Dev/branches/rest-dojo-ui/client/rft/ui/SelectorThijs.js	(revision 342)
@@ -37,9 +37,11 @@
                     modifiers: this.modifiers,
                     actions: {
-                        "Accept" : {
+                        "AddToSurvey" : {
                             callback: function(arg){},
                             properties: {
                                 blockButton: true,
-                                modifiers: this.modifiers
+                                modifiers: this.modifiers,
+                                icon: "Accept",
+                                label: "Include"
                             }
                         }
@@ -50,5 +52,5 @@
                     modifiers: this.modifiers,
                     actions: {
-                        "HalfArrowDown" : {
+                        "ToggleDropdown" : {
                             callback: lang.hitch(this,function(){
                                 var node = this.optionsNode;
@@ -87,5 +89,6 @@
                                 blockButton: true,
                                 modifiers: this.modifiers,
-                                showLabel: false
+                                showLabel: false,
+                                icon: "HalfArrowDown"
                             }
                         }
@@ -95,9 +98,10 @@
                     title: 'Are there direct colleagues among the other participants?',
                     actions: {
-                        "Inspect" : {
+                        "InfoHover" : {
                             callback: infoFunction,
                             properties: {
                                 blockButton: false,
-                                showLabel: false
+                                showLabel: false,
+                                icon: "Inspect"
                             }
                         }
Index: Dev/branches/rest-dojo-ui/client/rft/ui/templates/List.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/ui/templates/List.html	(revision 340)
+++ Dev/branches/rest-dojo-ui/client/rft/ui/templates/List.html	(revision 342)
@@ -1,8 +1,8 @@
 <div>
     <div data-dojo-attach-point="containerNode"></div>
-    <div>
-        <span>Move selected</span>
-        <button data-dojo-type="dijit.form.Button">Up</button>
-        <button data-dojo-type="dijit.form.Button">Down</button>
+    <div style="float: right;">
+        <span>Move selected: </span>
+        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftBlockButton', iconClass:'rftIcon rftIconFullArrowUp'" class="trans"></button>
+        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftBlockButton', iconClass:'rftIcon rftIconFullArrowDown'" class="trans"></button>
     </div>
 </div>
