diff --git a/src/state-summary/state-card-rollershutter.html b/src/state-summary/state-card-rollershutter.html
index f3f28062cb..426ad10ce9 100644
--- a/src/state-summary/state-card-rollershutter.html
+++ b/src/state-summary/state-card-rollershutter.html
@@ -20,9 +20,11 @@
     <div class='horizontal justified layout'>
       <state-info state-obj="[[stateObj]]"></state-info>
       <div class='state'>
-        <paper-icon-button icon="mdi:arrow-up" on-tap='onMoveUpTap'></paper-icon-button>
-        <paper-icon-button icon="mdi:arrow-down" on-tap='onMoveDownTap'></paper-icon-button>
+        <paper-icon-button icon="mdi:arrow-up" on-tap='onMoveUpTap'
+          disabled='[[computeIsFullyClosed(stateObj)]]'></paper-icon-button>
         <paper-icon-button icon="mdi:stop" on-tap='onStopTap'></paper-icon-button>
+        <paper-icon-button icon="mdi:arrow-down" on-tap='onMoveDownTap'
+          disabled='[[computeIsFullyOpen(stateObj)]]'></paper-icon-button>
       </div>
     </div>
   </template>
diff --git a/src/state-summary/state-card-rollershutter.js b/src/state-summary/state-card-rollershutter.js
index ff77e83a5a..3a08509e0a 100644
--- a/src/state-summary/state-card-rollershutter.js
+++ b/src/state-summary/state-card-rollershutter.js
@@ -13,6 +13,14 @@ export default new Polymer({
     },
   },
 
+  computeIsFullyOpen(stateObj) {
+    return stateObj.attributes.current_position === 100;
+  },
+
+  computeIsFullyClosed(stateObj) {
+    return stateObj.attributes.current_position === 0;
+  },
+
   onMoveUpTap() {
     serviceActions.callService('rollershutter', 'move_up',
                                {entity_id: this.stateObj.entityId});
diff --git a/src/util/domain-icon.js b/src/util/domain-icon.js
index 65b951580f..84fed2f222 100644
--- a/src/util/domain-icon.js
+++ b/src/util/domain-icon.js
@@ -47,7 +47,7 @@ export default function domainIcon(domain, state) {
     return 'mdi:cloud-upload';
 
   case 'rollershutter':
-    return 'mdi:blinds';
+    return state && state === 'open' ? 'mdi:window-open' : 'mdi:window-closed';
 
   case 'scene':
     return 'mdi:google-pages';