diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index cbd051fdb..98d86e5ae 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -169,7 +169,7 @@ namespace MWClass
 
         std::string text;
 
-	text += "\nDuration: " + MWGui::ToolTips::toString(ptr.getClass().getRemainingUsageTime(ptr));
+	text += "\n#{sDuration}: " + MWGui::ToolTips::toString(ptr.getClass().getRemainingUsageTime(ptr));
         if (ref->mBase->mData.mWeight != 0)
         {
             text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index b2995af3c..f132cd73e 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -133,6 +133,23 @@ namespace MWGui
                             MWBase::Environment::get().getWindowManager()->getGameSettingString("spoints", "") :
                             MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", "") );
                     }
+		    if (effectIt->mRemainingTime > -1) {
+			sourcesDescription += " #{sDuration}: ";
+			float duration = effectIt->mRemainingTime;
+			if (duration > 3600) {
+			    int hour = duration / 3600;
+			    duration -= hour*3600;
+			    sourcesDescription += MWGui::ToolTips::toString(hour) + "h";
+			}
+			if (duration > 60) {
+			    int minute = duration / 60;
+			    duration -= minute*60;
+			    sourcesDescription += MWGui::ToolTips::toString(minute) + "m";
+			}
+			if (duration > 0.1) {
+			    sourcesDescription += MWGui::ToolTips::toString(duration) + "s";
+			}
+		    }
                 }
             }